diff --git a/src/ac/ac_dfa_configure.c b/src/ac/ac_dfa_configure.c index 4796313..76f9aa7 100644 --- a/src/ac/ac_dfa_configure.c +++ b/src/ac/ac_dfa_configure.c @@ -762,7 +762,7 @@ void ac_dfa_state_configure(struct ac_session_t* session, struct capwap_parsed_p /* Change state */ if (CAPWAP_RESULTCODE_OK(result)) { ac_dfa_change_state(session, CAPWAP_DATA_CHECK_STATE); - capwap_set_timeout(session->dfa.rfcChangeStatePendingTimer, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(session->dfa.rfcChangeStatePendingTimer, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } else { ac_session_teardown(session); } diff --git a/src/ac/ac_dfa_datacheck.c b/src/ac/ac_dfa_datacheck.c index e167526..ad6301b 100644 --- a/src/ac/ac_dfa_datacheck.c +++ b/src/ac/ac_dfa_datacheck.c @@ -228,7 +228,7 @@ void ac_dfa_state_datacheck(struct ac_session_t* session, struct capwap_parsed_p /* Change state */ if (CAPWAP_RESULTCODE_OK(result)) { ac_dfa_change_state(session, CAPWAP_DATA_CHECK_TO_RUN_STATE); - capwap_set_timeout(session->dfa.rfcDataCheckTimer, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(session->dfa.rfcDataCheckTimer, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } else { ac_session_teardown(session); } diff --git a/src/ac/ac_dfa_dtls.c b/src/ac/ac_dfa_dtls.c index e63f675..6f25905 100644 --- a/src/ac/ac_dfa_dtls.c +++ b/src/ac/ac_dfa_dtls.c @@ -36,7 +36,7 @@ int ac_dtls_setup(struct ac_session_t* session) { /* Wait DTLS handshake complete */ ac_dfa_change_state(session, CAPWAP_DTLS_CONNECT_STATE); - capwap_set_timeout(session->dfa.rfcWaitDTLS, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(session->dfa.rfcWaitDTLS, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); return 1; } diff --git a/src/ac/ac_dfa_reset.c b/src/ac/ac_dfa_reset.c index 2745a7b..28908ec 100644 --- a/src/ac/ac_dfa_reset.c +++ b/src/ac/ac_dfa_reset.c @@ -39,7 +39,7 @@ void ac_dfa_state_reset(struct ac_session_t* session, struct capwap_parsed_packe } /* Update timeout */ - capwap_set_timeout(session->dfa.rfcRetransmitInterval, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(session->dfa.rfcRetransmitInterval, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } } } diff --git a/src/ac/ac_dfa_run.c b/src/ac/ac_dfa_run.c index 7503ffb..c08544f 100644 --- a/src/ac/ac_dfa_run.c +++ b/src/ac/ac_dfa_run.c @@ -86,19 +86,19 @@ void ac_dfa_state_run(struct ac_session_t* session, struct capwap_parsed_packet* /* TODO */ /* */ - capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(AC_MAX_ECHO_INTERVAL, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); break; } case CAPWAP_CHANGE_STATE_EVENT_REQUEST: { /* TODO */ - capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(AC_MAX_ECHO_INTERVAL, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); break; } case CAPWAP_ECHO_REQUEST: { if (!receive_echo_request(session, packet)) { - capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(AC_MAX_ECHO_INTERVAL, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } else { ac_session_teardown(session); } @@ -110,19 +110,19 @@ void ac_dfa_state_run(struct ac_session_t* session, struct capwap_parsed_packet* /* TODO */ /* */ - capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(AC_MAX_ECHO_INTERVAL, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); break; } case CAPWAP_WTP_EVENT_REQUEST: { /* TODO */ - capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(AC_MAX_ECHO_INTERVAL, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); break; } case CAPWAP_DATA_TRANSFER_REQUEST: { /* TODO */ - capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(AC_MAX_ECHO_INTERVAL, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); break; } @@ -130,7 +130,7 @@ void ac_dfa_state_run(struct ac_session_t* session, struct capwap_parsed_packet* /* TODO */ /* */ - capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(AC_MAX_ECHO_INTERVAL, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); break; } @@ -138,13 +138,13 @@ void ac_dfa_state_run(struct ac_session_t* session, struct capwap_parsed_packet* /* TODO */ /* */ - capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(AC_MAX_ECHO_INTERVAL, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); break; } case CAPWAP_IEEE80211_WLAN_CONFIGURATION_RESPONSE: { receive_ieee80211_wlan_configuration_response(session, packet); - capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(AC_MAX_ECHO_INTERVAL, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); break; } } @@ -163,7 +163,7 @@ void ac_dfa_state_run(struct ac_session_t* session, struct capwap_parsed_packet* } /* Update timeout */ - capwap_set_timeout(session->dfa.rfcRetransmitInterval, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(session->dfa.rfcRetransmitInterval, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } } else { ac_session_teardown(session); diff --git a/src/ac/ac_execute.c b/src/ac/ac_execute.c index 513f554..985f2ed 100644 --- a/src/ac/ac_execute.c +++ b/src/ac/ac_execute.c @@ -102,7 +102,7 @@ void ac_msgqueue_notify_closethread(pthread_t threadid) { } /* */ -static int ac_recvfrom(struct pollfd* fds, int fdscount, void* buffer, int* size, struct sockaddr_storage* recvfromaddr, struct sockaddr_storage* recvtoaddr, struct timeout_control* timeout) { +static int ac_recvfrom(struct pollfd* fds, int fdscount, void* buffer, int* size, struct sockaddr_storage* recvfromaddr, struct sockaddr_storage* recvtoaddr) { int index; ASSERT(fds); @@ -114,7 +114,7 @@ static int ac_recvfrom(struct pollfd* fds, int fdscount, void* buffer, int* size ASSERT(recvtoaddr != NULL); /* Wait packet */ - index = capwap_wait_recvready(fds, fdscount, timeout); + index = capwap_wait_recvready(fds, fdscount, NULL); if (index < 0) { return index; } else if (index == (fdscount - 1)) { @@ -502,7 +502,7 @@ static struct ac_session_t* ac_create_session(struct sockaddr_storage* wtpaddres capwap_event_init(&session->changereference); /* */ - capwap_init_timeout(&session->timeout); + session->timeout = capwap_timeout_init(); /* Duplicate state for DFA */ memcpy(&session->dfa, &g_ac.dfa, sizeof(struct ac_state)); @@ -587,7 +587,7 @@ static struct ac_session_data_t* ac_create_session_data(struct sockaddr_storage* capwap_event_init(&sessiondata->changereference); /* */ - capwap_init_timeout(&sessiondata->timeout); + sessiondata->timeout = capwap_timeout_init(); /* Connection info */ memcpy(&sessiondata->connection.socket, sock, sizeof(struct capwap_socket)); @@ -718,7 +718,7 @@ int ac_execute(void) { while (g_ac.running) { /* Receive packet */ buffersize = sizeof(buffer); - index = ac_recvfrom(fds, fdscount, buffer, &buffersize, &recvfromaddr, &recvtoaddr, NULL); + index = ac_recvfrom(fds, fdscount, buffer, &buffersize, &recvfromaddr, &recvtoaddr); if (!g_ac.running) { capwap_logging_debug("Closing AC"); break; diff --git a/src/ac/ac_session.c b/src/ac/ac_session.c index de06150..4eff793 100644 --- a/src/ac/ac_session.c +++ b/src/ac/ac_session.c @@ -40,8 +40,8 @@ static int ac_session_action_resetwtp(struct ac_session_t* session, struct ac_no /* Send Reset Request to WTP */ if (capwap_crypt_sendto_fragmentpacket(&session->dtls, session->connection.socket.socket[session->connection.socket.type], session->requestfragmentpacket, &session->connection.localaddr, &session->connection.remoteaddr)) { session->dfa.rfcRetransmitCount = 0; - capwap_killall_timeout(&session->timeout); - capwap_set_timeout(session->dfa.rfcRetransmitInterval, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_killall(session->timeout); + capwap_timeout_set(session->dfa.rfcRetransmitInterval, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); ac_dfa_change_state(session, CAPWAP_RESET_STATE); } else { capwap_logging_debug("Warning: error to send reset request packet"); @@ -95,8 +95,8 @@ static int ac_session_action_addwlan(struct ac_session_t* session, struct ac_not /* Send WLAN Configuration Request to WTP */ if (capwap_crypt_sendto_fragmentpacket(&session->dtls, session->connection.socket.socket[session->connection.socket.type], session->requestfragmentpacket, &session->connection.localaddr, &session->connection.remoteaddr)) { session->dfa.rfcRetransmitCount = 0; - capwap_killall_timeout(&session->timeout); - capwap_set_timeout(session->dfa.rfcRetransmitInterval, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_killall(session->timeout); + capwap_timeout_set(session->dfa.rfcRetransmitInterval, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } else { capwap_logging_debug("Warning: error to send reset request packet"); ac_free_reference_last_request(session); @@ -139,7 +139,7 @@ static int ac_session_action_execute(struct ac_session_t* session, struct ac_ses if (valid) { ac_dfa_change_state(session, CAPWAP_RUN_STATE); - capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(AC_MAX_ECHO_INTERVAL, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } else { result = CAPWAP_ERROR_CLOSE; } @@ -163,7 +163,7 @@ static int ac_session_action_execute(struct ac_session_t* session, struct ac_ses } /* */ -static int ac_network_read(struct ac_session_t* session, void* buffer, int length, struct timeout_control* timeout) { +static int ac_network_read(struct ac_session_t* session, void* buffer, int length) { int result = 0; long indextimer; long waittimeout; @@ -213,7 +213,7 @@ static int ac_network_read(struct ac_session_t* session, void* buffer, int lengt if ((oldaction == CAPWAP_DTLS_ACTION_HANDSHAKE) && (session->dtls.action == CAPWAP_DTLS_ACTION_DATA)) { if (session->state == CAPWAP_DTLS_CONNECT_STATE) { ac_dfa_change_state(session, CAPWAP_JOIN_STATE); - capwap_set_timeout(session->dfa.rfcWaitJoin, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(session->dfa.rfcWaitJoin, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } } } @@ -234,8 +234,8 @@ static int ac_network_read(struct ac_session_t* session, void* buffer, int lengt capwap_lock_exit(&session->sessionlock); /* Update timeout */ - capwap_update_timeout(timeout); - waittimeout = capwap_get_timeout(timeout, &indextimer); + capwap_timeout_update(session->timeout); + waittimeout = capwap_timeout_get(session->timeout, &indextimer); if ((waittimeout <= 0) && (indextimer != CAPWAP_TIMER_UNDEF)) { return AC_ERROR_TIMEOUT; } @@ -414,6 +414,7 @@ static void ac_session_destroy(struct ac_session_t* session) { capwap_list_free(session->requestfragmentpacket); capwap_list_free(session->responsefragmentpacket); capwap_list_free(session->notifyevent); + capwap_timeout_free(session->timeout); /* Free DFA resource */ capwap_array_free(session->dfa.acipv4list.addresses); @@ -480,12 +481,12 @@ static void ac_session_run(struct ac_session_t* session) { } else { /* Wait Join request */ ac_dfa_change_state(session, CAPWAP_JOIN_STATE); - capwap_set_timeout(session->dfa.rfcWaitJoin, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(session->dfa.rfcWaitJoin, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } while (session->state != CAPWAP_DTLS_TEARDOWN_STATE) { /* Get packet */ - length = ac_network_read(session, buffer, sizeof(buffer), &session->timeout); + length = ac_network_read(session, buffer, sizeof(buffer)); if (length < 0) { if (length == AC_ERROR_TIMEOUT) { ac_dfa_execute(session, NULL); @@ -601,7 +602,7 @@ static void ac_session_run(struct ac_session_t* session) { } /* Wait teardown timeout before kill session */ - capwap_wait_timeout(&session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_wait(session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); ac_dfa_state_teardown(session); /* Release reference session */ @@ -668,8 +669,8 @@ void ac_session_teardown(struct ac_session_t* session) { } /* */ - capwap_killall_timeout(&session->timeout); - capwap_set_timeout(session->dfa.rfcDTLSSessionDelete, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_killall(session->timeout); + capwap_timeout_set(session->dfa.rfcDTLSSessionDelete, session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); ac_dfa_change_state(session, CAPWAP_DTLS_TEARDOWN_STATE); /* Cancel all notify event */ diff --git a/src/ac/ac_session.h b/src/ac/ac_session.h index 6847f8c..8b5b4e3 100644 --- a/src/ac/ac_session.h +++ b/src/ac/ac_session.h @@ -66,7 +66,7 @@ struct ac_session_data_t { unsigned short mtu; struct capwap_connection connection; struct capwap_dtls dtls; - struct timeout_control timeout; + struct timeout_control* timeout; capwap_event_t waitpacket; capwap_lock_t sessionlock; @@ -105,7 +105,7 @@ struct ac_session_t { unsigned short mtu; struct capwap_dtls dtls; struct capwap_connection connection; - struct timeout_control timeout; + struct timeout_control* timeout; capwap_event_t waitpacket; capwap_lock_t sessionlock; diff --git a/src/ac/ac_session_data.c b/src/ac/ac_session_data.c index f77811a..b72560e 100644 --- a/src/ac/ac_session_data.c +++ b/src/ac/ac_session_data.c @@ -63,8 +63,8 @@ static int ac_network_read(struct ac_session_data_t* sessiondata, void* buffer, 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); + capwap_timeout_kill(sessiondata->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(AC_MAX_DATA_CHECK_TIMER, sessiondata->timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD); } } } else { @@ -84,8 +84,8 @@ static int ac_network_read(struct ac_session_data_t* sessiondata, void* buffer, capwap_lock_exit(&sessiondata->sessionlock); /* Update timeout */ - capwap_update_timeout(&sessiondata->timeout); - waittimeout = capwap_get_timeout(&sessiondata->timeout, &indextimer); + capwap_timeout_update(sessiondata->timeout); + waittimeout = capwap_timeout_get(sessiondata->timeout, &indextimer); if ((waittimeout <= 0) && (indextimer != CAPWAP_TIMER_UNDEF)) { return AC_ERROR_TIMEOUT; } @@ -253,6 +253,7 @@ static void ac_session_data_destroy(struct ac_session_data_t* sessiondata) { capwap_lock_destroy(&sessiondata->sessionlock); capwap_list_free(sessiondata->action); capwap_list_free(sessiondata->packets); + capwap_timeout_free(sessiondata->timeout); /* Free fragments packet */ if (sessiondata->rxmngpacket) { @@ -311,13 +312,13 @@ static void ac_session_data_run(struct ac_session_data_t* sessiondata) { /* Create DTLS channel */ if (sessiondata->enabledtls) { if (ac_dtls_data_setup(sessiondata)) { - capwap_set_timeout(AC_DEFAULT_WAITDTLS_INTERVAL, &sessiondata->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(AC_DEFAULT_WAITDTLS_INTERVAL, sessiondata->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } else { capwap_logging_debug("Unable to start DTLS data"); sessiondata->running = 0; } } else { - capwap_set_timeout(AC_MAX_DATA_CHECK_TIMER, &sessiondata->timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD); + capwap_timeout_set(AC_MAX_DATA_CHECK_TIMER, sessiondata->timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD); } /* */ @@ -355,7 +356,7 @@ static void ac_session_data_run(struct ac_session_data_t* sessiondata) { ac_session_data_keepalive(sessiondata, &packet); /* Update timeout */ - capwap_set_timeout(AC_MAX_DATA_CHECK_TIMER, &sessiondata->timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD); + capwap_timeout_set(AC_MAX_DATA_CHECK_TIMER, sessiondata->timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD); } else { /* TODO */ } diff --git a/src/common/capwap.c b/src/common/capwap.c index 574bb0a..8776bae 100644 --- a/src/common/capwap.c +++ b/src/common/capwap.c @@ -6,13 +6,24 @@ void capwap_exit(int errorcode) { } /* Helper timeout calc */ -void capwap_init_timeout(struct timeout_control* timeout) { - ASSERT(timeout); +struct timeout_control* capwap_timeout_init(void) { + struct timeout_control* timeout; + timeout = (struct timeout_control*)capwap_alloc(sizeof(struct timeout_control)); memset(timeout, 0, sizeof(struct timeout_control)); + + return timeout; } -void capwap_update_timeout(struct timeout_control* timeout) { +/* */ +void capwap_timeout_free(struct timeout_control* timeout) { + ASSERT(timeout != NULL); + + capwap_free(timeout); +} + +/* */ +void capwap_timeout_update(struct timeout_control* timeout) { int i; struct timeval now; @@ -35,7 +46,8 @@ void capwap_update_timeout(struct timeout_control* timeout) { } } -long capwap_get_timeout(struct timeout_control* timeout, long* index) { +/* */ +long capwap_timeout_get(struct timeout_control* timeout, long* index) { long i; long delta = 0; @@ -59,25 +71,28 @@ long capwap_get_timeout(struct timeout_control* timeout, long* index) { return delta; } -void capwap_wait_timeout(struct timeout_control* timeout, unsigned long index) { +/* */ +void capwap_timeout_wait(struct timeout_control* timeout, unsigned long index) { ASSERT(timeout != NULL); ASSERT(index < CAPWAP_MAX_TIMER); if (timeout->items[index].enable) { - for (capwap_update_timeout(timeout); timeout->items[index].delta > 0; capwap_update_timeout(timeout)) { + for (capwap_timeout_update(timeout); timeout->items[index].delta > 0; capwap_timeout_update(timeout)) { usleep((useconds_t)timeout->items[index].delta * 1000); } } } -int capwap_is_enable_timeout(struct timeout_control* timeout, unsigned long index) { +/* */ +int capwap_timeout_isenable(struct timeout_control* timeout, unsigned long index) { ASSERT(timeout != NULL); ASSERT(index < CAPWAP_MAX_TIMER); return (timeout->items[index].enable ? 1 : 0); } -int capwap_is_timeout(struct timeout_control* timeout, unsigned long index) { +/* */ +int capwap_timeout_hasexpired(struct timeout_control* timeout, unsigned long index) { ASSERT(timeout != NULL); ASSERT(index < CAPWAP_MAX_TIMER); @@ -88,7 +103,8 @@ int capwap_is_timeout(struct timeout_control* timeout, unsigned long index) { return 0; } -void capwap_set_timeout(unsigned long value, struct timeout_control* timeout, unsigned long index) { +/* */ +void capwap_timeout_set(unsigned long value, struct timeout_control* timeout, unsigned long index) { ASSERT(timeout != NULL); ASSERT(index < CAPWAP_MAX_TIMER); @@ -100,14 +116,16 @@ void capwap_set_timeout(unsigned long value, struct timeout_control* timeout, un timeout->items[index].timestop.tv_sec += value; } -void capwap_kill_timeout(struct timeout_control* timeout, unsigned long index) { +/* */ +void capwap_timeout_kill(struct timeout_control* timeout, unsigned long index) { ASSERT(timeout != NULL); ASSERT(index < CAPWAP_MAX_TIMER); timeout->items[index].enable = 0; } -void capwap_killall_timeout(struct timeout_control* timeout) { +/* */ +void capwap_timeout_killall(struct timeout_control* timeout) { long i; ASSERT(timeout != NULL); diff --git a/src/common/capwap.h b/src/common/capwap.h index 4a47e9f..e2a99e4 100644 --- a/src/common/capwap.h +++ b/src/common/capwap.h @@ -85,15 +85,20 @@ struct timeout_control { struct timeout_control_item items[CAPWAP_MAX_TIMER]; }; -void capwap_init_timeout(struct timeout_control* timeout); -long capwap_get_timeout(struct timeout_control* timeout, long* index); -void capwap_update_timeout(struct timeout_control* timeout); -void capwap_set_timeout(unsigned long value, struct timeout_control* timeout, unsigned long index); -void capwap_kill_timeout(struct timeout_control* timeout, unsigned long index); -void capwap_wait_timeout(struct timeout_control* timeout, unsigned long index); -void capwap_killall_timeout(struct timeout_control* timeout); -int capwap_is_enable_timeout(struct timeout_control* timeout, unsigned long index); -int capwap_is_timeout(struct timeout_control* timeout, unsigned long index); +struct timeout_control* capwap_timeout_init(void); +void capwap_timeout_free(struct timeout_control* timeout); + +long capwap_timeout_get(struct timeout_control* timeout, long* index); +void capwap_timeout_update(struct timeout_control* timeout); +void capwap_timeout_set(unsigned long value, struct timeout_control* timeout, unsigned long index); + +void capwap_timeout_wait(struct timeout_control* timeout, unsigned long index); + +int capwap_timeout_isenable(struct timeout_control* timeout, unsigned long index); +int capwap_timeout_hasexpired(struct timeout_control* timeout, unsigned long index); + +void capwap_timeout_kill(struct timeout_control* timeout, unsigned long index); +void capwap_timeout_killall(struct timeout_control* timeout); /* */ void capwap_daemon(void); diff --git a/src/common/capwap_network.c b/src/common/capwap_network.c index 48b0ad5..29f9bfa 100644 --- a/src/common/capwap_network.c +++ b/src/common/capwap_network.c @@ -321,8 +321,8 @@ int capwap_wait_recvready(struct pollfd* fds, int fdscount, struct timeout_contr if (timeout) { long indextimer; - capwap_update_timeout(timeout); - polltimeout = capwap_get_timeout(timeout, &indextimer); + capwap_timeout_update(timeout); + polltimeout = capwap_timeout_get(timeout, &indextimer); if ((polltimeout <= 0) && (indextimer != CAPWAP_TIMER_UNDEF)) { return CAPWAP_RECV_ERROR_TIMEOUT; } @@ -346,7 +346,7 @@ int capwap_wait_recvready(struct pollfd* fds, int fdscount, struct timeout_contr } else if (readysocket == 0) { /* Update timer for detect timeout */ if (timeout) { - capwap_update_timeout(timeout); + capwap_timeout_update(timeout); } return CAPWAP_RECV_ERROR_TIMEOUT; diff --git a/src/wtp/wtp.c b/src/wtp/wtp.c index e6a020e..508a11c 100644 --- a/src/wtp/wtp.c +++ b/src/wtp/wtp.c @@ -48,6 +48,9 @@ static int wtp_init(void) { g_wtp.dfa.rfcDTLSSessionDelete = WTP_DEFAULT_DTLS_SESSION_DELETE; g_wtp.dfa.rfcMaxFailedDTLSSessionRetry = WTP_DEFAULT_FAILED_DTLS_SESSION_RETRY; + /* */ + g_wtp.timeout = capwap_timeout_init(); + /* Socket */ capwap_network_init(&g_wtp.net); @@ -126,6 +129,7 @@ static void wtp_destroy(void) { wtp_free_discovery_response_array(); capwap_array_free(g_wtp.acdiscoveryresponse); + capwap_timeout_free(g_wtp.timeout); /* Free local message elements */ capwap_free(g_wtp.name.name); @@ -1312,18 +1316,16 @@ static int wtp_configure(void) { static void wtp_wait_radio_ready(void) { int index; struct wtp_fds fds; - struct timeout_control timeout; /* Get only radio file descriptor */ memset(&fds, 0, sizeof(struct wtp_fds)); wtp_radio_update_fdevent(&fds); - capwap_init_timeout(&timeout); for (;;) { - capwap_set_timeout(WTP_WAIT_RADIO_INITIALIZATION, &timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(WTP_WAIT_RADIO_INITIALIZATION, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); /* Wait packet */ - index = capwap_wait_recvready(fds.fdspoll, fds.fdstotalcount, &timeout); + index = capwap_wait_recvready(fds.fdspoll, fds.fdstotalcount, g_wtp.timeout); if (index < 0) { break; } else if (!fds.events[index].event_handler) { @@ -1335,6 +1337,7 @@ static void wtp_wait_radio_ready(void) { /* */ wtp_free_fds(&fds); + capwap_timeout_killall(g_wtp.timeout); } /* */ diff --git a/src/wtp/wtp.h b/src/wtp/wtp.h index db004ed..5b7649e 100644 --- a/src/wtp/wtp.h +++ b/src/wtp/wtp.h @@ -96,6 +96,7 @@ struct wtp_t { /* */ struct wtp_state dfa; + struct timeout_control* timeout; struct capwap_wtpname_element name; struct capwap_acname_element acname; diff --git a/src/wtp/wtp_dfa.c b/src/wtp/wtp_dfa.c index 268dede..1808f75 100644 --- a/src/wtp/wtp_dfa.c +++ b/src/wtp/wtp_dfa.c @@ -90,55 +90,55 @@ static void wtp_send_invalid_request(struct capwap_packet_rxmng* rxmngpacket, st } /* WTP Execute state */ -static void wtp_dfa_execute(struct capwap_parsed_packet* packet, struct timeout_control* timeout) { +static void wtp_dfa_execute(struct capwap_parsed_packet* packet) { switch (g_wtp.dfa.state) { case CAPWAP_IDLE_STATE: { - wtp_dfa_state_idle(packet, timeout); + wtp_dfa_state_idle(packet); break; } case CAPWAP_DISCOVERY_STATE: { - wtp_dfa_state_discovery(packet, timeout); + wtp_dfa_state_discovery(packet); break; } case CAPWAP_SULKING_STATE: { - wtp_dfa_state_sulking(packet, timeout); + wtp_dfa_state_sulking(packet); break; } case CAPWAP_DTLS_CONNECT_STATE: { - wtp_teardown_connection(timeout); + wtp_teardown_connection(); break; } case CAPWAP_DTLS_TEARDOWN_STATE: { - wtp_dfa_state_dtlsteardown(packet, timeout); + wtp_dfa_state_dtlsteardown(packet); break; } case CAPWAP_JOIN_STATE: { - wtp_dfa_state_join(packet, timeout); + wtp_dfa_state_join(packet); break; } case CAPWAP_CONFIGURE_STATE: { - wtp_dfa_state_configure(packet, timeout); + wtp_dfa_state_configure(packet); break; } case CAPWAP_RESET_STATE: { - wtp_dfa_state_reset(packet, timeout); + wtp_dfa_state_reset(packet); break; } case CAPWAP_DATA_CHECK_STATE: { - wtp_dfa_state_datacheck(packet, timeout); + wtp_dfa_state_datacheck(packet); break; } case CAPWAP_RUN_STATE: { - wtp_dfa_state_run(packet, timeout); + wtp_dfa_state_run(packet); break; } @@ -150,7 +150,7 @@ static void wtp_dfa_execute(struct capwap_parsed_packet* packet, struct timeout_ } /* */ -static int wtp_recvfrom(struct wtp_fds* fds, void* buffer, int* size, struct sockaddr_storage* recvfromaddr, struct sockaddr_storage* recvtoaddr, struct timeout_control* timeout) { +static int wtp_recvfrom(struct wtp_fds* fds, void* buffer, int* size, struct sockaddr_storage* recvfromaddr, struct sockaddr_storage* recvtoaddr) { int index; ASSERT(fds != NULL); @@ -163,7 +163,7 @@ static int wtp_recvfrom(struct wtp_fds* fds, void* buffer, int* size, struct soc ASSERT(recvtoaddr != NULL); /* Wait packet */ - index = capwap_wait_recvready(fds->fdspoll, fds->fdstotalcount, timeout); + index = capwap_wait_recvready(fds->fdspoll, fds->fdstotalcount, g_wtp.timeout); if (index < 0) { return index; } else if (index >= fds->fdsnetworkcount) { @@ -210,7 +210,6 @@ static void wtp_dfa_init_fdspool(struct wtp_fds* fds, struct capwap_network* net int wtp_dfa_running(void) { int res; int result = CAPWAP_SUCCESSFUL; - struct timeout_control timeout; char bufferencrypt[CAPWAP_MAX_PACKET_SIZE]; char bufferplain[CAPWAP_MAX_PACKET_SIZE]; @@ -227,11 +226,10 @@ int wtp_dfa_running(void) { int isrecvpacket = 0; /* Init */ - capwap_init_timeout(&timeout); memset(&packet, 0, sizeof(struct capwap_parsed_packet)); /* Start DFA with timeout */ - capwap_set_timeout(0, &timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(0, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); /* Configure poll struct */ wtp_dfa_init_fdspool(&g_wtp.fds, &g_wtp.net); @@ -244,7 +242,7 @@ int wtp_dfa_running(void) { /* Init complete, start DFA */ wtp_dfa_change_state(CAPWAP_IDLE_STATE); - wtp_dfa_state_idle(NULL, &timeout); + wtp_dfa_state_idle(NULL); /* */ while (g_wtp.dfa.state != CAPWAP_DEAD_STATE) { @@ -252,16 +250,16 @@ int wtp_dfa_running(void) { isrecvpacket = 0; buffer = bufferencrypt; buffersize = CAPWAP_MAX_PACKET_SIZE; - index = wtp_recvfrom(&g_wtp.fds, buffer, &buffersize, &recvfromaddr, &recvtoaddr, &timeout); + index = wtp_recvfrom(&g_wtp.fds, buffer, &buffersize, &recvfromaddr, &recvtoaddr); if (!g_wtp.running) { capwap_logging_debug("Closing WTP, Teardown connection"); /* Manual teardown */ index = CAPWAP_RECV_ERROR_TIMEOUT; - wtp_teardown_connection(&timeout); + wtp_teardown_connection(); /* Wait RFC teardown timeout */ - capwap_wait_timeout(&timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_wait(g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } if (index >= 0) { @@ -306,18 +304,18 @@ int wtp_dfa_running(void) { if (socket.isctrlsocket) { if (g_wtp.dfa.state == CAPWAP_DTLS_CONNECT_STATE) { check = CAPWAP_NONE_PACKET; - wtp_send_join(&timeout); + wtp_send_join(); } else { check = CAPWAP_WRONG_PACKET; - wtp_teardown_connection(&timeout); + wtp_teardown_connection(); } } else { if (g_wtp.dfa.state == CAPWAP_DATA_CHECK_STATE) { check = CAPWAP_NONE_PACKET; - wtp_start_datachannel(&timeout); + wtp_start_datachannel(); } else { check = CAPWAP_WRONG_PACKET; - wtp_teardown_connection(&timeout); + wtp_teardown_connection(); } } } @@ -325,7 +323,7 @@ int wtp_dfa_running(void) { continue; /* Next packet */ } else { if ((oldaction == CAPWAP_DTLS_ACTION_DATA) && (dtls->action == CAPWAP_DTLS_ACTION_SHUTDOWN)) { - wtp_teardown_connection(&timeout); + wtp_teardown_connection(); } continue; /* Next packet */ @@ -448,7 +446,7 @@ int wtp_dfa_running(void) { } /* Execute state */ - wtp_dfa_execute((isrecvpacket ? &packet : NULL), &timeout); + wtp_dfa_execute((isrecvpacket ? &packet : NULL)); /* Free memory */ capwap_free_parsed_packet(&packet); diff --git a/src/wtp/wtp_dfa.h b/src/wtp/wtp_dfa.h index 6df6c5d..1d9d2c4 100644 --- a/src/wtp/wtp_dfa.h +++ b/src/wtp/wtp_dfa.h @@ -17,7 +17,7 @@ void wtp_free_discovery_response_array(void); int wtp_bio_send(struct capwap_dtls* dtls, char* buffer, int length, void* param); /* */ -void wtp_teardown_connection(struct timeout_control* timeout); +void wtp_teardown_connection(void); /* */ void wtp_free_packet_rxmng(int isctrlmsg); @@ -29,24 +29,24 @@ int wtp_dfa_running(void); void wtp_dfa_change_state(int state); /* */ -void wtp_start_dtlssetup(struct timeout_control* timeout); -void wtp_start_datachannel(struct timeout_control* timeout); +void wtp_start_dtlssetup(void); +void wtp_start_datachannel(void); /* */ -void wtp_send_join(struct timeout_control* timeout); -void wtp_send_configure(struct timeout_control* timeout); -void wtp_send_datacheck(struct timeout_control* timeout); +void wtp_send_join(void); +void wtp_send_configure(void); +void wtp_send_datacheck(void); /* */ -void wtp_dfa_state_idle(struct capwap_parsed_packet* packet, struct timeout_control* timeout); -void wtp_dfa_state_discovery(struct capwap_parsed_packet* packet, struct timeout_control* timeout); -void wtp_dfa_state_dtlsteardown(struct capwap_parsed_packet* packet, struct timeout_control* timeout); -void wtp_dfa_state_sulking(struct capwap_parsed_packet* packet, struct timeout_control* timeout); -void wtp_dfa_state_join(struct capwap_parsed_packet* packet, struct timeout_control* timeout); -void wtp_dfa_state_configure(struct capwap_parsed_packet* packet, struct timeout_control* timeout); -void wtp_dfa_state_datacheck(struct capwap_parsed_packet* packet, struct timeout_control* timeout); -void wtp_dfa_state_run(struct capwap_parsed_packet* packet, struct timeout_control* timeout); -void wtp_dfa_state_reset(struct capwap_parsed_packet* packet, struct timeout_control* timeout); +void wtp_dfa_state_idle(struct capwap_parsed_packet* packet); +void wtp_dfa_state_discovery(struct capwap_parsed_packet* packet); +void wtp_dfa_state_dtlsteardown(struct capwap_parsed_packet* packet); +void wtp_dfa_state_sulking(struct capwap_parsed_packet* packet); +void wtp_dfa_state_join(struct capwap_parsed_packet* packet); +void wtp_dfa_state_configure(struct capwap_parsed_packet* packet); +void wtp_dfa_state_datacheck(struct capwap_parsed_packet* packet); +void wtp_dfa_state_run(struct capwap_parsed_packet* packet); +void wtp_dfa_state_reset(struct capwap_parsed_packet* packet); /* */ void wtp_send_data_wireless_packet(uint8_t radioid, uint8_t wlanid, const struct ieee80211_header_mgmt* mgmt, int mgmtlength, int leavenativeframe); diff --git a/src/wtp/wtp_dfa_configure.c b/src/wtp/wtp_dfa_configure.c index 2cfc834..0b8633f 100644 --- a/src/wtp/wtp_dfa_configure.c +++ b/src/wtp/wtp_dfa_configure.c @@ -7,13 +7,11 @@ #include "wtp_radio.h" /* */ -void wtp_send_configure(struct timeout_control* timeout) { +void wtp_send_configure(void) { int i; struct capwap_header_data capwapheader; struct capwap_packet_txmng* txmngpacket; - ASSERT(timeout != NULL); - /* Build packet */ capwap_header_init(&capwapheader, CAPWAP_RADIOID_NONE, g_wtp.binding); txmngpacket = capwap_packet_txmng_create_ctrl_message(&capwapheader, CAPWAP_CONFIGURATION_STATUS_REQUEST, g_wtp.localseqnumber++, g_wtp.mtu); @@ -90,23 +88,21 @@ void wtp_send_configure(struct timeout_control* timeout) { /* Send Configuration Status request to AC */ if (capwap_crypt_sendto_fragmentpacket(&g_wtp.ctrldtls, g_wtp.acctrlsock.socket[g_wtp.acctrlsock.type], g_wtp.requestfragmentpacket, &g_wtp.wtpctrladdress, &g_wtp.acctrladdress)) { g_wtp.dfa.rfcRetransmitCount = 0; - capwap_set_timeout(g_wtp.dfa.rfcRetransmitInterval, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(g_wtp.dfa.rfcRetransmitInterval, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); wtp_dfa_change_state(CAPWAP_CONFIGURE_STATE); } else { /* Error to send packets */ capwap_logging_debug("Warning: error to send configuration status request packet"); wtp_free_reference_last_request(); - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } } /* */ -void wtp_dfa_state_configure(struct capwap_parsed_packet* packet, struct timeout_control* timeout) { +void wtp_dfa_state_configure(struct capwap_parsed_packet* packet) { struct capwap_timers_element* timers; struct capwap_resultcode_element* resultcode; - ASSERT(timeout != NULL); - if (packet) { unsigned short binding; @@ -120,7 +116,7 @@ void wtp_dfa_state_configure(struct capwap_parsed_packet* packet, struct timeout resultcode = (struct capwap_resultcode_element*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_RESULTCODE); if (resultcode && !CAPWAP_RESULTCODE_OK(resultcode->code)) { capwap_logging_warning("Receive Configure Status Response with error: %d", (int)resultcode->code); - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } else { /* Timers */ timers = (struct capwap_timers_element*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_TIMERS); @@ -129,10 +125,10 @@ void wtp_dfa_state_configure(struct capwap_parsed_packet* packet, struct timeout /* Binding values */ if (!wtp_radio_setconfiguration(packet)) { - wtp_send_datacheck(timeout); /* Send change state event packet */ + wtp_send_datacheck(); /* Send change state event packet */ } else { capwap_logging_warning("Receive Configure Status Response with invalid elements"); - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } } } @@ -142,7 +138,7 @@ void wtp_dfa_state_configure(struct capwap_parsed_packet* packet, struct timeout if (g_wtp.dfa.rfcRetransmitCount >= g_wtp.dfa.rfcMaxRetransmit) { /* Timeout join state */ wtp_free_reference_last_request(); - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } else { /* Retransmit configuration status request */ if (!capwap_crypt_sendto_fragmentpacket(&g_wtp.ctrldtls, g_wtp.acctrlsock.socket[g_wtp.acctrlsock.type], g_wtp.requestfragmentpacket, &g_wtp.wtpctrladdress, &g_wtp.acctrladdress)) { @@ -150,7 +146,7 @@ void wtp_dfa_state_configure(struct capwap_parsed_packet* packet, struct timeout } /* Update timeout */ - capwap_set_timeout(g_wtp.dfa.rfcRetransmitInterval, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(g_wtp.dfa.rfcRetransmitInterval, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } } } diff --git a/src/wtp/wtp_dfa_datacheck.c b/src/wtp/wtp_dfa_datacheck.c index 6e6caeb..cc932f7 100644 --- a/src/wtp/wtp_dfa_datacheck.c +++ b/src/wtp/wtp_dfa_datacheck.c @@ -4,13 +4,11 @@ #include "wtp_dfa.h" /* */ -void wtp_send_datacheck(struct timeout_control* timeout) { +void wtp_send_datacheck(void) { struct capwap_header_data capwapheader; struct capwap_packet_txmng* txmngpacket; struct capwap_resultcode_element resultcode = { .code = CAPWAP_RESULTCODE_SUCCESS }; - ASSERT(timeout != NULL); - /* Build packet */ capwap_header_init(&capwapheader, CAPWAP_RADIOID_NONE, g_wtp.binding); txmngpacket = capwap_packet_txmng_create_ctrl_message(&capwapheader, CAPWAP_CHANGE_STATE_EVENT_REQUEST, g_wtp.localseqnumber++, g_wtp.mtu); @@ -36,23 +34,21 @@ void wtp_send_datacheck(struct timeout_control* timeout) { /* Send Change State Event request to AC */ if (capwap_crypt_sendto_fragmentpacket(&g_wtp.ctrldtls, g_wtp.acctrlsock.socket[g_wtp.acctrlsock.type], g_wtp.requestfragmentpacket, &g_wtp.wtpctrladdress, &g_wtp.acctrladdress)) { g_wtp.dfa.rfcRetransmitCount = 0; - capwap_set_timeout(g_wtp.dfa.rfcRetransmitInterval, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(g_wtp.dfa.rfcRetransmitInterval, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); wtp_dfa_change_state(CAPWAP_DATA_CHECK_STATE); } else { /* Error to send packets */ capwap_logging_debug("Warning: error to send change state event request packet"); wtp_free_reference_last_request(); - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } } /* */ -void wtp_dfa_state_datacheck(struct capwap_parsed_packet* packet, struct timeout_control* timeout) { +void wtp_dfa_state_datacheck(struct capwap_parsed_packet* packet) { unsigned short binding; struct capwap_resultcode_element* resultcode; - ASSERT(timeout != NULL); - if (packet) { binding = GET_WBID_HEADER(packet->rxmngpacket->header); if (packet->rxmngpacket->isctrlpacket && (binding == g_wtp.binding) && (packet->rxmngpacket->ctrlmsg.type == CAPWAP_CHANGE_STATE_EVENT_RESPONSE) && ((g_wtp.localseqnumber - 1) == packet->rxmngpacket->ctrlmsg.seq)) { @@ -63,10 +59,10 @@ void wtp_dfa_state_datacheck(struct capwap_parsed_packet* packet, struct timeout resultcode = (struct capwap_resultcode_element*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_RESULTCODE); if (resultcode && !CAPWAP_RESULTCODE_OK(resultcode->code)) { capwap_logging_warning("Receive Data Check Response with error: %d", (int)resultcode->code); - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } else { /* TODO: gestione richiesta */ - wtp_start_datachannel(timeout); + wtp_start_datachannel(); } } } else { @@ -75,7 +71,7 @@ void wtp_dfa_state_datacheck(struct capwap_parsed_packet* packet, struct timeout if (g_wtp.dfa.rfcRetransmitCount >= g_wtp.dfa.rfcMaxRetransmit) { /* Timeout join state */ wtp_free_reference_last_request(); - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } else { /* Retransmit change state request */ if (!capwap_crypt_sendto_fragmentpacket(&g_wtp.ctrldtls, g_wtp.acctrlsock.socket[g_wtp.acctrlsock.type], g_wtp.requestfragmentpacket, &g_wtp.wtpctrladdress, &g_wtp.acctrladdress)) { @@ -83,7 +79,7 @@ void wtp_dfa_state_datacheck(struct capwap_parsed_packet* packet, struct timeout } /* Update timeout */ - capwap_set_timeout(g_wtp.dfa.rfcRetransmitInterval, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(g_wtp.dfa.rfcRetransmitInterval, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } } } diff --git a/src/wtp/wtp_dfa_discovery.c b/src/wtp/wtp_dfa_discovery.c index f619f02..23b23a1 100644 --- a/src/wtp/wtp_dfa_discovery.c +++ b/src/wtp/wtp_dfa_discovery.c @@ -21,11 +21,9 @@ void wtp_free_discovery_response_array(void) { } /* */ -void wtp_dfa_state_discovery(struct capwap_parsed_packet* packet, struct timeout_control* timeout) { +void wtp_dfa_state_discovery(struct capwap_parsed_packet* packet) { struct capwap_array* controlip; - ASSERT(timeout != NULL); - if (packet) { unsigned short binding; @@ -182,9 +180,9 @@ void wtp_dfa_state_discovery(struct capwap_parsed_packet* packet, struct timeout /* */ if (!g_wtp.enabledtls) { - wtp_send_join(timeout); /* Bypass DTLS connection */ + wtp_send_join(); /* Bypass DTLS connection */ } else { - wtp_start_dtlssetup(timeout); /* Create DTLS connection */ + wtp_start_dtlssetup(); /* Create DTLS connection */ } return; @@ -197,7 +195,7 @@ void wtp_dfa_state_discovery(struct capwap_parsed_packet* packet, struct timeout g_wtp.dfa.rfcDiscoveryCount++; if (g_wtp.dfa.rfcDiscoveryCount >= g_wtp.dfa.rfcMaxDiscoveries) { /* Timeout discovery state */ - capwap_set_timeout(g_wtp.dfa.rfcSilentInterval, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(g_wtp.dfa.rfcSilentInterval, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); wtp_dfa_change_state(CAPWAP_SULKING_STATE); } else { int i; @@ -253,7 +251,7 @@ void wtp_dfa_state_discovery(struct capwap_parsed_packet* packet, struct timeout wtp_free_reference_last_request(); /* Wait before send another Discovery Request */ - capwap_set_timeout(g_wtp.dfa.rfcDiscoveryInterval, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(g_wtp.dfa.rfcDiscoveryInterval, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } } } diff --git a/src/wtp/wtp_dfa_dtls.c b/src/wtp/wtp_dfa_dtls.c index c867220..5e75171 100644 --- a/src/wtp/wtp_dfa_dtls.c +++ b/src/wtp/wtp_dfa_dtls.c @@ -12,49 +12,45 @@ int wtp_bio_send(struct capwap_dtls* dtls, char* buffer, int length, void* param } /* */ -void wtp_start_dtlssetup(struct timeout_control* timeout) { - ASSERT(timeout != NULL); - +void wtp_start_dtlssetup(void) { /* Create DTLS session */ if (!capwap_crypt_createsession(&g_wtp.ctrldtls, CAPWAP_DTLS_CONTROL_SESSION, &g_wtp.dtlscontext, wtp_bio_send, NULL)) { - capwap_set_timeout(g_wtp.dfa.rfcSilentInterval, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(g_wtp.dfa.rfcSilentInterval, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); wtp_dfa_change_state(CAPWAP_SULKING_STATE); } else { if (capwap_crypt_open(&g_wtp.ctrldtls, &g_wtp.acctrladdress) == CAPWAP_HANDSHAKE_ERROR) { - capwap_set_timeout(g_wtp.dfa.rfcSilentInterval, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(g_wtp.dfa.rfcSilentInterval, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); wtp_dfa_change_state(CAPWAP_SULKING_STATE); } else { - capwap_set_timeout(g_wtp.dfa.rfcWaitDTLS, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(g_wtp.dfa.rfcWaitDTLS, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); wtp_dfa_change_state(CAPWAP_DTLS_CONNECT_STATE); } } } /* */ -void wtp_start_datachannel(struct timeout_control* timeout) { +void wtp_start_datachannel(void) { struct capwap_list* txfragpacket; struct capwap_header_data capwapheader; struct capwap_packet_txmng* txmngpacket; - ASSERT(timeout != NULL); - /* If need, create DTLS Data channel crypted */ if (g_wtp.dtlsdatapolicy & CAPWAP_ACDESC_DTLS_DATA_CHANNEL_ENABLED) { if (!g_wtp.datadtls.enable) { /* Create DTLS data session before send data keepalive */ if (capwap_crypt_createsession(&g_wtp.datadtls, CAPWAP_DTLS_DATA_SESSION, &g_wtp.dtlscontext, wtp_bio_send, NULL)) { if (capwap_crypt_open(&g_wtp.datadtls, &g_wtp.acdataaddress) == CAPWAP_HANDSHAKE_CONTINUE) { - capwap_set_timeout(g_wtp.dfa.rfcWaitDTLS, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); /* Wait complete dtls handshake */ + capwap_timeout_set(g_wtp.dfa.rfcWaitDTLS, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); /* Wait complete dtls handshake */ } else { - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } } else { - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } return; } else if (g_wtp.datadtls.action != CAPWAP_DTLS_ACTION_DATA) { - wtp_teardown_connection(timeout); + wtp_teardown_connection(); return; } } @@ -77,18 +73,18 @@ void wtp_start_datachannel(struct timeout_control* timeout) { g_wtp.acpreferedselected = 0; /* Set timer */ - capwap_kill_timeout(timeout, CAPWAP_TIMER_CONTROL_CONNECTION); - capwap_set_timeout(g_wtp.dfa.rfcEchoInterval, timeout, CAPWAP_TIMER_CONTROL_ECHO); - capwap_set_timeout(g_wtp.dfa.rfcDataChannelDeadInterval, timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD); + capwap_timeout_kill(g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(g_wtp.dfa.rfcEchoInterval, g_wtp.timeout, CAPWAP_TIMER_CONTROL_ECHO); + capwap_timeout_set(g_wtp.dfa.rfcDataChannelDeadInterval, g_wtp.timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD); wtp_dfa_change_state(CAPWAP_RUN_STATE); } else { /* Error to send packets */ capwap_logging_debug("Warning: error to send data channel keepalive packet"); - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } } else { capwap_logging_debug("Warning: error to send data channel keepalive packet, fragment packet"); - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } /* Free packets manager */ @@ -97,9 +93,7 @@ void wtp_start_datachannel(struct timeout_control* timeout) { } /* Teardown connection */ -void wtp_teardown_connection(struct timeout_control* timeout) { - ASSERT(timeout != NULL); - +void wtp_teardown_connection(void) { g_wtp.teardown = 1; /* DTSL Control */ @@ -113,15 +107,13 @@ void wtp_teardown_connection(struct timeout_control* timeout) { } /* */ - capwap_killall_timeout(timeout); - capwap_set_timeout(g_wtp.dfa.rfcDTLSSessionDelete, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_killall(g_wtp.timeout); + capwap_timeout_set(g_wtp.dfa.rfcDTLSSessionDelete, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); wtp_dfa_change_state(CAPWAP_DTLS_TEARDOWN_STATE); } /* */ -void wtp_dfa_state_dtlsteardown(struct capwap_parsed_packet* packet, struct timeout_control* timeout) { - ASSERT(timeout != NULL); - +void wtp_dfa_state_dtlsteardown(struct capwap_parsed_packet* packet) { if (packet) { return; } @@ -151,10 +143,10 @@ void wtp_dfa_state_dtlsteardown(struct capwap_parsed_packet* packet, struct time if (!g_wtp.running) { wtp_dfa_change_state(CAPWAP_DEAD_STATE); } else if ((g_wtp.dfa.rfcFailedDTLSSessionCount >= g_wtp.dfa.rfcMaxFailedDTLSSessionRetry) || (g_wtp.dfa.rfcFailedDTLSAuthFailCount >= g_wtp.dfa.rfcMaxFailedDTLSSessionRetry)) { - capwap_set_timeout(g_wtp.dfa.rfcSilentInterval, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(g_wtp.dfa.rfcSilentInterval, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); wtp_dfa_change_state(CAPWAP_SULKING_STATE); } else { - capwap_set_timeout(0, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(0, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); wtp_dfa_change_state(CAPWAP_IDLE_STATE); } } diff --git a/src/wtp/wtp_dfa_idle.c b/src/wtp/wtp_dfa_idle.c index 1e05fe5..6689e41 100644 --- a/src/wtp/wtp_dfa_idle.c +++ b/src/wtp/wtp_dfa_idle.c @@ -3,9 +3,7 @@ #include "wtp_dfa.h" /* */ -void wtp_dfa_state_idle(struct capwap_parsed_packet* packet, struct timeout_control* timeout) { - ASSERT(timeout != NULL); - +void wtp_dfa_state_idle(struct capwap_parsed_packet* packet) { /* Ignore packets */ if (packet) { return; @@ -13,7 +11,7 @@ void wtp_dfa_state_idle(struct capwap_parsed_packet* packet, struct timeout_cont /* Remove teardown */ g_wtp.teardown = 0; - capwap_killall_timeout(timeout); + capwap_timeout_killall(g_wtp.timeout); /* */ if (!g_wtp.acdiscoveryrequest && (g_wtp.acpreferedarray->count > 0)) { @@ -45,9 +43,9 @@ void wtp_dfa_state_idle(struct capwap_parsed_packet* packet, struct timeout_cont /* */ if (!g_wtp.enabledtls) { - wtp_send_join(timeout); /* Bypass DTLS connection */ + wtp_send_join(); /* Bypass DTLS connection */ } else { - wtp_start_dtlssetup(timeout); /* Create DTLS connection */ + wtp_start_dtlssetup(); /* Create DTLS connection */ } return; @@ -67,5 +65,5 @@ void wtp_dfa_state_idle(struct capwap_parsed_packet* packet, struct timeout_cont wtp_dfa_change_state(CAPWAP_DISCOVERY_STATE); /* Wait before send Discovery Request */ - capwap_set_timeout(g_wtp.dfa.rfcDiscoveryInterval, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(g_wtp.dfa.rfcDiscoveryInterval, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } diff --git a/src/wtp/wtp_dfa_join.c b/src/wtp/wtp_dfa_join.c index 4090ab5..25b7086 100644 --- a/src/wtp/wtp_dfa_join.c +++ b/src/wtp/wtp_dfa_join.c @@ -7,12 +7,10 @@ #include "wtp_radio.h" /* */ -void wtp_send_join(struct timeout_control* timeout) { +void wtp_send_join(void) { struct capwap_header_data capwapheader; struct capwap_packet_txmng* txmngpacket; - ASSERT(timeout != NULL); - /* Reset DTLS counter */ g_wtp.dfa.rfcFailedDTLSSessionCount = 0; @@ -80,25 +78,23 @@ void wtp_send_join(struct timeout_control* timeout) { /* Send join request to AC */ if (capwap_crypt_sendto_fragmentpacket(&g_wtp.ctrldtls, g_wtp.acctrlsock.socket[g_wtp.acctrlsock.type], g_wtp.requestfragmentpacket, &g_wtp.wtpctrladdress, &g_wtp.acctrladdress)) { g_wtp.dfa.rfcRetransmitCount = 0; - capwap_set_timeout(g_wtp.dfa.rfcRetransmitInterval, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(g_wtp.dfa.rfcRetransmitInterval, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); wtp_dfa_change_state(CAPWAP_JOIN_STATE); } else { /* Error to send packets */ capwap_logging_debug("Warning: error to send join request packet"); wtp_free_reference_last_request(); - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } } /* */ -void wtp_dfa_state_join(struct capwap_parsed_packet* packet, struct timeout_control* timeout) { +void wtp_dfa_state_join(struct capwap_parsed_packet* packet) { unsigned short binding; struct capwap_acdescriptor_element* acdescriptor; struct capwap_acname_element* acname; struct capwap_resultcode_element* resultcode; - ASSERT(timeout != NULL); - if (packet) { binding = GET_WBID_HEADER(packet->rxmngpacket->header); if (packet->rxmngpacket->isctrlpacket && (binding == g_wtp.binding) && (packet->rxmngpacket->ctrlmsg.type == CAPWAP_JOIN_RESPONSE) && ((g_wtp.localseqnumber - 1) == packet->rxmngpacket->ctrlmsg.seq)) { @@ -109,7 +105,7 @@ void wtp_dfa_state_join(struct capwap_parsed_packet* packet, struct timeout_cont resultcode = (struct capwap_resultcode_element*)capwap_get_message_element_data(packet, CAPWAP_ELEMENT_RESULTCODE); if (resultcode && !CAPWAP_RESULTCODE_OK(resultcode->code)) { capwap_logging_warning("Receive Join Response with error: %d", (int)resultcode->code); - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } else { /* TODO: gestione richiesta CAPWAP_IMAGE_DATA_STATE <-> CAPWAP_CONFIGURE_STATE */ @@ -125,14 +121,14 @@ void wtp_dfa_state_join(struct capwap_parsed_packet* packet, struct timeout_cont /* Binding values */ if (!wtp_radio_setconfiguration(packet)) { - wtp_send_configure(timeout); /* Send configuration packet */ + wtp_send_configure(); /* Send configuration packet */ } else { capwap_logging_warning("Receive Join Response with invalid elements"); - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } } else { capwap_logging_warning("Receive Join Response with invalid DTLS data policy"); - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } } } @@ -142,7 +138,7 @@ void wtp_dfa_state_join(struct capwap_parsed_packet* packet, struct timeout_cont if (g_wtp.dfa.rfcRetransmitCount >= g_wtp.dfa.rfcMaxRetransmit) { /* Timeout join state */ wtp_free_reference_last_request(); - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } else { /* Retransmit join request */ if (!capwap_crypt_sendto_fragmentpacket(&g_wtp.ctrldtls, g_wtp.acctrlsock.socket[g_wtp.acctrlsock.type], g_wtp.requestfragmentpacket, &g_wtp.wtpctrladdress, &g_wtp.acctrladdress)) { @@ -150,7 +146,7 @@ void wtp_dfa_state_join(struct capwap_parsed_packet* packet, struct timeout_cont } /* Update timeout */ - capwap_set_timeout(g_wtp.dfa.rfcRetransmitInterval, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(g_wtp.dfa.rfcRetransmitInterval, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } } } diff --git a/src/wtp/wtp_dfa_reset.c b/src/wtp/wtp_dfa_reset.c index d2a1bec..ddc89a2 100644 --- a/src/wtp/wtp_dfa_reset.c +++ b/src/wtp/wtp_dfa_reset.c @@ -3,12 +3,10 @@ #include "wtp_dfa.h" /* */ -void wtp_dfa_state_reset(struct capwap_parsed_packet* packet, struct timeout_control* timeout) { - ASSERT(timeout != NULL); - +void wtp_dfa_state_reset(struct capwap_parsed_packet* packet) { /* Teardown connection and close application */ g_wtp.running = 0; - wtp_teardown_connection(timeout); + wtp_teardown_connection(); /* TODO schedule reboot device */ } diff --git a/src/wtp/wtp_dfa_run.c b/src/wtp/wtp_dfa_run.c index 71a4393..8793556 100644 --- a/src/wtp/wtp_dfa_run.c +++ b/src/wtp/wtp_dfa_run.c @@ -160,7 +160,7 @@ static void receive_ieee80211_wlan_configuration_request(struct capwap_parsed_pa } /* */ -static void send_data_keepalive_request(struct timeout_control* timeout) { +static void send_data_keepalive_request() { struct capwap_list* txfragpacket; struct capwap_header_data capwapheader; struct capwap_packet_txmng* txmngpacket; @@ -179,16 +179,16 @@ static void send_data_keepalive_request(struct timeout_control* timeout) { if (txfragpacket->count == 1) { /* Send Data keepalive to AC */ if (capwap_crypt_sendto_fragmentpacket(&g_wtp.datadtls, g_wtp.acdatasock.socket[g_wtp.acdatasock.type], txfragpacket, &g_wtp.wtpdataaddress, &g_wtp.acdataaddress)) { - capwap_kill_timeout(timeout, CAPWAP_TIMER_DATA_KEEPALIVE); - capwap_set_timeout(g_wtp.dfa.rfcDataChannelDeadInterval, timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD); + capwap_timeout_kill(g_wtp.timeout, CAPWAP_TIMER_DATA_KEEPALIVE); + capwap_timeout_set(g_wtp.dfa.rfcDataChannelDeadInterval, g_wtp.timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD); } else { /* Error to send packets */ capwap_logging_debug("Warning: error to send data channel keepalive packet"); - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } } else { capwap_logging_debug("Warning: error to send data channel keepalive packet, fragment packet"); - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } /* Free packets manager */ @@ -227,9 +227,7 @@ void wtp_send_data_wireless_packet(uint8_t radioid, uint8_t wlanid, const struct } /* */ -void wtp_dfa_state_run(struct capwap_parsed_packet* packet, struct timeout_control* timeout) { - ASSERT(timeout != NULL); - +void wtp_dfa_state_run(struct capwap_parsed_packet* packet) { if (packet) { if (packet->rxmngpacket->isctrlpacket) { if (capwap_is_request_type(packet->rxmngpacket->ctrlmsg.type) || ((g_wtp.localseqnumber - 1) == packet->rxmngpacket->ctrlmsg.seq)) { @@ -246,8 +244,8 @@ void wtp_dfa_state_run(struct capwap_parsed_packet* packet, struct timeout_contr case CAPWAP_ECHO_RESPONSE: { if (!receive_echo_response(packet)) { - capwap_kill_timeout(timeout, CAPWAP_TIMER_CONTROL_CONNECTION); - capwap_set_timeout(g_wtp.dfa.rfcEchoInterval, timeout, CAPWAP_TIMER_CONTROL_ECHO); + capwap_timeout_kill(g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(g_wtp.dfa.rfcEchoInterval, g_wtp.timeout, CAPWAP_TIMER_CONTROL_ECHO); } break; @@ -280,7 +278,7 @@ void wtp_dfa_state_run(struct capwap_parsed_packet* packet, struct timeout_contr case CAPWAP_RESET_REQUEST: { receive_reset_request(packet); - capwap_set_timeout(0, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(0, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); wtp_dfa_change_state(CAPWAP_RESET_STATE); break; } @@ -292,29 +290,29 @@ void wtp_dfa_state_run(struct capwap_parsed_packet* packet, struct timeout_contr } } } else { - if (IS_FLAG_K_HEADER(packet->rxmngpacket->header) && capwap_is_enable_timeout(timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD)) { + if (IS_FLAG_K_HEADER(packet->rxmngpacket->header) && capwap_timeout_isenable(g_wtp.timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD)) { if (!memcmp(capwap_get_message_element_data(packet, CAPWAP_ELEMENT_SESSIONID), &g_wtp.sessionid, sizeof(struct capwap_sessionid_element))) { /* Receive Data Keep-Alive, wait for next packet */ - capwap_kill_timeout(timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD); - capwap_set_timeout(g_wtp.dfa.rfcDataChannelKeepAlive, timeout, CAPWAP_TIMER_DATA_KEEPALIVE); + capwap_timeout_kill(g_wtp.timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD); + capwap_timeout_set(g_wtp.dfa.rfcDataChannelKeepAlive, g_wtp.timeout, CAPWAP_TIMER_DATA_KEEPALIVE); } } else { /* TODO */ /* Update data keep-alive timeout */ - if (!capwap_is_enable_timeout(timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD)) { - capwap_set_timeout(g_wtp.dfa.rfcDataChannelKeepAlive, timeout, CAPWAP_TIMER_DATA_KEEPALIVE); + if (!capwap_timeout_isenable(g_wtp.timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD)) { + capwap_timeout_set(g_wtp.dfa.rfcDataChannelKeepAlive, g_wtp.timeout, CAPWAP_TIMER_DATA_KEEPALIVE); } } } } else { - if (capwap_is_timeout(timeout, CAPWAP_TIMER_CONTROL_CONNECTION)) { + if (capwap_timeout_hasexpired(g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION)) { /* No response received */ g_wtp.dfa.rfcRetransmitCount++; if (g_wtp.dfa.rfcRetransmitCount >= g_wtp.dfa.rfcMaxRetransmit) { /* Timeout run state */ wtp_free_reference_last_request(); - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } else { /* Retransmit request */ if (!capwap_crypt_sendto_fragmentpacket(&g_wtp.ctrldtls, g_wtp.acctrlsock.socket[g_wtp.acctrlsock.type], g_wtp.requestfragmentpacket, &g_wtp.wtpctrladdress, &g_wtp.acctrladdress)) { @@ -322,24 +320,24 @@ void wtp_dfa_state_run(struct capwap_parsed_packet* packet, struct timeout_contr } /* Update timeout */ - capwap_set_timeout(g_wtp.dfa.rfcRetransmitInterval, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(g_wtp.dfa.rfcRetransmitInterval, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } - } else if (capwap_is_timeout(timeout, CAPWAP_TIMER_CONTROL_ECHO)) { + } else if (capwap_timeout_hasexpired(g_wtp.timeout, CAPWAP_TIMER_CONTROL_ECHO)) { /* Disable echo timer */ - capwap_kill_timeout(timeout, CAPWAP_TIMER_CONTROL_ECHO); + capwap_timeout_kill(g_wtp.timeout, CAPWAP_TIMER_CONTROL_ECHO); if (!send_echo_request()) { g_wtp.dfa.rfcRetransmitCount = 0; - capwap_set_timeout(g_wtp.dfa.rfcRetransmitInterval, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(g_wtp.dfa.rfcRetransmitInterval, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); } else { - wtp_teardown_connection(timeout); + wtp_teardown_connection(); } - } else if (capwap_is_timeout(timeout, CAPWAP_TIMER_DATA_KEEPALIVE)) { - send_data_keepalive_request(timeout); - } else if (capwap_is_timeout(timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD)) { + } else if (capwap_timeout_hasexpired(g_wtp.timeout, CAPWAP_TIMER_DATA_KEEPALIVE)) { + send_data_keepalive_request(); + } else if (capwap_timeout_hasexpired(g_wtp.timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD)) { /* Data Keep-Alive timeout */ - capwap_kill_timeout(timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD); - wtp_teardown_connection(timeout); + capwap_timeout_kill(g_wtp.timeout, CAPWAP_TIMER_DATA_KEEPALIVEDEAD); + wtp_teardown_connection(); } } } diff --git a/src/wtp/wtp_dfa_sulking.c b/src/wtp/wtp_dfa_sulking.c index 1f22ee6..e9f271f 100644 --- a/src/wtp/wtp_dfa_sulking.c +++ b/src/wtp/wtp_dfa_sulking.c @@ -3,16 +3,14 @@ #include "wtp_dfa.h" /* */ -void wtp_dfa_state_sulking(struct capwap_parsed_packet* packet, struct timeout_control* timeout) { - ASSERT(timeout != NULL); - +void wtp_dfa_state_sulking(struct capwap_parsed_packet* packet) { if (!packet) { g_wtp.dfa.rfcDiscoveryCount = 0; g_wtp.dfa.rfcFailedDTLSSessionCount = 0; g_wtp.dfa.rfcFailedDTLSAuthFailCount = 0; /* */ - capwap_set_timeout(0, timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + capwap_timeout_set(0, g_wtp.timeout, CAPWAP_TIMER_CONTROL_CONNECTION); wtp_dfa_change_state(CAPWAP_IDLE_STATE); } }