From dca5d0e371bbafa069a9a6616a044fc8c195155e Mon Sep 17 00:00:00 2001 From: 7u83 <7u83@mail.ru> Date: Wed, 27 Jul 2022 01:00:39 +0200 Subject: [PATCH] Cisco msg elem 9 and 81 added --- src/mod/cisco/capwap_cisco.h | 8 +++-- src/mod/cisco/cisco_actions_ac.c | 53 +++++++++++++++++++++++++++++--- 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/src/mod/cisco/capwap_cisco.h b/src/mod/cisco/capwap_cisco.h index 47055b8a..67b18144 100644 --- a/src/mod/cisco/capwap_cisco.h +++ b/src/mod/cisco/capwap_cisco.h @@ -37,7 +37,9 @@ #define CISCO_ELEM_RAD_NAME LWAPP_ELEM_WTP_NAME /* 5 */ #define CW_CISCO_MWAR LW_ELEM_AC_DESCRIPTOR /* 6 */ #define CISCO_ELEM_ADD_WLAN LW_ELEM_80211_ADD_WLAN /* 7 */ -#define CISCO_ELEM_WTP_RADIO_CONFIGURATION 8 +#define CISCO_ELEM_WTP_RADIO_CONFIGURATION 8 /* 9 */ + +#define CISCO_ELEM_9 9 /* 9 */ #define CISCO_ELEM_MULTI_DOMAIN_CAPABILITY LW_ELEM_80211_MULTI_DOMAIN_CAPABILITY /* 10 */ #define CISCO_ELEM_MAC_OPERATION LW_ELEM_80211_MAC_OPERATION /* 11 */ @@ -50,7 +52,7 @@ #define CISCO_ELEM_15 15 /* 15 */ #define CISCO_ELEM_19 19 /* 19 */ #define CISCO_ELEM_22 22 /* 22 */ - +#define CISCO_ELEM_24 24 /* 24 */ #define CW_CISCO_80211_DELETE_WLAN LW_ELEM_80211_DELETE_WLAN /* 28 */ @@ -70,6 +72,8 @@ #define CW_CISCO_AC_IPV4_LIST LW_ELEM_AC_IPV4_LIST /* 59 */ #define CISCO_ELEM_CAPWAP_TIMERS LW_ELEM_LWAPP_TIMERS /* 68 */ +#define CISCO_ELEM_81 81 /* 81 */ + #define CISCO_ELEM_AP_STATIC_IP_ADDR 83 #define CISCO_ELEM_SIG_PAYLOAD 84 #define CISCO_ELEM_SIG_TOGGLE 87 diff --git a/src/mod/cisco/cisco_actions_ac.c b/src/mod/cisco/cisco_actions_ac.c index 00f09889..09de84e3 100644 --- a/src/mod/cisco/cisco_actions_ac.c +++ b/src/mod/cisco/cisco_actions_ac.c @@ -1210,6 +1210,33 @@ static struct cw_ElemHandler handlers70[] = { cw_out_radio_generic /* put */ }, + { + "Cisco LWAP Elem 9", /* name */ + + CISCO_LWELEM_9, /* Element ID */ + CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */ + + 5,1024, /* min/max length */ + CW_TYPE_BSTR16, /* type */ + "cisco/lwelem9", /* Key */ + cw_in_radio_generic, /* get */ + cw_out_radio_generic /* put */ + }, + + { + "Cisco Elem 24", /* name */ + CISCO_ELEM_24, /* Element ID */ + CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */ + 5,1024, /* min/max length */ + CW_TYPE_BSTR16, /* type */ + "cisco/elem24", /* Key */ + cw_in_radio_generic, /* get */ + cw_out_radio_generic /* put */ + }, + + + + { "Cisco Elem 19", /* name */ CISCO_ELEM_19, /* Element ID */ @@ -1236,6 +1263,18 @@ static struct cw_ElemHandler handlers70[] = { + { + "Cisco Elem 81", /* name */ + CISCO_ELEM_81, /* Element ID */ + CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */ + 5,1024, /* min/max length */ + CW_TYPE_BSTR16, /* type */ + "cisco/elem81", /* Key */ + cw_in_radio_generic, /* get */ + cw_out_radio_generic /* put */ + }, + + @@ -1666,6 +1705,9 @@ static struct cw_ElemDef configuration_status_request_elements[] ={ {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_15, 1, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_19, 1, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_22, 1, 0}, + {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_81, 0, 0}, + {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_9, 0, 0}, + {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_24, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_AP_USERNAME_PASSWORD, 1, 0}, @@ -1750,14 +1792,17 @@ static struct cw_ElemDef configuration_update_request_elements[] ={ {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_SIG_TOGGLE, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_MAC_OPERATION, 0, 0}, -/* {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_TX_POWER, 0, 0}, */ + {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_TX_POWER, 0, 0}, /* {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_TX_POWER_LEVELS, 1, 0}, */ /* {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_CHANNEL_POWER, 1, 0}, */ - {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_15, 1, 0}, - {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_19, 1, 0}, - {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_22, 1, 0}, + {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_24, 0, 0}, + {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_15, 0, 0}, + {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_19, 0, 0}, + {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_22, 0, 0}, + {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_81, 0, 0}, + {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_9, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_ADD_WLAN, 0, CW_IGNORE},