From f81afd5e8c2029e5fd07ce15fad2944e4e8ca76f Mon Sep 17 00:00:00 2001 From: vemax78 Date: Tue, 13 Aug 2013 17:53:04 +0200 Subject: [PATCH] Fix request/response message --- src/ac/ac_dfa_run.c | 28 +++++++++++++++++----------- src/wtp/wtp_dfa_run.c | 29 +++++++++++++++++------------ 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/src/ac/ac_dfa_run.c b/src/ac/ac_dfa_run.c index 7831132..8d5caf3 100644 --- a/src/ac/ac_dfa_run.c +++ b/src/ac/ac_dfa_run.c @@ -87,18 +87,18 @@ int ac_dfa_state_run(struct ac_session_t* session, struct capwap_parsed_packet* if (packet->rxmngpacket->isctrlpacket) { if (capwap_is_request_type(packet->rxmngpacket->ctrlmsg.type) || ((session->localseqnumber - 1) == packet->rxmngpacket->ctrlmsg.seq)) { switch (packet->rxmngpacket->ctrlmsg.type) { - case CAPWAP_CONFIGURATION_UPDATE_REQUEST: { + case CAPWAP_CONFIGURATION_UPDATE_RESPONSE: { /* TODO */ capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); break; } - - case CAPWAP_CHANGE_STATE_EVENT_RESPONSE: { + + case CAPWAP_CHANGE_STATE_EVENT_REQUEST: { /* TODO */ capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); break; } - + case CAPWAP_ECHO_REQUEST: { if (!receive_echo_request(session, packet)) { capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); @@ -106,33 +106,39 @@ int ac_dfa_state_run(struct ac_session_t* session, struct capwap_parsed_packet* ac_dfa_change_state(session, CAPWAP_RUN_TO_DTLS_TEARDOWN_STATE); status = AC_DFA_NO_PACKET; } - + break; } - - case CAPWAP_CLEAR_CONFIGURATION_REQUEST: { + + case CAPWAP_CLEAR_CONFIGURATION_RESPONSE: { /* TODO */ capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); break; } - - case CAPWAP_WTP_EVENT_RESPONSE: { + + case CAPWAP_WTP_EVENT_REQUEST: { /* TODO */ capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); break; } - + case CAPWAP_DATA_TRANSFER_REQUEST: { /* TODO */ capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); break; } - + case CAPWAP_DATA_TRANSFER_RESPONSE: { /* TODO */ capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); break; } + + case CAPWAP_STATION_CONFIGURATION_RESPONSE: { + /* TODO */ + capwap_set_timeout(AC_MAX_ECHO_INTERVAL, &session->timeout, CAPWAP_TIMER_CONTROL_CONNECTION); + break; + } } } } else { diff --git a/src/wtp/wtp_dfa_run.c b/src/wtp/wtp_dfa_run.c index 20e9525..bef052c 100644 --- a/src/wtp/wtp_dfa_run.c +++ b/src/wtp/wtp_dfa_run.c @@ -108,45 +108,50 @@ int wtp_dfa_state_run(struct capwap_parsed_packet* packet, struct timeout_contro if (packet->rxmngpacket->isctrlpacket) { if (capwap_is_request_type(packet->rxmngpacket->ctrlmsg.type) || ((g_wtp.localseqnumber - 1) == packet->rxmngpacket->ctrlmsg.seq)) { switch (packet->rxmngpacket->ctrlmsg.type) { - case CAPWAP_CONFIGURATION_UPDATE_RESPONSE: { + case CAPWAP_CONFIGURATION_UPDATE_REQUEST: { /* TODO */ break; } - - case CAPWAP_CHANGE_STATE_EVENT_REQUEST: { + + case CAPWAP_CHANGE_STATE_EVENT_RESPONSE: { /* TODO */ break; } - + 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); } - + break; } - - case CAPWAP_CLEAR_CONFIGURATION_RESPONSE: { + + case CAPWAP_CLEAR_CONFIGURATION_REQUEST: { /* TODO */ break; } - - case CAPWAP_WTP_EVENT_REQUEST: { + + case CAPWAP_WTP_EVENT_RESPONSE: { /* TODO */ break; } - + case CAPWAP_DATA_TRANSFER_REQUEST: { /* TODO */ break; } - + case CAPWAP_DATA_TRANSFER_RESPONSE: { /* TODO */ break; } - + + case CAPWAP_STATION_CONFIGURATION_REQUEST: { + /* TODO */ + break; + } + case CAPWAP_RESET_REQUEST: { receive_reset_request(packet); wtp_dfa_change_state(CAPWAP_RESET_STATE);