diff --git a/src/mod/cisco/cisco_actions_ac.c b/src/mod/cisco/cisco_actions_ac.c index 2a0c224a..47681b2d 100644 --- a/src/mod/cisco/cisco_actions_ac.c +++ b/src/mod/cisco/cisco_actions_ac.c @@ -332,6 +332,20 @@ static cw_KTVStruct_t cisco_vlan[]={ {CW_TYPE_WORD,"id",2,-1}, {NULL,NULL,0,0} }; + +static cw_KTVStruct_t cisco_rouge_and_mss[]={ + {CW_TYPE_BOOL,"enable",1,-1}, + {CW_TYPE_WORD,"tcp-adjust-mss",2,-1}, + {NULL,NULL,0,0} +}; + +static cw_KTVStruct_t cisco_rouge_detections[]={ + {CW_TYPE_BOOL,"rouge-detection",1,-1}, + {CW_TYPE_BSTR16,"rest",6,-1}, + {NULL,NULL,0,0} +}; + + /* int cisco_in_with_index(struct cw_ElemHandler *eh, struct cw_ElemHandlerParams *params, @@ -934,6 +948,31 @@ static struct cw_ElemHandler handlers[] = { , + { + "TCP Adjust MSS", /* name */ + CISCO_LWELEM_TCP_ADJUST_MSS, /* Element ID */ + CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */ + 3,3, /* min/max length */ + cisco_rouge_and_mss, /* type */ + "cisco/rouge-and-mss", /* Key */ + cw_in_generic_struct, /* get */ + cw_out_generic_struct /* put */ + } + , + + + { + "Rouge Detection", /* name */ + CISCO_LWELEM_ROUGE_DETECTION, /* Element ID */ + CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */ + 7,7, /* min/max length */ + cisco_rouge_detections, /* type */ + "cisco/rouge-detection", /* Key */ + cw_in_generic_struct, /* get */ + cw_out_generic_struct /* put */ + } + , + {0,0,0,0,0,0,0,0} @@ -1024,7 +1063,9 @@ static struct cw_ElemDef configuration_status_request_elements[] ={ {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_AP_ETHERNET_PORT_SUBTYPE, 1, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_AC_IP_ADDR_WITH_INDEX, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_VLAN, 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_20, 1, 0}, @@ -1079,6 +1120,7 @@ static struct cw_ElemDef configuration_update_request_elements[] ={ {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AP_CORE_DUMP, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_STATISTICS_TIMER, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AC_NAME_WITH_INDEX, 0, 0}, + {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_AP_USERNAME_PASSWORD, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_AP_LOGHOST_CONFIG, 0, 0}, @@ -1088,6 +1130,9 @@ static struct cw_ElemDef configuration_update_request_elements[] ={ {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_AC_IP_ADDR_WITH_INDEX, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_AP_FAILOVER_PRIORITY, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_VLAN, 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}, + {0,0,0,00} diff --git a/src/mod/cisco/lwapp_cisco.h b/src/mod/cisco/lwapp_cisco.h index 97cbf8a9..dc57423c 100644 --- a/src/mod/cisco/lwapp_cisco.h +++ b/src/mod/cisco/lwapp_cisco.h @@ -44,7 +44,10 @@ #define LW_CISCO_PRIMED_DISCOVERY_TIMEOUT 50 #define LW_CISCO_DELETE_WLAN 52 #define CISCO_LWELEM_AP_FAILOVER_PRIORITY 53 + +#define CISCO_LWELEM_ROUGE_DETECTION 72 #define CISCO_LWELEM_PATH_MTU 73 +#define CISCO_LWELEM_TCP_ADJUST_MSS 77 #define LW_CISCO_PRIMED_JOIN_TIMEOUT 85 #define LW_CISCO_AP_DTLS_DATA_CFG 74 diff --git a/src/wtp/cisco.ktv b/src/wtp/cisco.ktv index 799bd5a9..688f75de 100644 --- a/src/wtp/cisco.ktv +++ b/src/wtp/cisco.ktv @@ -9,25 +9,25 @@ ac-descriptor/software/vendor :Dword: 4232704 ac-descriptor/software/version :Bstr16: .x07036500 ac-descriptor/station-limit :Word: 1000 ac-descriptor/stations :Word: 0 -ac-name :Bstr16: CiscoAC73 +ac-name :Bstr16: Cisa173 ac-name-with-index.0 :Bstr16: tabbe 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.0.173 +capwap-control-ip-address/address.0 :IPAddress: 172.16.66.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/address.2 :IPAddress: 172.16.66.173 capwap-control-ip-address/wtps.0 :Word: 0 capwap-control-ip-address/wtps.1 :Word: 10 capwap-control-ip-address/wtps.2 :Word: 1 -capwap-local-ip-address :IPAddress: 192.168.0.14 +capwap-local-ip-address :IPAddress: 172.16.66.50 capwap-timers/echo-interval :Byte: 30 capwap-timers/max-discovery-interval :Byte: 10 capwap-timers/min-discovery-interval :Byte: 0 cisco/ac-ip-addr-with-index.0 :IPAddress: 1.1.1.1 cisco/ac-ip-addr-with-index.1 :IPAddress: 9.9.9.9 -cisco/ac-ip-addr-with-index.2 :IPAddress: 8.8.8.8 +cisco/ac-ip-addr-with-index.2 :IPAddress: 3.3.3.3 cisco/ap-failover-priority :Byte: 3 cisco/ap-group-name :Bstr16: default-group cisco/ap-led-state-config/led-state :Byte: 1 @@ -47,7 +47,7 @@ cisco/ap-regulatory-domain.1/set :Bool: true cisco/ap-regulatory-domain.1/slot :Byte: 1 cisco/ap-telnet-ssh/ssh :Bool: false cisco/ap-telnet-ssh/telnet :Bool: false -cisco/ap-timesync/timestamp :Dword: 1524296571 +cisco/ap-timesync/timestamp :Dword: 1524313188 cisco/ap-timesync/type :Byte: 0 cisco/ap-username-and-password/enable-password :Str: $1$F4ey$qyu1z8WDU6KYapJ2Z471q/ cisco/ap-username-and-password/password :Str: $1$pLeF$a4Or8td4SSrWL6WV0KpIj1 @@ -63,8 +63,14 @@ 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: 25f312452fcb0a908007304aa201d175d0516d7a +cisco/mwar-hash-value :Bstr16: 0bb44248231d033bf67e1dee5f02fa487af01f32 cisco/mwar-type :Byte: 0 +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: 999 +cisco/rouge-detection/rest :Bstr16: .x000000000000 +cisco/rouge-detection/rouge-detection :Bool: true cisco/ssl-certfile :Str: ../../ssl/certs/wtpc.crt cisco/ssl-cipher :Str: ALL cisco/ssl-keyfile :Str: ../../ssl/certs/wtpc.key @@ -76,7 +82,7 @@ cisco/wtp-board-data/ethernet-mac-address :Bstr16: .xc47d4f3af8a6 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: 4 +cisco/wtp-board-data/options/failover-priority :Byte: 2 cisco/wtp-board-data/options/flex-connect :Byte: 0 cisco/wtp-board-data/wtp-model-hi :Dword: 0 cisco/wtp-board-data/wtp-model-lo :Dword: 0 @@ -167,7 +173,7 @@ radio/0/wtp-radio-information :Dword: 1 radio/1/wtp-radio-information :Dword: 2 result-code :Dword: 0 session-id :Bstr16: .x00006215 -statistics-timer :Word: 180 +statistics-timer :Word: 60 tube.0/main :Byte: 12 tube.0/zumsel :Byte: 12 tube.1/main :Byte: 12 diff --git a/src/wtp/wtp_main.c b/src/wtp/wtp_main.c index c69050ba..a1765783 100644 --- a/src/wtp/wtp_main.c +++ b/src/wtp/wtp_main.c @@ -192,7 +192,7 @@ exit(0); cw_discovery_init_results(&dis); - cw_run_discovery(conn, "255.255.255.255",NULL, &dis); + cw_run_discovery(conn, "255.255.255.255","172.16.66.100", &dis); cw_dbg_ktv_dump(dis.prio_ip, DBG_INFO, "=== IP list ===", "IP", "=== END IP List ==="); /*