7u83/freewtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add timeout in session data

Browse Source
This commit is contained in:
vemax78 2013-11-23 22:30:28 +01:00
parent 909899526c
commit d7b306e432
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ac/ac.h
View File

@ -40,6 +40,7 @@
#define AC_DEFAULT_IDLE_TIMEOUT_INTERVAL 300 #define AC_DEFAULT_IDLE_TIMEOUT_INTERVAL 300
#define AC_DEFAULT_WTP_FALLBACK_MODE CAPWAP_WTP_FALLBACK_ENABLED #define AC_DEFAULT_WTP_FALLBACK_MODE CAPWAP_WTP_FALLBACK_ENABLED
#define AC_DEFAULT_DATA_CHECK_TIMER 30 #define AC_DEFAULT_DATA_CHECK_TIMER 30
#define AC_MAX_DATA_CHECK_TIMER 256
#define AC_DEFAULT_RETRANSMIT_INTERVAL 3 #define AC_DEFAULT_RETRANSMIT_INTERVAL 3
#define AC_MAX_RETRANSMIT 5 #define AC_MAX_RETRANSMIT 5
#define AC_DEFAULT_DTLS_SESSION_DELETE 5 #define AC_DEFAULT_DTLS_SESSION_DELETE 5

28
src/ac/ac_session_data.c
View File

@ -16,7 +16,7 @@ static int ac_session_data_action_execute(struct ac_session_data_t* sessiondata,
} }
/* */ /* */
static int ac_network_read(struct ac_session_data_t* sessiondata, void* buffer, int length, struct timeout_control* timeout) { static int ac_network_read(struct ac_session_data_t* sessiondata, void* buffer, int length) {
long indextimer; long indextimer;
long waittimeout; long waittimeout;
int result = CAPWAP_ERROR_AGAIN; int result = CAPWAP_ERROR_AGAIN;
@ -57,7 +57,16 @@ static int ac_network_read(struct ac_session_data_t* sessiondata, void* buffer,
long packetlength = itempacket->itemsize - sizeof(struct ac_packet); long packetlength = itempacket->itemsize - sizeof(struct ac_packet);
if (!packet->plainbuffer && sessiondata->dtls.enable) { if (!packet->plainbuffer && sessiondata->dtls.enable) {
int oldaction = sessiondata->dtls.action;
result = capwap_decrypt_packet(&sessiondata->dtls, packet->buffer, packetlength, buffer, length); result = capwap_decrypt_packet(&sessiondata->dtls, packet->buffer, packetlength, buffer, length);
if (result == CAPWAP_ERROR_AGAIN) {
/* Check is handshake complete */
if ((oldaction == CAPWAP_DTLS_ACTION_HANDSHAKE) && (sessiondata->dtls.action == CAPWAP_DTLS_ACTION_DATA)) {
capwap_kill_timeout(&sessiondata->timeout, CAPWAP_TIMER_CONTROL_CONNECTION);
capwap_set_timeout(AC_MAX_DATA_CHECK_TIMER, &sessiondata->timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD);
}
}
} else { } else {
if (packetlength <= length) { if (packetlength <= length) {
memcpy(buffer, packet->buffer, packetlength); memcpy(buffer, packet->buffer, packetlength);
@ -75,8 +84,8 @@ static int ac_network_read(struct ac_session_data_t* sessiondata, void* buffer,
capwap_lock_exit(&sessiondata->sessionlock); capwap_lock_exit(&sessiondata->sessionlock);
/* Update timeout */ /* Update timeout */
capwap_update_timeout(timeout); capwap_update_timeout(&sessiondata->timeout);
waittimeout = capwap_get_timeout(timeout, &indextimer); waittimeout = capwap_get_timeout(&sessiondata->timeout, &indextimer);
if ((waittimeout <= 0) && (indextimer != CAPWAP_TIMER_UNDEF)) { if ((waittimeout <= 0) && (indextimer != CAPWAP_TIMER_UNDEF)) {
return AC_ERROR_TIMEOUT; return AC_ERROR_TIMEOUT;
} }
@ -301,18 +310,20 @@ static void ac_session_data_run(struct ac_session_data_t* sessiondata) {
/* Create DTLS channel */ /* Create DTLS channel */
if (sessiondata->enabledtls) { if (sessiondata->enabledtls) {
if (!ac_dtls_data_setup(sessiondata)) { if (ac_dtls_data_setup(sessiondata)) {
capwap_set_timeout(AC_DEFAULT_WAITDTLS_INTERVAL, &sessiondata->timeout, CAPWAP_TIMER_CONTROL_CONNECTION);
} else {
capwap_logging_debug("Unable to start DTLS data"); capwap_logging_debug("Unable to start DTLS data");
sessiondata->running = 0; sessiondata->running = 0;
} }
} else {
capwap_set_timeout(AC_MAX_DATA_CHECK_TIMER, &sessiondata->timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD);
} }
/* */ /* */
//capwap_set_timeout(0, &sessiondata->timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD);
while (sessiondata->running) { while (sessiondata->running) {
/* Get packet */ /* Get packet */
length = ac_network_read(sessiondata, buffer, sizeof(buffer), &sessiondata->timeout); length = ac_network_read(sessiondata, buffer, sizeof(buffer));
if (length < 0) { if (length < 0) {
if ((length == AC_ERROR_ACTION_SESSION) || (length == CAPWAP_ERROR_AGAIN)) { if ((length == AC_ERROR_ACTION_SESSION) || (length == CAPWAP_ERROR_AGAIN)) {
continue; /* Nothing */ continue; /* Nothing */
@ -342,6 +353,9 @@ static void ac_session_data_run(struct ac_session_data_t* sessiondata) {
if (!capwap_validate_parsed_packet(&packet, NULL)) { if (!capwap_validate_parsed_packet(&packet, NULL)) {
if (IS_FLAG_K_HEADER(packet.rxmngpacket->header)) { if (IS_FLAG_K_HEADER(packet.rxmngpacket->header)) {
ac_session_data_keepalive(sessiondata, &packet); ac_session_data_keepalive(sessiondata, &packet);
/* Update timeout */
capwap_set_timeout(AC_MAX_DATA_CHECK_TIMER, &sessiondata->timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD);
} else { } else {
/* TODO */ /* TODO */
} }