planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More more Cisco elements

Browse Source 
FossilOrigin-Name: cbd70ff0ada084fc33ac2d2a85421d84a02f8636d1800d881c15629edf96b7cc
This commit is contained in:
7u83@mail.ru 2018-04-21 05:45:45 +00:00
parent 80239758e7
commit cf991a4b42
5 changed files with 91 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ac/ac.conf
View File

@ -200,7 +200,7 @@ ssl_cert="../../ssl/certs/ac-cisco.pem"
dbg += msg_in # Incomming CAPWAP messages
dbg += msg_out # Outgoing CAPWAP messages
dbg += msg_err # Be verbose about capwap message errors like re-transmission
# dbg += msg_dmp
dbg += msg_dmp
dbg += elem_in # CAPWAP message elements
dbg += elem_out
dbg += subelem #

3
src/ac/wtpman.c
View File

@ -218,6 +218,7 @@ static int wtpman_join(void *arg, time_t timer)
break;
}
cw_dbg_ktv_dump(conn->remote_cfg,DBG_INFO,"-------------dump------------","DMP","---------end dump --------");
}
if (rc != 0) {
@ -404,6 +405,8 @@ static void * wtpman_run(void *arg)
}
}
cw_dbg_ktv_dump(conn->remote_cfg,DBG_INFO,"-------------dump------------","DMP","---------end dump --------");
if (!cw_result_is_ok(rc)) {
cw_dbg(DBG_INFO, "WTP Problem: %s", cw_strrc(rc));
wtpman_remove(wtpman);

96
src/mod/cisco/cisco_actions_ac.c
View File

@ -93,17 +93,32 @@ static cw_KTVStruct_t cisco_multi_domain_cabability[]={
};
static cw_KTVStruct_t cisco_wtp_board_data[]={
{CW_TYPE_WORD, "card-id", 2, -1},
{CW_TYPE_WORD, "card-revision", 2, -1},
{CW_TYPE_DWORD, "wtp-model-lo", 4, -1},
{CW_TYPE_DWORD, "wtp-model-hi", 4, -1},
{CW_TYPE_STR, "wtp-serial-number", 16, -1},
{CW_TYPE_BSTR16, "ethernet-mac-address", 6, 40},
{CW_TYPE_WORD, "card-id", 2, -1},
{CW_TYPE_WORD, "card-revision", 2, -1},
{CW_TYPE_DWORD, "wtp-model-lo", 4, -1},
{CW_TYPE_DWORD, "wtp-model-hi", 4, -1},
{CW_TYPE_STR, "wtp-serial-number", 16, -1},
{CW_TYPE_BYTE, "options/ant-type", 1, 36},
{CW_TYPE_BYTE, "options/flex-connect", 1, -1},
{CW_TYPE_BYTE, "options/ap-type", 1, -1},
{CW_TYPE_BYTE, "options/failover-priority", 1, -1},
{CW_TYPE_BSTR16, "ethernet-mac-address", 6, 40},
{NULL,NULL,0,0}
};
static cw_KTVStruct_t cisco_wtp_board_data_options[]={
{CW_TYPE_BYTE, "ant-type", 1, -1},
{CW_TYPE_BYTE, "flex-connect", 1, -1},
{CW_TYPE_BYTE, "ap-type", 1, -1},
{CW_TYPE_BYTE, "failover-priority", 1, -1},
{NULL,NULL,0,0}
};
static cw_KTVStruct_t cisco_ap_led_flash_config[]={
{CW_TYPE_BYTE, "flash-enable", 1, 0},
{CW_TYPE_DWORD, "flash-sec", 4, 4},
@ -150,7 +165,12 @@ static cw_KTVStruct_t cisco_mac_operation[]={
{NULL,NULL,0,0}
};
static cw_KTVStruct_t cisco_ap_power_injector_config[]={
{CW_TYPE_BYTE,"state",1,-1},
{CW_TYPE_BYTE,"selection",1,-1},
{CW_TYPE_BSTR16,"sitch-mac-address",6,-1},
{NULL,NULL,0,0}
};
int cisco_in_ap_regulatory_domain(struct cw_ElemHandler *eh,
@ -307,7 +327,12 @@ static cw_KTVStruct_t cisco_ap_core_dump[]={
{NULL,NULL,0,0}
};
static cw_KTVStruct_t cisco_vlan[]={
{CW_TYPE_BOOL,"tagging",1,-1},
{CW_TYPE_WORD,"id",2,-1},
{NULL,NULL,0,0}
};
/*
int cisco_in_with_index(struct cw_ElemHandler *eh,
struct cw_ElemHandlerParams *params,
uint8_t * data, int len)
@ -359,7 +384,7 @@ int cisco_out_with_index(struct cw_ElemHandler * eh,
return ob-dst;
}
*/
@ -417,10 +442,10 @@ static struct cw_ElemHandler handlers[] = {
CW_CISCO_BOARD_DATA_OPTIONS, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
4,4, /* min/max length */
CW_TYPE_DWORD, /* type */
"cisco/board-data-options", /* Key */
cw_in_generic, /* handler */
cw_out_generic /* put */
cisco_wtp_board_data_options, /* type */
"cisco/wtp-board-data/options", /* Key */
cw_in_generic_struct, /* handler */
cw_out_generic_struct /* put */
}
,
{
@ -654,10 +679,10 @@ static struct cw_ElemHandler handlers[] = {
CISCO_ELEM_AP_POWER_INJECTOR_CONFIG, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
8,8, /* min/max length */
CW_TYPE_BSTR16, /* type */
cisco_ap_power_injector_config, /* type */
"cisco/ap-power-injector-config", /* Key */
cw_in_generic, /* get */
cw_out_generic /* put */
cw_in_generic_struct, /* get */
cw_out_generic_struct /* put */
},
{
@ -885,26 +910,26 @@ static struct cw_ElemHandler handlers[] = {
}
,
{
"AP Failover Priority", /* name */
CISCO_LWELEM_AP_FAILOVER_PRIORITY, /* Element ID */
CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */
1,1, /* min/max length */
CW_TYPE_BYTE, /* type */
"cisco/ap-failover-priority", /* Key */
cw_in_generic, /* get */
cw_out_generic /* put */
"AP Failover Priority", /* name */
CISCO_LWELEM_AP_FAILOVER_PRIORITY, /* Element ID */
CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */
1,1, /* min/max length */
CW_TYPE_BYTE, /* type */
"cisco/wtp-board-data/options/failover-priority", /* Key */
cw_in_generic, /* get */
cw_out_generic /* put */
}
,
{
"LWAPP 20", /* name */
CISCO_LWELEM_20, /* Element ID */
"VLAN", /* name */
CISCO_LWELEM_VLAN, /* Element ID */
CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */
1,11, /* min/max length */
CW_TYPE_BSTR16, /* type */
"lwapp20", /* Key */
cw_in_generic, /* get */
cw_out_generic /* put */
3,3, /* min/max length */
cisco_vlan, /* type */
"cisco/vlan", /* Key */
cw_in_generic_struct, /* get */
cw_out_generic_struct /* put */
}
,
@ -998,7 +1023,9 @@ static struct cw_ElemDef configuration_status_request_elements[] ={
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_AP_SUBMODE, 1, 0},
{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_AP_FAILOVER_PRIORITY, 1, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_VLAN, 0, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_20, 1, 0},
{0,0,0,00}
@ -1022,7 +1049,7 @@ static struct cw_ElemDef configuration_status_response_elements[] ={
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AIRSPACE_CAPABILITY, 0, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_MWAR_HASH_VALUE, 1, 0},
{0,0,0,0}
};
@ -1060,6 +1087,7 @@ static struct cw_ElemDef configuration_update_request_elements[] ={
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_AP_ETHERNET_PORT_SUBTYPE, 0, 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_AP_FAILOVER_PRIORITY, 0, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_VLAN, 0, 0},
{0,0,0,00}

1
src/mod/cisco/lwapp_cisco.h
View File

@ -50,6 +50,7 @@
#define LW_CISCO_RAD_EXTENDED_CONFIG 111
#define LW_CISCO_ADD_WLAN 128
#define CISCO_LWELEM_VLAN 123
#define LW_CISCO_SSC_HASH_VALIDATION 133
#define LW_CISCO_MWAR_HASH_VALUE_1 132

28
src/wtp/cisco.ktv
View File

@ -10,7 +10,7 @@ ac-descriptor/software/version :Bstr16: .x07036500
ac-descriptor/station-limit :Word: 1000
ac-descriptor/stations :Word: 0
ac-name :Bstr16: CiscoAC73
ac-name-with-index.0 :Bstr16: CiscoAC73
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
@ -25,14 +25,18 @@ capwap-local-ip-address :IPAddress: 192.168.0.14
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: 0.0.0.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/ap-failover-priority :Byte: 2
cisco/ap-failover-priority :Byte: 3
cisco/ap-group-name :Bstr16: default-group
cisco/ap-led-state-config/led-state :Byte: 1
cisco/ap-led-state-config/save-flag :Byte: 1
cisco/ap-log-facility :Byte: 0
cisco/ap-power-injector-config/selection :Byte: 0
cisco/ap-power-injector-config/sitch-mac-address :Bstr16: .x000000000000
cisco/ap-power-injector-config/state :Byte: 17
cisco/ap-pre-std-switch-config :Byte: 1
cisco/ap-regulatory-domain.0/code0 :Byte: 0
cisco/ap-regulatory-domain.0/code1 :Byte: 1
cisco/ap-regulatory-domain.0/set :Bool: true
@ -43,8 +47,11 @@ 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: 1524181577
cisco/ap-timesync/timestamp :Dword: 1524296571
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
cisco/ap-username-and-password/username :Str: giraffe
cisco/board-data-options :Dword: 16777217
cisco/loghost-config/last-joined-ap :Str:
cisco/loghost-config/loghost.0 :IPAddress: 7.7.1.3
@ -61,6 +68,19 @@ cisco/mwar-type :Byte: 0
cisco/ssl-certfile :Str: ../../ssl/certs/wtpc.crt
cisco/ssl-cipher :Str: ALL
cisco/ssl-keyfile :Str: ../../ssl/certs/wtpc.key
cisco/vlan/id :Word: 77
cisco/vlan/tagging :Bool: true
cisco/wtp-board-data/card-id :Word: 0
cisco/wtp-board-data/card-revision :Word: 0
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/flex-connect :Byte: 0
cisco/wtp-board-data/wtp-model-hi :Dword: 0
cisco/wtp-board-data/wtp-model-lo :Dword: 0
cisco/wtp-board-data/wtp-serial-number :Str: FCZ1406W232
discovery-type :Byte: 0
idle-timeout :Dword: 300
location-data :Bstr16: "superposition\"tobias"