From 9d18facdebeb606f7cf2566f69715b25522d3b25 Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Mon, 19 Feb 2018 02:29:48 +0000 Subject: [PATCH] Made WTP Board Data not mandatory Older APS dont send WTP Board Data FossilOrigin-Name: 269b44f2a60be9eb8d6ed9cbcd3f4dba666a41ba9f611bcd5fe769ebd0eeddd0 --- src/mod/cisco/cisco_actions_ac.c | 34 ++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/src/mod/cisco/cisco_actions_ac.c b/src/mod/cisco/cisco_actions_ac.c index 5e213d53..e42da2a5 100644 --- a/src/mod/cisco/cisco_actions_ac.c +++ b/src/mod/cisco/cisco_actions_ac.c @@ -81,12 +81,25 @@ static cw_action_in_t actions_in[] = { } , + /* Element WTP Board Data - Discovery Request + * Change it to not mandatory, because older Cisco + * firmware does not send this message element. + */ + { + .capwap_state = CW_STATE_DISCOVERY, + .msg_id = CW_MSG_DISCOVERY_REQUEST, + .elem_id = CW_ELEM_WTP_BOARD_DATA, + .start = cw_in_wtp_board_data, + .item_id = CW_ITEM_WTP_BOARD_DATA, + .mand = 0, + } + , /* -------------------------------------------------------- - * Discovery Resquest + * Join Resquest */ /* WTP Descriptor - Join Request */ @@ -311,6 +324,16 @@ static cw_action_out_t actions_out[]={ * Discovery Response */ + /* AC Descriptor - Discovery Response */ + { + .msg_id = CW_MSG_DISCOVERY_RESPONSE, + .item_id = CW_ITEM_AC_DESCRIPTOR, + .elem_id = CW_ELEM_AC_DESCRIPTOR, + .out = cisco_out_ac_descriptor, + .mand = 1 + } + , + /* Cisco AP Timesync - Discovery Request * Important to get the WTP a DTLS connection established @@ -324,15 +347,6 @@ static cw_action_out_t actions_out[]={ .mand = 1 } , - /* AC Descriptor - Discovery Response */ - { - .msg_id = CW_MSG_DISCOVERY_RESPONSE, - .item_id = CW_ITEM_AC_DESCRIPTOR, - .elem_id = CW_ELEM_AC_DESCRIPTOR, - .out = cisco_out_ac_descriptor, - .mand = 1 - } - , /* AC Descriptor - Join Response */