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