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

rework overly deep if statement in wtp_dfa_running

Browse Source
This commit is contained in:
Andreas Schultz 2016-03-26 20:18:25 +01:00
parent de9b54e8b1
commit 258c8ff750
1 changed files with 148 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/wtp/wtp_dfa.c
View File

@ -337,21 +337,38 @@ int wtp_dfa_running(void) {
/* */ /* */
while (g_wtp.state != CAPWAP_DEAD_STATE) { while (g_wtp.state != CAPWAP_DEAD_STATE) {
int check;
struct capwap_packet_rxmng* rxmngpacket;
/* If request wait packet from AC */ /* If request wait packet from AC */
buffer = bufferencrypt; buffer = bufferencrypt;
buffersize = CAPWAP_MAX_PACKET_SIZE; buffersize = CAPWAP_MAX_PACKET_SIZE;
index = wtp_recvfrom(&g_wtp.fds, buffer, &buffersize, &fromaddr, &toaddr); index = wtp_recvfrom(&g_wtp.fds, buffer, &buffersize, &fromaddr, &toaddr);
capwap_logging_debug("WTP got data: idx: %d, size: %d", index, buffersize); capwap_logging_debug("WTP got data: idx: %d, size: %d", index, buffersize);
if (!g_wtp.running) { if (!g_wtp.running) {
capwap_logging_debug("Closing WTP, Teardown connection"); capwap_logging_debug("Closing WTP, Teardown connection");
wtp_dfa_closeapp(); wtp_dfa_closeapp();
break; break;
} else if (index >= 0) { }
if (index == CAPWAP_RECV_ERROR_INTR ||
index == WTP_RECV_NOERROR_RADIO) {
/* Ignore recv */
continue;
} else if (index == CAPWAP_RECV_ERROR_SOCKET) {
/* Socket close */
break;
} else if (index < 0) {
continue;
/* TODO: Really? Previosly, this was hidden in the
* overly deep indention, check if that is correct */
}
if (g_wtp.teardown) { if (g_wtp.teardown) {
capwap_logging_debug("WTP is in teardown, drop packet"); capwap_logging_debug("WTP is in teardown, drop packet");
continue; /* Drop packet */ continue; /* Drop packet */
} else { }
int check;
/* Check source */ /* Check source */
if (g_wtp.state != CAPWAP_DISCOVERY_STATE && if (g_wtp.state != CAPWAP_DISCOVERY_STATE &&
@ -362,50 +379,59 @@ int wtp_dfa_running(void) {
/* Check of packet */ /* Check of packet */
check = capwap_sanity_check(g_wtp.state, buffer, buffersize, g_wtp.dtls.enable); check = capwap_sanity_check(g_wtp.state, buffer, buffersize, g_wtp.dtls.enable);
if (check == CAPWAP_DTLS_PACKET) { switch (check) {
case CAPWAP_PLAIN_PACKET:
break;
case CAPWAP_DTLS_PACKET: {
int oldaction = g_wtp.dtls.action; int oldaction = g_wtp.dtls.action;
/* Decrypt packet */ /* Decrypt packet */
buffersize = capwap_decrypt_packet(&g_wtp.dtls, buffer, buffersize, bufferplain, CAPWAP_MAX_PACKET_SIZE); buffersize = capwap_decrypt_packet(&g_wtp.dtls, buffer, buffersize, bufferplain, CAPWAP_MAX_PACKET_SIZE);
if (buffersize > 0) { if (buffersize > 0) {
buffer = bufferplain; buffer = bufferplain;
check = CAPWAP_PLAIN_PACKET; break;
} else if (buffersize == CAPWAP_ERROR_AGAIN) { }
if (buffersize == CAPWAP_ERROR_AGAIN) {
/* Check is handshake complete */ /* Check is handshake complete */
if ((oldaction == CAPWAP_DTLS_ACTION_HANDSHAKE) && (g_wtp.dtls.action == CAPWAP_DTLS_ACTION_DATA)) { if (oldaction == CAPWAP_DTLS_ACTION_HANDSHAKE &&
g_wtp.dtls.action == CAPWAP_DTLS_ACTION_DATA) {
if (g_wtp.state == CAPWAP_DTLS_CONNECT_STATE) { if (g_wtp.state == CAPWAP_DTLS_CONNECT_STATE) {
wtp_send_join(); wtp_send_join();
} else { } else {
wtp_teardown_connection(); wtp_teardown_connection();
} }
} }
} else if (oldaction == CAPWAP_DTLS_ACTION_DATA &&
continue; /* Next packet */ g_wtp.dtls.action == CAPWAP_DTLS_ACTION_SHUTDOWN) {
} else {
if ((oldaction == CAPWAP_DTLS_ACTION_DATA) && (g_wtp.dtls.action == CAPWAP_DTLS_ACTION_SHUTDOWN)) {
wtp_teardown_connection(); wtp_teardown_connection();
} }
continue; /* Next packet */ continue; /* Next packet */
} }
} else if (check == CAPWAP_WRONG_PACKET) {
case CAPWAP_WRONG_PACKET:
capwap_logging_debug("Warning: sanity check failure"); capwap_logging_debug("Warning: sanity check failure");
/* Drop packet */ /* Drop packet */
continue; continue;
}
/* */ default:
if (check == CAPWAP_PLAIN_PACKET) { /* TODO: Really? Previosly, this was hidden in the
struct capwap_packet_rxmng* rxmngpacket; * overly deep indention, check if that is correct */
capwap_logging_debug("Warning: wtp_dfa_running took default fall through");
continue;
}
/* Defragment management */ /* Defragment management */
rxmngpacket = wtp_get_packet_rxmng(); rxmngpacket = wtp_get_packet_rxmng();
/* If request, defragmentation packet */ /* If request, defragmentation packet */
check = capwap_packet_rxmng_add_recv_packet(rxmngpacket, buffer, buffersize); check = capwap_packet_rxmng_add_recv_packet(rxmngpacket, buffer, buffersize);
if (check == CAPWAP_REQUEST_MORE_FRAGMENT) { if (check == CAPWAP_REQUEST_MORE_FRAGMENT)
continue; continue;
} else if (check != CAPWAP_RECEIVE_COMPLETE_PACKET) { if (check != CAPWAP_RECEIVE_COMPLETE_PACKET) {
/* Discard fragments */ /* Discard fragments */
wtp_free_packet_rxmng(); wtp_free_packet_rxmng();
continue; continue;
@ -473,17 +499,9 @@ int wtp_dfa_running(void) {
/* Free packet */ /* Free packet */
capwap_free_parsed_packet(&packet); capwap_free_parsed_packet(&packet);
wtp_free_packet_rxmng(); wtp_free_packet_rxmng();
} }
}
} else if ((index == CAPWAP_RECV_ERROR_INTR) || (index == WTP_RECV_NOERROR_RADIO)) {
/* Ignore recv */
continue;
} else if (index == CAPWAP_RECV_ERROR_SOCKET) {
/* Socket close */
break;
}
}
/* Free memory */ /* Free memory */
wtp_dfa_free_fdspool(&g_wtp.fds); wtp_dfa_free_fdspool(&g_wtp.fds);