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

Refactoring timeout functions, change functions name and add timeout handler

Browse Source 
into session.
This commit is contained in:
vemax78
2014-02-19 19:16:33 +01:00
parent dff6ecb5e0
commit ea02d7379e
25 changed files with 224 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/wtp/wtp_dfa_discovery.c
View File

@ -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);
}
}
}