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

More done

Browse Source 
FossilOrigin-Name: e758245a5ace834cffa480cc0bc56fda3a8a44dff48bed7268e27554496c413a
This commit is contained in:
7u83@mail.ru 2018-05-15 05:51:01 +00:00
parent f9da482f69
commit c0dc762b09
6 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actube.workspace
View File

@ -4,8 +4,8 @@
<Project Name="wtp" Path="wtp.project" Active="No"/> <Project Name="wtp" Path="wtp.project" Active="No"/>
<Project Name="mod_cipwap" Path="mod_cipwap.project" Active="No"/> <Project Name="mod_cipwap" Path="mod_cipwap.project" Active="No"/>
<Project Name="mod_capwap" Path="mod_capwap.project" Active="No"/> <Project Name="mod_capwap" Path="mod_capwap.project" Active="No"/>
<Project Name="mod_cisco" Path="mod_cisco.project" Active="No"/> <Project Name="mod_cisco" Path="mod_cisco.project" Active="Yes"/>
<Project Name="libcw" Path="libcw.project" Active="Yes"/> <Project Name="libcw" Path="libcw.project" Active="No"/>
<Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="No"/> <Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="No"/>
<Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/> <Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/>
<BuildMatrix> <BuildMatrix>

2
src/cw/conn_send_msg.c
View File

@ -28,7 +28,7 @@ int conn_send_msg(struct conn * conn, uint8_t *rawmsg)
hlen = cw_get_hdr_hlen(rawmsg)*4; hlen = cw_get_hdr_hlen(rawmsg)*4;
mtu = conn->mtu; mtu = conn->mtu;
mtu = 800;
while (packetlen>mtu){ while (packetlen>mtu){

1
src/cw/mod.h
View File

@ -69,6 +69,7 @@ struct cw_Mod {
void *data; void *data;
int (*setup_cfg)(struct conn *conn); int (*setup_cfg)(struct conn *conn);
}; };

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

@ -290,7 +290,7 @@ int cisco_out_ap_regulatory_domain(struct cw_ElemHandler * eh,
} }
start = params->conn->header_len(eh); start = params->conn->header_len(eh);
len = cw_ktv_write_struct(params->conn->local_cfg,type,key,ob+start); len = cw_ktv_write_struct(params->conn->local_cfg,NULL,type,key,ob+start);
ob += params->conn->write_header(eh,ob,len); ob += params->conn->write_header(eh,ob,len);
idx++; idx++;
@ -481,7 +481,9 @@ static int cisoc_add_wlan_mkkey(const char *pkey, uint8_t*data, int len, char *d
} }
static cw_KTVStruct_t cisco_add_lwwlan[]={ static cw_KTVStruct_t cisco_add_lwwlan[]={
{CW_TYPE_BSTR16, "misc", 8, 2},
{CW_TYPE_STR, "ssid",-1,10}, {CW_TYPE_STR, "ssid",-1,10},
{CW_TYPE_WORD, "misc2", 2, 48 },
{NULL,NULL,0,0} {NULL,NULL,0,0}
}; };
@ -1193,7 +1195,7 @@ static struct cw_ElemHandler handlers73[] = {
"Add Cisco WLAN (LWAPP)", /* name */ "Add Cisco WLAN (LWAPP)", /* name */
CISCO_LWELEM_ADD_WLAN, /* Element ID */ CISCO_LWELEM_ADD_WLAN, /* Element ID */
CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */ CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */
7,1117, /* min/max length */ 1,1117, /* min/max length */
cisco_add_lwwlan, /* type */ cisco_add_lwwlan, /* type */
"radio/wlan", /* Key */ "radio/wlan", /* Key */
cw_in_generic_struct, /* get */ cw_in_generic_struct, /* get */
@ -1542,7 +1544,7 @@ static struct cw_ElemDef configuration_update_request_elements[] ={
static struct cw_ElemDef wtp_event_request_elements[] ={ static struct cw_ElemDef wtp_event_request_elements[] ={
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_SPAM_VENDOR_SPECIFIC,0, CW_IGNORE}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_SPAM_VENDOR_SPECIFIC,0, CW_IGNORE},
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_ADD_WLAN, 0, CW_IGNORE}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_ADD_WLAN, 0, CW_IGNORE},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_ADD_WLAN, 0, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_HARDWARE_INFO, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_HARDWARE_INFO, 0, 0},
{0,0,0,0,0} {0,0,0,0,0}

