From 1093042e2eb58606f7af2632c6700d207ba7017a Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Sat, 2 Apr 2016 10:31:33 +0000 Subject: [PATCH] AC reads 802.11 MAC Operation FossilOrigin-Name: 2bf87b80581ee8ce7cb2694cb1a016d781633acd10fd294c620bcabe756c6f55 --- src/cw/Makefile | 2 ++ src/mod/capwap80211/capwap80211_actions_ac.c | 14 +++++++++++ src/mod/cisco/Makefile | 3 ++- src/mod/cisco/cisco.h | 2 ++ src/mod/cisco/cisco_actions_ac.c | 25 +++++++++++++++++++- 5 files changed, 44 insertions(+), 2 deletions(-) diff --git a/src/cw/Makefile b/src/cw/Makefile index 386aca06..f534b238 100644 --- a/src/cw/Makefile +++ b/src/cw/Makefile @@ -151,6 +151,8 @@ CAPWAPOBJS= \ cw_in_check_img_data_resp.o \ cw_in_check_generic_resp.o \ cw_in_check_generic_req.o \ + cw_in_80211_mac_operation.o \ + cw_read_80211_mac_operation.o \ cw_out_generic.o \ cw_out_wtp_descriptor.o \ cw_out_wtp_reboot_statistics.o \ diff --git a/src/mod/capwap80211/capwap80211_actions_ac.c b/src/mod/capwap80211/capwap80211_actions_ac.c index 31281879..a997896a 100644 --- a/src/mod/capwap80211/capwap80211_actions_ac.c +++ b/src/mod/capwap80211/capwap80211_actions_ac.c @@ -2,6 +2,7 @@ #include "cw/action.h" #include "cw/cw.h" +#include "cw/cw_80211.h" #include "cw/capwap.h" #include "cw/capwap_items.h" @@ -72,6 +73,19 @@ static cw_action_in_t actions_ac_in[] = { } , + /* 802.11 MAC Operation - Config Status Request */ + { + .capwap_state = CW_STATE_CONFIGURE, + .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .elem_id = CW_ELEM80211_MAC_OPERATION, + .item_id = "80111_mac_operation", //CW_iTEM80211_MAC_SUPPORTED_RATES, + .start = cw_in_80211_mac_operation, + .mand = 0, + .min_len = 16, + .max_len = 16 + } + , + diff --git a/src/mod/cisco/Makefile b/src/mod/cisco/Makefile index 622bf2a4..8f63f843 100644 --- a/src/mod/cisco/Makefile +++ b/src/mod/cisco/Makefile @@ -16,7 +16,8 @@ OBJS=\ cisco_in_spam_vendor_specific.o \ cisco_in_telnet_ssh.o \ cisco_out_radio_administrative_states.o \ - cisco_items.o + cisco_items.o \ + cisco80211_in_mac_operation.o diff --git a/src/mod/cisco/cisco.h b/src/mod/cisco/cisco.h index 9aa1b014..fb6c52f5 100644 --- a/src/mod/cisco/cisco.h +++ b/src/mod/cisco/cisco.h @@ -33,6 +33,8 @@ int cisco_out_telnet_ssh(struct conn *conn,struct cw_action_out * a,uint8_t *dst int cisco_out_radio_administrative_states(struct conn *conn, struct cw_action_out *a, uint8_t * dst); +int cisco80211_in_mac_operation(struct conn *conn, struct cw_action_in *a, uint8_t * data, + int len, struct sockaddr *from); #endif diff --git a/src/mod/cisco/cisco_actions_ac.c b/src/mod/cisco/cisco_actions_ac.c index 4d39ff58..e365fc8a 100644 --- a/src/mod/cisco/cisco_actions_ac.c +++ b/src/mod/cisco/cisco_actions_ac.c @@ -29,6 +29,7 @@ #include "cw/capwap80211_items.h" #include "cw/lwapp_cisco.h" +#include "cw/cw_80211.h" #include "mod_cisco.h" #include "cisco.h" @@ -341,7 +342,11 @@ static cw_action_in_t actions80211_in[] = { .max_len = 5 } , - + + /* -------------------------------------------------------- + * Configuration Status Resquest - IN + */ + /* Supported Rates - Configruati Status Request */ { .capwap_state = CW_STATE_CONFIGURE, .vendor_id = CW_VENDOR_ID_CISCO, @@ -355,6 +360,24 @@ static cw_action_in_t actions80211_in[] = { } + , + + /* MAC Operation - Configruati Status Request */ + { + .capwap_state = CW_STATE_CONFIGURE, + .vendor_id = CW_VENDOR_ID_CISCO, + .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .elem_id = CW_CISCO_MAC_OPERATION, + .item_id = "mac operation", + .start = cisco80211_in_mac_operation, + .mand = 0, + .min_len = 5, + .max_len = 5 + + } + + + };