diff --git a/doc/capwap_cisco.txt b/doc/capwap_cisco.txt index 8377fde6..43bb26af 100644 --- a/doc/capwap_cisco.txt +++ b/doc/capwap_cisco.txt @@ -751,7 +751,7 @@ Type: 85 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Radio ID | Beracon Interval | Beacon + | Radio ID | Beacon Interval | Beacon +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ Range | Multicast Buffer | Multicast +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ diff --git a/src/ac/ac.conf b/src/ac/ac.conf index 6036b395..4bd78d87 100644 --- a/src/ac/ac.conf +++ b/src/ac/ac.conf @@ -136,7 +136,7 @@ strict_capwap = off # # Defalut: #listen = 192.168.0.14:1027 -listen = 192.168.56.1 +#listen = 192.168.56.1 # broadcast_listen - Broadcast listen address # If ommited, the boraadcast listen adresses a determined automatically diff --git a/src/ac/config.ktv b/src/ac/config.ktv index 62055c56..9c8a4cdc 100644 --- a/src/ac/config.ktv +++ b/src/ac/config.ktv @@ -29,7 +29,7 @@ ac-descriptor/software/vendor :Dword: 4232704 ac-descriptor/software/version :Bstr16: .x07036500 ac-descriptor/station-limit :Word: 1000 ac-descriptor/stations :Word: 0 -capwap-control-ip-address/address.0 :IPAddress: 192.168.56.1 +capwap-control-ip-address/address.0 :IPAddress: 192.168.0.14 capwap-control-ip-address/wtps.0 :Word: 2 cisco/mwar-type :Byte: 0 maximum-message-length :Word: 4096 diff --git a/src/cw/cw_ktv_read_struct.c b/src/cw/cw_ktv_read_struct.c index b88ec935..145667bf 100644 --- a/src/cw/cw_ktv_read_struct.c +++ b/src/cw/cw_ktv_read_struct.c @@ -8,6 +8,9 @@ int cw_ktv_read_struct(mavl_t ktv,const cw_KTVStruct_t * stru, const char *pkey, int pos, i,l; cw_KTV_t * result; + if (strcmp(pkey,"radio.0/cisco/wtp-radio-config")==0) + i = 99; + pos=0; i=0; while (stru[i].type != NULL){ @@ -15,7 +18,10 @@ int cw_ktv_read_struct(mavl_t ktv,const cw_KTVStruct_t * stru, const char *pkey, if(stru[i].position!=-1) pos=stru[i].position; - sprintf(key,"%s/%s",pkey,stru[i].key); + if (stru[i].key!=NULL) + sprintf(key,"%s/%s",pkey,stru[i].key); + else + sprintf(key,"%s",pkey); switch (stru[i].len){ case CW_KTVSTRUCT_L8: @@ -31,7 +37,7 @@ int cw_ktv_read_struct(mavl_t ktv,const cw_KTVStruct_t * stru, const char *pkey, break; default: l = stru[i].len; - if (pos+l > l){ + if (pos+l > len){ l = len-pos; } diff --git a/src/cw/cw_ktv_write_struct.c b/src/cw/cw_ktv_write_struct.c index 7924e942..3efee4fb 100644 --- a/src/cw/cw_ktv_write_struct.c +++ b/src/cw/cw_ktv_write_struct.c @@ -18,7 +18,13 @@ int cw_ktv_write_struct(mavl_t ktv, const cw_KTVStruct_t * stru, const char *pke if (stru[i].len!=-1) memset(dst+pos,0,stru[i].len); - sprintf(key,"%s/%s",pkey,stru[i].key); + + if (stru[i].key!=NULL) + sprintf(key,"%s/%s",pkey,stru[i].key); + else + sprintf(key,"%s",pkey); + + result = cw_ktv_get(ktv,key,NULL); diff --git a/src/mod/capwap/capwap_actions_ac.c b/src/mod/capwap/capwap_actions_ac.c index 83311063..9f679361 100644 --- a/src/mod/capwap/capwap_actions_ac.c +++ b/src/mod/capwap/capwap_actions_ac.c @@ -51,6 +51,19 @@ static cw_KTVStruct_t radio_operational_state[] = { {NULL,NULL,0,0} }; + +static cw_KTVValRange_t radio_admin_state_valguard[]={ + {0,0,"reserved"}, + {1,1,"enabled"}, + {2,2,"disabled"}, + {0,0,NULL} +}; + +static cw_KTVStruct_t radio_admin_state[] = { + {CW_TYPE_BYTE, NULL, 1,-1, radio_admin_state_valguard}, + {NULL,NULL,0,0} +}; + static struct cw_ElemHandler handlers[] = { { @@ -303,10 +316,10 @@ static struct cw_ElemHandler handlers[] = { CAPWAP_ELEM_RADIO_ADMINISTRATIVE_STATE, /* Element ID */ 0, 0, /* Vendor / Proto */ 2, 2, /* min/max length */ - CW_TYPE_BYTE, /* type */ + radio_admin_state, /* type */ "admin-state", /* Key */ - cw_in_radio_generic, /* get */ - cw_out_radio_generic /* put */ + cw_in_radio_generic_struct, /* get */ + cw_out_radio_generic_struct /* put */ } , diff --git a/src/mod/cisco/capwap_cisco.h b/src/mod/cisco/capwap_cisco.h index 85f46e0b..bd911441 100644 --- a/src/mod/cisco/capwap_cisco.h +++ b/src/mod/cisco/capwap_cisco.h @@ -64,10 +64,10 @@ #define CW_CISCO_AC_IPV4_LIST LW_ELEM_AC_IPV4_LIST /* 59 */ -#define CW_CISCO_CAPWAP_TIMERS LW_ELEM_LWAPP_TIMERS /* 68 */ +#define CISCO_ELEM_CAPWAP_TIMERS LW_ELEM_LWAPP_TIMERS /* 68 */ #define CISCO_ELEM_AP_STATIC_IP_ADDR 83 -#define CW_CISCO_SIG_PAYLOAD 84 -#define CW_CISCO_SIG_TOGGLE 87 +#define CISCO_ELEM_SIG_PAYLOAD 84 +#define CISCO_ELEM_SIG_TOGGLE 87 #define CISCO_ELEM_AIRSPACE_CAPABILITY 88 #define CISCO_ELEM_AC_NAME_WITH_INDEX 91 diff --git a/src/mod/cisco/cisco_actions_ac.c b/src/mod/cisco/cisco_actions_ac.c index 61622326..4ba64b64 100644 --- a/src/mod/cisco/cisco_actions_ac.c +++ b/src/mod/cisco/cisco_actions_ac.c @@ -303,8 +303,8 @@ static cw_KTVStruct_t cisco_wtp_radio_config73[]={ {CW_TYPE_WORD,"cfp-maximum-duration",2,-1}, {CW_TYPE_BSTR16,"bss-id",6,-1}, {CW_TYPE_WORD,"beacon-period",2,-1}, - {CW_TYPE_BSTR16,"country-str1",3,-1}, - {CW_TYPE_BSTR16,"country-str2",3,-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}, @@ -318,8 +318,8 @@ static cw_KTVStruct_t cisco_wtp_radio_config75[]={ {CW_TYPE_WORD,"cfp-maximum-duration",2,-1}, {CW_TYPE_BSTR16,"bss-id",6,-1}, {CW_TYPE_WORD,"beacon-period",2,-1}, - {CW_TYPE_BSTR16,"country-str1",3,-1}, - {CW_TYPE_BSTR16,"country-str2",3,-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}, @@ -493,6 +493,14 @@ static cw_KTVStruct_t cisco_radio_oper_state[]={ {NULL,NULL,0,0} }; +static cw_KTVStruct_t cisco_capwap_timers[] = { + {CW_TYPE_BYTE, "max-discovery-interval", 1,-1}, + {CW_TYPE_BYTE, "echo-interval", 1,-1}, + {NULL,NULL,0,0} +}; + + + static int cisoc_add_lwwlan_mkkey(const char *pkey, uint8_t*data, int len, char *dst) { @@ -522,7 +530,21 @@ static cw_KTVStruct_t cisco_hardware_info[]={ {NULL,NULL,0,0} }; +static cw_KTVStruct_t cisco_discovery_protocol[]={ + {CW_TYPE_WORD, "data",2,-1}, + {CW_TYPE_BOOL, "enabled",1,-1}, + {NULL,NULL,0,0} +}; +static cw_KTVStruct_t cisco_rad_extended_config[]={ + {CW_TYPE_WORD, "beacon-interval",2,-1}, + {CW_TYPE_WORD, "beacon-range",2,-1}, + {CW_TYPE_WORD, "multicast-buffer",2,-1}, + {CW_TYPE_WORD, "multicast-data-range",2,-1}, + {CW_TYPE_WORD, "rx-sensop-threshold",2,-1}, + {CW_TYPE_WORD, "c-ccat",2,-1}, + {NULL,NULL,0,0} +}; /* @@ -941,12 +963,13 @@ static struct cw_ElemHandler handlers73[] = { cw_out_generic /* put */ }, - { + { /* WTP Radio Configuration for AC/WPT with version 7.3 */ + "WTP Radio Configuration", /* 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_config73, /* type */ "cisco/wtp-radio-config", /* Key */ cw_in_radio_generic_struct, /* get */ cw_out_radio_generic_struct /* put */ @@ -1193,7 +1216,7 @@ static struct cw_ElemHandler handlers73[] = { { - "Radio Operational State Cisco", /* name */ + "Radio Operational State (Draft 7)", /* name */ CAPWAP_ELEM_RADIO_OPERATIONAL_STATE, /* Element ID */ 0,0, /* Vendor / Proto */ 3,3, /* min/max length */ @@ -1204,18 +1227,6 @@ static struct cw_ElemHandler handlers73[] = { NULL /* mkkey */ } , - { - "Radio Administrative State Cisco", /* name */ - CAPWAP_ELEM_RADIO_ADMINISTRATIVE_STATE, /* Element ID */ - 0,0, /* Vendor / Proto */ - 2,2, /* min/max length */ - NULL, /* type */ - "radio-admin-state", /* Key */ - NULL, /* get */ - NULL, /* put */ - NULL - } - , { "Hardware Info", /* name */ @@ -1228,6 +1239,39 @@ static struct cw_ElemHandler handlers73[] = { cw_out_generic_struct /* put */ }, + { + "Cisco Discovery Protocol", /* name */ + CISCO_LWELEM_DISCOVERY_PROTOCOL, /* Element ID */ + CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */ + 3,3, /* min/max length */ + cisco_discovery_protocol, /* type */ + "cisco/cisco-discovery-protocol", /* Key */ + cw_in_generic_struct, /* get */ + cw_out_generic_struct /* put */ + }, + + { + "RAD Extended Config", /* name */ + CISCO_LWELEM_RAD_EXTENDED_CONFIG, /* Element ID */ + CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */ + 13,13, /* min/max length */ + cisco_rad_extended_config, /* type */ + "cisco/rad-extended-config", /* Key */ + cw_in_radio_generic_struct, /* get */ + cw_out_radio_generic_struct /* put */ + }, + + { + "CAPWAP Timers", /* name */ + CISCO_ELEM_CAPWAP_TIMERS, /* Element ID */ + 0, 0, /* Vendor / Proto */ + 2, 2, /* min/max length */ + cisco_capwap_timers, /* type */ + "capwap-timers", /* Key */ + cw_in_generic_struct, /* get */ + cw_out_generic_struct /* put */ + } + , {0,0,0,0,0,0,0,0} @@ -1324,7 +1368,7 @@ static struct cw_ElemDef configuration_status_request_elements[] ={ {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_ROUGE_DETECTION, 0, 0}, - {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_20, 1, 0}, + {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_DISCOVERY_PROTOCOL, 1, 0}, {0,0,0,00} }; @@ -1355,6 +1399,9 @@ static int configuration_update_request_states[] = {CAPWAP_STATE_RUN,0}; static struct cw_ElemDef configuration_update_request_elements[] ={ {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_SPAM_VENDOR_SPECIFIC,0, CW_IGNORE}, + {0,0, CAPWAP_ELEM_RADIO_OPERATIONAL_STATE, 0,0}, + + {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AP_UPTIME, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AP_LED_STATE_CONFIG, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AP_LOG_FACILITY, 0, 0}, @@ -1390,13 +1437,14 @@ static struct cw_ElemDef configuration_update_request_elements[] ={ {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_VLAN, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_SSC_HASH_VALIDATION, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_SSC_HASH, 0, 0}, + {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_DISCOVERY_PROTOCOL, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_ADD_WLAN, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_DELETE_WLAN, 0, 0}, - {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_TCP_ADJUST_MSS, 0, 0}, - {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_ROUGE_DETECTION, 0, 0}, - + {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_TCP_ADJUST_MSS, 0, 0}, + {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_ROUGE_DETECTION, 0, 0}, + {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_RAD_EXTENDED_CONFIG, 0, 0}, {0,0,0,00} @@ -1523,7 +1571,7 @@ static struct cw_ElemHandler handlers75[] = { CISCO_ELEM_WTP_RADIO_CONFIGURATION, /* Element ID */ CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */ 28,28, /* min/max length */ - cisco_wtp_radio_config75, /* type */ + cisco_wtp_radio_config75, /* type */ "cisco/wtp-radio-config", /* Key */ cw_in_radio_generic_struct, /* get */ cw_out_radio_generic_struct /* put */ diff --git a/src/mod/cisco/lwapp_cisco.h b/src/mod/cisco/lwapp_cisco.h index 2414ce60..c71d06f3 100644 --- a/src/mod/cisco/lwapp_cisco.h +++ b/src/mod/cisco/lwapp_cisco.h @@ -30,7 +30,7 @@ #define CISCO_LWELEM_AP_USERNAME_PASSWORD 18 #define LW_CISCO_MANAGER_IP_ADDR 19 -#define CISCO_LWELEM_20 20 +#define CISCO_LWELEM_DISCOVERY_PROTOCOL 20 #define LW_CISCO_RADIO_MODULE_INFO 21 #define CISCO_LWELEM_AC_IP_ADDR_WITH_INDEX 32 #define CISCO_LWELEM_AP_ETHERNET_PORT_SUBTYPE 34 @@ -51,7 +51,7 @@ #define LW_CISCO_PRIMED_JOIN_TIMEOUT 85 #define LW_CISCO_AP_DTLS_DATA_CFG 74 -#define LW_CISCO_RAD_EXTENDED_CONFIG 111 +#define CISCO_LWELEM_RAD_EXTENDED_CONFIG 111 #define CISCO_LWELEM_ADD_WLAN 128 #define CISCO_LWELEM_VLAN 123 diff --git a/src/wtp/cisco.ktv b/src/wtp/cisco.ktv index 0ea72fec..f91fb9ed 100644 --- a/src/wtp/cisco.ktv +++ b/src/wtp/cisco.ktv @@ -7,20 +7,20 @@ ac-descriptor/r-mac-field :Byte: 1 ac-descriptor/reserved1 :Byte: 0 ac-descriptor/security :Byte: 2 ac-descriptor/software/vendor :Dword: 4232704 -ac-descriptor/software/version :Bstr16: .x07056600 +ac-descriptor/software/version :Bstr16: .x07036500 ac-descriptor/station-limit :Word: 1000 ac-descriptor/stations :Word: 0 -ac-name :Bstr16: CisAC175 +ac-name :Bstr16: CiscoAC73 ac-name-with-index.0 :Bstr16: tabbe88 ac-name-with-index.1 :Bstr16: nudelnudel ac-name-with-index.2 :Bstr16: nadelnalde ac-name-with-priority/X1 :Byte: 3 ac-name-with-priority/ac2 :Byte: 5 -capwap-control-ip-address/address.0 :IPAddress: 192.168.56.175 -capwap-control-ip-address/address.1 :IPAddress: 192.168.56.175 -capwap-control-ip-address/address.2 :IPAddress: 192.168.56.173 +capwap-control-ip-address/address.0 :IPAddress: 192.168.0.173 +capwap-control-ip-address/address.1 :IPAddress: d96c:4c0a:da6c:4c0a:db6c:4c0a:dc6c:4c0a +capwap-control-ip-address/address.2 :IPAddress: 192.168.0.173 capwap-control-ip-address/wtps.0 :Word: 0 -capwap-control-ip-address/wtps.1 :Word: 1 +capwap-control-ip-address/wtps.1 :Word: 10 capwap-control-ip-address/wtps.2 :Word: 1 capwap-local-ip-address :IPAddress: 192.168.56.1 capwap-timers/echo-interval :Byte: 30 @@ -58,7 +58,7 @@ cisco/ap-regulatory-domain.1/slot :Byte: 1 cisco/ap-sub-mode :Byte: 0 cisco/ap-telnet-ssh/ssh :Bool: false cisco/ap-telnet-ssh/telnet :Bool: false -cisco/ap-timesync/timestamp :Dword: 1524598078 +cisco/ap-timesync/timestamp :Dword: 1524833707 cisco/ap-timesync/type :Byte: 0 cisco/ap-username-and-password/802.1x-credentials/option :Word: 2 cisco/ap-username-and-password/802.1x-credentials/password :Str: @@ -68,11 +68,13 @@ cisco/ap-username-and-password/login-credentials/option :Word: 1025 cisco/ap-username-and-password/login-credentials/password :Str: $1$R1hh$.3Jgrg.1DHuxmiQVDNqxB. cisco/ap-username-and-password/login-credentials/username :Str: admin cisco/ap-venue-settings/group :Word: 2 -cisco/ap-venue-settings/language :Str: de +cisco/ap-venue-settings/language :Str: en cisco/ap-venue-settings/name :Str: cisco/ap-venue-settings/type :Byte: 1 cisco/board-data-options :Dword: 16777217 -cisco/hash/hash :Bstr16: d8e176aae5120af7477c67939c43a31dd714fcbc +cisco/cisco-discovery-protocol/data :Word: 0 +cisco/cisco-discovery-protocol/enabled :Bool: false +cisco/hash/hash :Bstr16: 25f312452fcb0a908007304aa201d175d0516d7a cisco/hash/validate :Bool: true cisco/loghost-config/last-joined-ap :Str: cisco/loghost-config/loghost.0 :IPAddress: 7.7.1.3 @@ -84,12 +86,12 @@ cisco/lw_path_mtu/max :Word: 1485 cisco/mwar-addr/address :IPAddress: 192.168.0.180 cisco/mwar-addr/mwar-type :Byte: 1 cisco/mwar-addr/unknown :Word: 0 -cisco/mwar-hash-value :Bstr16: d8e176aae5120af7477c67939c43a31dd714fcbc +cisco/mwar-hash-value :Bstr16: 25f312452fcb0a908007304aa201d175d0516d7a cisco/mwar-type :Byte: 0 -cisco/rouge-and-mss/enable :Bool: false +cisco/rouge-and-mss/enable :Bool: true cisco/rouge-and-mss/mss :Word: 666 cisco/rouge-and-mss/roge-detection :Bool: true -cisco/rouge-and-mss/tcp-adjust-mss :Word: 0 +cisco/rouge-and-mss/tcp-adjust-mss :Word: 1234 cisco/rouge-detection/rest :Bstr16: .x000aff800000 cisco/rouge-detection/rouge-detection :Bool: false cisco/ssl-certfile :Str: ../../ssl/certs/wtpc.crt @@ -103,7 +105,7 @@ cisco/wtp-board-data/ethernet-mac-address :Bstr16: .xe47d4f3af8a6 cisco/wtp-board-data/failover-priority :Bstr16: .x01010003 cisco/wtp-board-data/options/ant-type :Byte: 1 cisco/wtp-board-data/options/ap-type :Byte: 0 -cisco/wtp-board-data/options/failover-priority :Byte: 2 +cisco/wtp-board-data/options/failover-priority :Byte: 3 cisco/wtp-board-data/options/flex-connect :Byte: 1 cisco/wtp-board-data/wtp-model-hi :Dword: 0 cisco/wtp-board-data/wtp-model-lo :Dword: 0 @@ -114,7 +116,7 @@ idle-timeout :Dword: 300 location-data :Bstr16: "superposition\"tobias" lwapp20 :Bstr16: .x000001 maximum-message-length :Word: 4096 -radio.0/admin-state :Byte: 1 +radio.0/admin-state :Byte: reserved radio.0/cisco-multi-domain-capability/first-channel :Word: 1 radio.0/cisco-multi-domain-capability/max-tx-power-level :Word: 65535 radio.0/cisco-multi-domain-capability/number-of-channels :Word: 13 @@ -131,38 +133,44 @@ radio.0/cisco/multi-domain-capability/first-channel :Word: 1 radio.0/cisco/multi-domain-capability/max-tx-power-level :Word: 20 radio.0/cisco/multi-domain-capability/number-of-channels :Word: 13 radio.0/cisco/multi-domain-capability/reserved :Byte: 1 +radio.0/cisco/rad-extended-config/beacon-interval :Word: 25600 +radio.0/cisco/rad-extended-config/beacon-range :Word: 0 +radio.0/cisco/rad-extended-config/c-ccat :Word: 0 +radio.0/cisco/rad-extended-config/multicast-buffer :Word: 0 +radio.0/cisco/rad-extended-config/multicast-data-range :Word: 0 +radio.0/cisco/rad-extended-config/rx-sensop-threshold :Word: 0 radio.0/cisco/tx-power/current-tx-power :Word: 0 radio.0/cisco/tx-power/reserved :Byte: 1 radio.0/cisco/wtp-radio-config/beacon-period :Word: 100 -radio.0/cisco/wtp-radio-config/bss-id :Bstr16: .x04fe7f499b9000644445004445200a00010000c800 +radio.0/cisco/wtp-radio-config/bss-id :Bstr16: 123456 radio.0/cisco/wtp-radio-config/cfg-period :Byte: 4 radio.0/cisco/wtp-radio-config/cfg-type :Byte: 1 radio.0/cisco/wtp-radio-config/cfp-maximum-duration :Word: 60 -radio.0/cisco/wtp-radio-config/country-str1 :Bstr16: .x4445004445200a00010000c800 -radio.0/cisco/wtp-radio-config/country-str2 :Bstr16: .x4445200a00010000c800 +radio.0/cisco/wtp-radio-config/country-str1 :Str: DE +radio.0/cisco/wtp-radio-config/country-str2 :Str: DE radio.0/cisco/wtp-radio-config/gpr-period :Byte: 10 radio.0/cisco/wtp-radio-config/max-stations :Byte: 200 radio.0/cisco/wtp-radio-config/occupancy-limit :Word: 100 radio.0/cisco/wtp-radio-config/reg :Dword: 65536 radio.0/cisco/wtp-radio-config/unknown75 :Byte: 0 radio.0/decryption-error-report-period :Word: 120 -radio.0/operational-state/cause :Str: 0 -radio.0/operational-state/state :Str: enabled +radio.0/operational-state/cause :Byte: Normal +radio.0/operational-state/state :Byte: enabled radio.0/rate_set :Bstr16: .x82848b960c1218243048606c -radio.0/wlan.0/allow-aaa-override :Byte: 1 +radio.0/wlan.0/allow-aaa-override :Byte: 0 radio.0/wlan.0/broadcast-ssid :Bool: true -radio.0/wlan.0/dtim-period :Byte: 99 +radio.0/wlan.0/dtim-period :Byte: 1 radio.0/wlan.0/encryption :Byte: 0 radio.0/wlan.0/encryption-policy :Dword: 16777216 -radio.0/wlan.0/max-stations :Byte: 155 +radio.0/wlan.0/max-stations :Byte: 200 radio.0/wlan.0/radio-id :Byte: 0 -radio.0/wlan.0/session-timout :Word: 0 +radio.0/wlan.0/session-timout :Word: 1800 radio.0/wlan.0/ssid-a :Str: Schlosspark radio.0/wlan.0/wep-key :Bstr16: .xaa0c0a02000000000000000000 radio.0/wlan.0/wlan-capability :Word: 1057 radio.0/wlan.0/wlan-id :Byte: 0 -radio.0/wtp-radio-information :Dword: 3 -radio.1/admin-state :Byte: 1 +radio.0/wtp-radio-information :Dword: 1 +radio.1/admin-state :Byte: reserved radio.1/cisco-multi-domain-capability/first-channel :Word: 36 radio.1/cisco-multi-domain-capability/max-tx-power-level :Word: 65535 radio.1/cisco-multi-domain-capability/number-of-channels :Word: 16 @@ -182,25 +190,44 @@ radio.1/cisco/multi-domain-capability/reserved :Byte: 1 radio.1/cisco/tx-power/current-tx-power :Word: 0 radio.1/cisco/tx-power/reserved :Byte: 1 radio.1/cisco/wtp-radio-config/beacon-period :Word: 100 -radio.1/cisco/wtp-radio-config/bss-id :Bstr16: .x04fe7f499b9000644445004445200a00010000c801 +radio.1/cisco/wtp-radio-config/bss-id :Bstr16: .x04fe7f499b90 radio.1/cisco/wtp-radio-config/cfg-period :Byte: 4 radio.1/cisco/wtp-radio-config/cfg-type :Byte: 1 radio.1/cisco/wtp-radio-config/cfp-maximum-duration :Word: 60 -radio.1/cisco/wtp-radio-config/country-str1 :Bstr16: .x4445004445200a00010000c801 -radio.1/cisco/wtp-radio-config/country-str2 :Bstr16: .x4445200a00010000c801 +radio.1/cisco/wtp-radio-config/country-str1 :Str: DE +radio.1/cisco/wtp-radio-config/country-str2 :Str: DE radio.1/cisco/wtp-radio-config/gpr-period :Byte: 10 radio.1/cisco/wtp-radio-config/max-stations :Byte: 200 radio.1/cisco/wtp-radio-config/occupancy-limit :Word: 100 radio.1/cisco/wtp-radio-config/reg :Dword: 65536 radio.1/cisco/wtp-radio-config/unknown75 :Byte: 1 radio.1/decryption-error-report-period :Word: 120 -radio.1/operational-state/cause :Byte: 0 -radio.1/operational-state/state :Byte: 2 +radio.1/operational-state/cause :Byte: Normal +radio.1/operational-state/state :Byte: enabled radio.1/rate_set :Bstr16: .x8c129824b048606c +radio.1/wlan.0/allow-aaa-override :Byte: 0 +radio.1/wlan.0/broadcast-ssid :Bool: true +radio.1/wlan.0/dtim-period :Byte: 1 +radio.1/wlan.0/encryption :Byte: 0 +radio.1/wlan.0/encryption-policy :Dword: 16777216 +radio.1/wlan.0/max-stations :Byte: 200 +radio.1/wlan.0/radio-id :Byte: 1 +radio.1/wlan.0/session-timout :Word: 1800 +radio.1/wlan.0/ssid :Str: Schlosspark +radio.1/wlan.0/ssid-a :Str: Schlosspark +radio.1/wlan.0/wep-key :Bstr16: .xaa0c0a02000000000000000000 +radio.1/wlan.0/wlan-capability :Word: 1 +radio.1/wlan.0/wlan-id :Byte: 0 radio.1/wtp-radio-information :Dword: 2 -radio.255/admin-state :Byte: 1 -radio.255/operational-state/cause :Byte: 0 -radio.255/operational-state/state :Byte: 2 +radio.3/cisco/rad-extended-config/beacon-interval :Word: 59392 +radio.3/cisco/rad-extended-config/beacon-range :Word: 0 +radio.3/cisco/rad-extended-config/c-ccat :Word: 1 +radio.3/cisco/rad-extended-config/multicast-buffer :Word: 0 +radio.3/cisco/rad-extended-config/multicast-data-range :Word: 0 +radio.3/cisco/rad-extended-config/rx-sensop-threshold :Word: 0 +radio.255/admin-state :Byte: enabled +radio.255/operational-state/cause :Byte: Normal +radio.255/operational-state/state :Byte: enabled radio/0/cisco/regulatory-domain/code0 :Byte: 0 radio/0/cisco/regulatory-domain/code1 :Byte: 1 radio/0/cisco/regulatory-domain/set :Bool: true @@ -212,7 +239,7 @@ radio/wlan/radio-od :Byte: 1 radio/wlan/wlan-capability :Word: 17 radio/wlan/wlan-id :Byte: 0 result-code :Dword: 0 -session-id:Bstr16: .x00006215 +session-id :Bstr16: .x00006215 statistics-timer :Word: 60 tube.0/main :Byte: 12 tube.0/zumsel :Byte: 12 @@ -230,7 +257,7 @@ wtp-descriptor/hardware/version :Bstr16: .x01000000 wtp-descriptor/max-radios :Byte: 2 wtp-descriptor/radios-in-use :Byte: 2 wtp-descriptor/software/vendor :Dword: 4232704 -wtp-descriptor/software/version :Bstr16: .x07056600 +wtp-descriptor/software/version :Bstr16: .x07036500 wtp-fallback :Byte: 1 wtp-frame-tunnel-mode :Byte: 4 wtp-mac-type :Byte: 1 diff --git a/src/wtp/wtp_main.c b/src/wtp/wtp_main.c index 623bb7f0..fe5487fd 100644 --- a/src/wtp/wtp_main.c +++ b/src/wtp/wtp_main.c @@ -26,7 +26,7 @@ struct bootcfg{ bstr_t get_base_rmac() { - static uint8_t rm[8]={0x00,0x3a,0x99,0x04,0xfa,0xc0}; + static uint8_t rm[8]={0x00,0x3e,0x99,0x04,0xfa,0xc0}; return bstr_create(rm, 6); } @@ -192,8 +192,8 @@ exit(0); cw_discovery_init_results(&dis); -cw_run_discovery(conn, "255.255.255.255","192.168.56.1", &dis); -/* cw_run_discovery(conn, "255.255.255.255",NULL, &dis);*/ +/*cw_run_discovery(conn, "255.255.255.255","192.168.56.1", &dis);*/ + cw_run_discovery(conn, "255.255.255.255",NULL, &dis); cw_dbg_ktv_dump(dis.prio_ip, DBG_INFO, "=== IP list ===", "IP", "=== END IP List ==="); /*