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

11
src/wtp/wtp.c
View File

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

1
src/wtp/wtp.h
View File

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

50
src/wtp/wtp_dfa.c
View File

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

30
src/wtp/wtp_dfa.h
View File

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

22
src/wtp/wtp_dfa_configure.c
View File

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

20
src/wtp/wtp_dfa_datacheck.c
View File

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

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

48
src/wtp/wtp_dfa_dtls.c
View File

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

12
src/wtp/wtp_dfa_idle.c
View File

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

24
src/wtp/wtp_dfa_join.c
View File

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

6
src/wtp/wtp_dfa_reset.c
View File

@ -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 */
}

54
src/wtp/wtp_dfa_run.c
View File

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

6
src/wtp/wtp_dfa_sulking.c
View File

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