From 1df562385cf9c87109ef0ec27c71b0997f69ea5e Mon Sep 17 00:00:00 2001 From: root Date: Fri, 13 Mar 2020 06:50:10 +0000 Subject: [PATCH] distingushes radio config v7.0 and 7.3 and 7.5 FossilOrigin-Name: 65536c860162dfa2018bcc0eff614a3100217f376e6248ce89ece3767178707e --- src/mod/cisco/cisco_actions_ac.c | 65 ++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 16 deletions(-) diff --git a/src/mod/cisco/cisco_actions_ac.c b/src/mod/cisco/cisco_actions_ac.c index f7dd2692..5a3122f4 100644 --- a/src/mod/cisco/cisco_actions_ac.c +++ b/src/mod/cisco/cisco_actions_ac.c @@ -315,6 +315,24 @@ static cw_KTVStruct_t cisco_ap_model[]={ {NULL,NULL,0,0} }; + +static cw_KTVStruct_t cisco_wtp_radio_config70[]={ + {CW_TYPE_BYTE,"cfg-type",1,-1}, + {CW_TYPE_WORD,"occupancy-limit",2,-1}, + {CW_TYPE_BYTE,"cfg-period",1,-1}, + {CW_TYPE_WORD,"cfp-maximum-duration",2,-1}, + {CW_TYPE_BSTR16,"bss-id",6,-1}, + {CW_TYPE_WORD,"beacon-period",2,-1}, + {CW_TYPE_STR,"country-str1",3,-1}, + {CW_TYPE_STR,"country-str2",3,-1}, +/* {CW_TYPE_BYTE,"gpr-period",1,-1},*/ + {CW_TYPE_DWORD,"reg",4,-1}, +/* {CW_TYPE_BYTE,"max-stations",1,-1},*/ + {NULL,NULL,0,0} +}; + + + static cw_KTVStruct_t cisco_wtp_radio_config73[]={ {CW_TYPE_BYTE,"cfg-type",1,-1}, {CW_TYPE_WORD,"occupancy-limit",2,-1}, @@ -1008,13 +1026,13 @@ static struct cw_ElemHandler handlers70[] = { cw_out_generic /* put */ }, - { /* WTP Radio Configuration for AC/WPT with version 7.3 */ + { /* WTP Radio Configuration for AC/WPT with version 7.0 */ "WTP Radio Configuration (v7.3)", /* name */ CISCO_ELEM_WTP_RADIO_CONFIGURATION, /* Element ID */ CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */ - 27,27, /* min/max length */ - cisco_wtp_radio_config73, /* type */ + 25,25, /* min/max length */ + cisco_wtp_radio_config70, /* type */ "cisco/wtp-radio-config", /* Key */ cw_in_radio_generic_struct, /* get */ cw_out_radio_generic_struct /* put */ @@ -1170,19 +1188,6 @@ static struct cw_ElemHandler handlers70[] = { } , - { - "AP Venue Settings", /* name */ - CISCO_ELEM_AP_VENUE_SETTINGS, /* Element ID */ - CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */ - 5,1024, /* min/max length */ - cisco_ap_venue_settings, /* type */ - "cisco/ap-venue-settings", /* Key */ - cw_in_generic_struct, /* get */ - cw_out_generic_struct /* put */ - } - , - - { "Rouge Detection", /* name */ @@ -1767,6 +1772,34 @@ static struct cw_ElemHandler handlers73[] = { cw_in_generic_struct, /* get */ cw_out_generic_struct /* put */ }, + + { /* WTP Radio Configuration for AC/WPT with version 7.3 */ + + "WTP Radio Configuration (v7.3)", /* name */ + CISCO_ELEM_WTP_RADIO_CONFIGURATION, /* Element ID */ + CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */ + 27,27, /* min/max length */ + cisco_wtp_radio_config73, /* type */ + "cisco/wtp-radio-config", /* Key */ + cw_in_radio_generic_struct, /* get */ + cw_out_radio_generic_struct /* put */ + } + , + + + + { + "AP Venue Settings", /* name */ + CISCO_ELEM_AP_VENUE_SETTINGS, /* Element ID */ + CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */ + 5,1024, /* min/max length */ + cisco_ap_venue_settings, /* type */ + "cisco/ap-venue-settings", /* Key */ + cw_in_generic_struct, /* get */ + cw_out_generic_struct /* put */ + } + , + {0,0,0,0,0,0,0,0} };