From 13ef6c0d62dab41114559558f29006bd7d5637e1 Mon Sep 17 00:00:00 2001 From: Andreas Schultz Date: Sat, 26 Mar 2016 20:19:18 +0100 Subject: [PATCH] rework deep indented if statement in wtp_dfa_retransmition_timeout --- src/wtp/wtp_dfa.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/src/wtp/wtp_dfa.c b/src/wtp/wtp_dfa.c index ed97709..0930fdc 100644 --- a/src/wtp/wtp_dfa.c +++ b/src/wtp/wtp_dfa.c @@ -535,23 +535,28 @@ void wtp_dfa_retransmition_timeout(struct capwap_timeout* timeout, unsigned long if (!g_wtp.requestfragmentpacket->count) { capwap_logging_warning("Invalid retransmition request packet"); wtp_teardown_connection(); - } else { - g_wtp.retransmitcount++; - if (g_wtp.retransmitcount >= WTP_MAX_RETRANSMIT) { - capwap_logging_info("Retransmition request packet timeout"); - /* Timeout state */ - wtp_free_reference_last_request(); - wtp_teardown_connection(); - } else { - /* Retransmit request */ - capwap_logging_debug("Retransmition request packet"); - if (!capwap_crypt_sendto_fragmentpacket(&g_wtp.dtls, g_wtp.requestfragmentpacket)) { - capwap_logging_error("Error to send request packet"); - } - - /* Update timeout */ - capwap_timeout_set(g_wtp.timeout, g_wtp.idtimercontrol, WTP_RETRANSMIT_INTERVAL, wtp_dfa_retransmition_timeout, NULL, NULL); - } + return; } + + g_wtp.retransmitcount++; + if (g_wtp.retransmitcount >= WTP_MAX_RETRANSMIT) { + capwap_logging_info("Retransmition request packet timeout"); + + /* Timeout state */ + wtp_free_reference_last_request(); + wtp_teardown_connection(); + + return; + } + + /* Retransmit request */ + capwap_logging_debug("Retransmition request packet"); + if (!capwap_crypt_sendto_fragmentpacket(&g_wtp.dtls, g_wtp.requestfragmentpacket)) { + capwap_logging_error("Error to send request packet"); + } + + /* Update timeout */ + capwap_timeout_set(g_wtp.timeout, g_wtp.idtimercontrol, WTP_RETRANSMIT_INTERVAL, + wtp_dfa_retransmition_timeout, NULL, NULL); }