6
src/mod/cisco/mod_cisco_ac.c
View File

@ -229,6 +229,12 @@ int static setup_cfg(struct conn * conn)
security = cw_setup_dtls(conn,conn->local_cfg,"cisco",CAPWAP_CIPHER); security = cw_setup_dtls(conn,conn->local_cfg,"cisco",CAPWAP_CIPHER);
cw_ktv_set_byte(conn->local_cfg,"ac-descriptor/security",security); cw_ktv_set_byte(conn->local_cfg,"ac-descriptor/security",security);
if (conn->default_cfg==NULL){
conn->default_cfg=cw_ktv_create();
}
return 0; return 0;
} }

22
src/wtp/cisco.ktv
View File

@ -10,19 +10,19 @@ ac-descriptor/software/vendor :Dword: 4232704
ac-descriptor/software/version :Bstr16: .x08007900 ac-descriptor/software/version :Bstr16: .x08007900
ac-descriptor/station-limit :Word: 1000 ac-descriptor/station-limit :Word: 1000
ac-descriptor/stations :Word: 0 ac-descriptor/stations :Word: 0
ac-name :Bstr16: X1 ac-name :Bstr16: CisAC
ac-name-with-index.0 :Bstr16: tabbe88 ac-name-with-index.0 :Bstr16: tabbe88
ac-name-with-index.1 :Bstr16: nudelnudel ac-name-with-index.1 :Bstr16: nudelnudel
ac-name-with-index.2 :Bstr16: nadelnalde ac-name-with-index.2 :Bstr16: nadelnalde
ac-name-with-priority/X1 :Byte: 3 ac-name-with-priority/X1 :Byte: 3
ac-name-with-priority/ac2 :Byte: 5 ac-name-with-priority/ac2 :Byte: 5
capwap-control-ip-address/address.0 :IPAddress: 192.168.0.14 capwap-control-ip-address/address.0 :IPAddress: 192.168.0.180
capwap-control-ip-address/address.1 :IPAddress: 192.168.0.14 capwap-control-ip-address/address.1 :IPAddress: 192.168.0.180
capwap-control-ip-address/address.2 :IPAddress: 192.168.0.173 capwap-control-ip-address/address.2 :IPAddress: 192.168.0.173
capwap-control-ip-address/wtps.0 :Word: 2 capwap-control-ip-address/wtps.0 :Word: 1
capwap-control-ip-address/wtps.1 :Word: 2 capwap-control-ip-address/wtps.1 :Word: 1
capwap-control-ip-address/wtps.2 :Word: 1 capwap-control-ip-address/wtps.2 :Word: 1
capwap-local-ip-address :IPAddress: 192.168.56.1 capwap-local-ip-address :IPAddress: 192.168.0.14
capwap-timers/echo-interval :Byte: 30 capwap-timers/echo-interval :Byte: 30
capwap-timers/max-discovery-interval :Byte: 10 capwap-timers/max-discovery-interval :Byte: 10
capwap-timers/min-discovery-interval :Byte: 0 capwap-timers/min-discovery-interval :Byte: 0
@ -61,7 +61,7 @@ cisco/ap-regulatory-domain.1/slot :Byte: 1
cisco/ap-sub-mode :Byte: 0 cisco/ap-sub-mode :Byte: 0
cisco/ap-telnet-ssh/ssh :Bool: false cisco/ap-telnet-ssh/ssh :Bool: false
cisco/ap-telnet-ssh/telnet :Bool: false cisco/ap-telnet-ssh/telnet :Bool: false
cisco/ap-timesync/timestamp :Dword: 1526318158 cisco/ap-timesync/timestamp :Dword: 1526344276
cisco/ap-timesync/type :Byte: 0 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/option :Word: 2
cisco/ap-username-and-password/802.1x-credentials/password :Str: cisco/ap-username-and-password/802.1x-credentials/password :Str:
@ -160,7 +160,7 @@ radio.0/cisco/wtp-radio-config/reg :Dword: 65536
radio.0/cisco/wtp-radio-config/unknown75 :Byte: 0 radio.0/cisco/wtp-radio-config/unknown75 :Byte: 0
radio.0/decryption-error-report-period :Word: 120 radio.0/decryption-error-report-period :Word: 120
radio.0/operational-state/cause :Byte: Normal radio.0/operational-state/cause :Byte: Normal
radio.0/operational-state/state :Byte: 0 radio.0/operational-state/state :Byte: enabled
radio.0/rate_set :Bstr16: .x82848b960c1218243048606c radio.0/rate_set :Bstr16: .x82848b960c1218243048606c
radio.0/wlan.0/allow-aaa-override :Byte: 0 radio.0/wlan.0/allow-aaa-override :Byte: 0
radio.0/wlan.0/broadcast-ssid :Bool: true radio.0/wlan.0/broadcast-ssid :Bool: true
@ -209,7 +209,7 @@ radio.1/cisco/wtp-radio-config/reg :Dword: 65536
radio.1/cisco/wtp-radio-config/unknown75 :Byte: 1 radio.1/cisco/wtp-radio-config/unknown75 :Byte: 1
radio.1/decryption-error-report-period :Word: 120 radio.1/decryption-error-report-period :Word: 120
radio.1/operational-state/cause :Byte: Normal radio.1/operational-state/cause :Byte: Normal
radio.1/operational-state/state :Byte: 0 radio.1/operational-state/state :Byte: enabled
radio.1/rate_set :Bstr16: .x8c129824b048606c radio.1/rate_set :Bstr16: .x8c129824b048606c
radio.1/wlan.0/allow-aaa-override :Byte: 0 radio.1/wlan.0/allow-aaa-override :Byte: 0
radio.1/wlan.0/broadcast-ssid :Bool: true radio.1/wlan.0/broadcast-ssid :Bool: true
@ -217,6 +217,8 @@ radio.1/wlan.0/dtim-period :Byte: 1
radio.1/wlan.0/encryption :Byte: 0 radio.1/wlan.0/encryption :Byte: 0
radio.1/wlan.0/encryption-policy :Dword: 16777216 radio.1/wlan.0/encryption-policy :Dword: 16777216
radio.1/wlan.0/max-stations :Byte: 200 radio.1/wlan.0/max-stations :Byte: 200
radio.1/wlan.0/misc :Bstr16: .x3e9904fac0000100
radio.1/wlan.0/misc2 :Word: 4
radio.1/wlan.0/radio-id :Byte: 1 radio.1/wlan.0/radio-id :Byte: 1
radio.1/wlan.0/session-timout :Word: 1800 radio.1/wlan.0/session-timout :Word: 1800
radio.1/wlan.0/ssid :Str: TubeSSID radio.1/wlan.0/ssid :Str: TubeSSID
@ -237,7 +239,7 @@ 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-buffer :Word: 0
radio.3/cisco/rad-extended-config/multicast-data-range :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.3/cisco/rad-extended-config/rx-sensop-threshold :Word: 0
radio.255/admin-state :Byte: enabled radio.255/admin-state :Byte: reserved
radio.255/operational-state/cause :Byte: Normal radio.255/operational-state/cause :Byte: Normal
radio.255/operational-state/state :Byte: enabled radio.255/operational-state/state :Byte: enabled
radio/0/cisco/regulatory-domain/code0 :Byte: 0 radio/0/cisco/regulatory-domain/code0 :Byte: 0