diff --git a/src/ac/wtpman.c b/src/ac/wtpman.c index 127fa607..1d74b2c4 100644 --- a/src/ac/wtpman.c +++ b/src/ac/wtpman.c @@ -743,6 +743,13 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr, wtpman->conn->role = CW_ROLE_AC; wtpman->conn->data=wtpman; + wtpman->conn->cfg_list[0]=wtpman->conn->update_cfg; + wtpman->conn->cfg_list[1]=wtpman->conn->remote_cfg; + wtpman->conn->cfg_list[2]=wtpman->conn->local_cfg; + wtpman->conn->cfg_list[3]=wtpman->conn->global_cfg; + wtpman->conn->cfg_list[4]=NULL; + + wtpman->conn->data_sock = socklist[socklistindex].data_sockfd; sock_copyaddr(&wtpman->conn->data_addr, (struct sockaddr *) &wtpman->conn->addr); diff --git a/src/cw/conn.c b/src/cw/conn.c index 8e1346da..526d54a7 100644 --- a/src/cw/conn.c +++ b/src/cw/conn.c @@ -61,6 +61,7 @@ void cw_conn_init(struct cw_Conn * conn) conn->update_cfg = cw_cfg_create(); conn->remote_cfg = cw_cfg_create(); conn->local_cfg = cw_cfg_create(); + conn->cfg_list[0]=NULL; } int cw_conn_set_msg_cb(struct cw_Conn *conn, int type, cw_MsgCallbackFun fun) @@ -489,10 +490,7 @@ static int process_elements(struct cw_Conn *conn, uint8_t * rawmsg, int len, params.cfg->dbg_level = DBG_ELEM_DETAIL_IN; params.cfg->dbg_prefix = " "; - params.cfg_list[0]=params.cfg; - params.cfg_list[1]=conn->local_cfg; - params.cfg_list[2]=conn->global_cfg; - params.cfg_list[3]=NULL; + params.cfg_list=conn->cfg_list; params.from = from; params.msgdata = message; diff --git a/src/cw/conn.h b/src/cw/conn.h index d34e363b..913ef812 100644 --- a/src/cw/conn.h +++ b/src/cw/conn.h @@ -86,6 +86,8 @@ struct cw_Conn { configuration status request. */ cw_Cfg_t * update_cfg; + + cw_Cfg_t * cfg_list[10]; bstr16_t session_id; diff --git a/src/cw/message.c b/src/cw/message.c index 690d5c18..08719c9b 100644 --- a/src/cw/message.c +++ b/src/cw/message.c @@ -100,11 +100,7 @@ int cw_compose_message(struct cw_Conn *conn, uint8_t * rawout) //cw_dbg(DBG_X,"setting with update CFG"); params.conn=conn; params.rawmsg = rawout; - params.cfg_list[0]=conn->update_cfg; - params.cfg_list[1]=conn->remote_cfg; - params.cfg_list[2]=conn->local_cfg; - params.cfg_list[3]=conn->global_cfg; - params.cfg_list[4]=NULL; + params.cfg_list=conn->cfg_list; params.msgset=conn->msgset; params.msgdata=msg; params.debug_details=details; diff --git a/src/cw/msgset.h b/src/cw/msgset.h index 3989259d..f88c7780 100644 --- a/src/cw/msgset.h +++ b/src/cw/msgset.h @@ -36,7 +36,7 @@ struct cw_ElemHandlerParams { char * debug_details; uint32_t dbg_level; cw_Cfg_t * cfg; - cw_Cfg_t * cfg_list[10]; + cw_Cfg_t ** cfg_list; int len; }; diff --git a/src/mod/cisco/cisco_actions.c b/src/mod/cisco/cisco_actions.c index 613d1511..daca7f26 100644 --- a/src/mod/cisco/cisco_actions.c +++ b/src/mod/cisco/cisco_actions.c @@ -374,7 +374,7 @@ static cw_ValStruct_t cisco_antenna_payload70[]={ {CW_TYPE_BYTE,"unknown",1,-1}, {CW_TYPE_BYTE,"802-11n-tx-antennas",1,-1}, {CW_TYPE_BYTE,"802-11n-rx-antennas",1,-1}, - {CW_TYPE_BYTE,"unknown",1,-1}, +// {CW_TYPE_BYTE,"unknown",1,-1}, {CW_TYPE_BYTE,"antenna-1",1,-1}, {CW_TYPE_BYTE,"antenna-2",1,-1}, {NULL,NULL,0,0} diff --git a/src/wtp/cisco.ckv b/src/wtp/cisco.ckv index 7b5228f8..bd67bc3b 100644 --- a/src/wtp/cisco.ckv +++ b/src/wtp/cisco.ckv @@ -6,8 +6,8 @@ ac-name-with-index.0: ac-name-with-index.1: ac-name-with-index.2: capwap-local-ip-address: 192.168.0.13 -capwap-timers/echo-interval: 0 -capwap-timers/max-discovery-interval: 0 +capwap-timers/echo-interval: 30 +capwap-timers/max-discovery-interval: 10 capwap/ac-name: cisco-8011-assoc-limit/enable: false cisco-8011-assoc-limit/interval: 500 @@ -60,7 +60,7 @@ cisco/ap-username-and-password/login-credentials/password: $1$MX4t$F19wCuY8yN5jB cisco/ap-username-and-password/login-credentials/username: admin cisco/cisco-discovery-protocol/data: 513 cisco/cisco-discovery-protocol/enabled: false -cisco/elem132: .x0100000000 +cisco/elem132: .x0000000000 cisco/loghost-config/last-joined-ap: None cisco/loghost-config/loghost: 255.255.255.255 cisco/lw-path-mtu/len: 1095 @@ -97,15 +97,19 @@ idle-timeout: 300 location-data: default location maximum-message-length: 14000 radio.0/admin-state: 1 - enabled +radio.0/capwap80211/rate-set: .x82848b960c1218243048606c +radio.0/capwap80211/tx-power/@cisco/cfg-type: 2 - custom +radio.0/capwap80211/tx-power/current-tx-power: 1 +radio.0/capwap80211/wtp-radio-information: 1 radio.0/cisco/air-space-capability: 0 -radio.0/cisco/antenna-payload/802-11n-rx-antennas: 7 -radio.0/cisco/antenna-payload/802-11n-tx-antennas: 0 +radio.0/cisco/antenna-payload/802-11n-rx-antennas: 3 +radio.0/cisco/antenna-payload/802-11n-tx-antennas: 7 radio.0/cisco/antenna-payload/antenna-1: 1 radio.0/cisco/antenna-payload/antenna-2: 1 radio.0/cisco/antenna-payload/antenna-mode: 3 radio.0/cisco/antenna-payload/diversity-selection: 255 radio.0/cisco/antenna-payload/number-of-antennas: 2 -radio.0/cisco/antenna-payload/unknown: 3 +radio.0/cisco/antenna-payload/unknown: 1 radio.0/cisco/channel-power: .x08080d0108221c16100a04fefe0208221c16100a04fefe0308221c16100a04fefe0408221c16100a04fefe0508221c16100a04fefe0608221c16100a04fefe0708221c16100a04fefe0808221c16100a04fefe0908221c16100a04fefe0a08221c16100a04fefe0b08221c16100a04fefe0c08221c16100a04fefe0d08221c16100a04fefe radio.0/cisco/direct-sequence-control/cfg-type: 1 - global radio.0/cisco/direct-sequence-control/current-cca-mode: 0 @@ -120,6 +124,7 @@ radio.0/cisco/elem16: .x02040b0c radio.0/cisco/elem19: .xc0a800a10001000cc0a800a103000101003ccd774fc43bd27db633509934957d3acb000000000000000052464d000000000000000000000000000000000000000000000000000000000001060b010101 radio.0/cisco/elem22: .x0d00b400320102030405060708090a0b0c0d radio.0/cisco/elem24: .x003c000c +radio.0/cisco/elem39: .x0078 radio.0/cisco/elem47: .x0100000000000000000000000000000000 radio.0/cisco/elem48: .x00 radio.0/cisco/elem81: .x00000000010101010a001e0a02051cbfffbfff0a00 @@ -143,7 +148,7 @@ radio.0/cisco/multi-domain-capability/number-of-channels: 13 radio.0/cisco/multi-domain-capability/reserved: 1 radio.0/cisco/tx-power-levels: .x070011000e000b000800050002ffff0000 radio.0/cisco/tx-power/cfg-type: 1 - global -radio.0/cisco/tx-power/current-tx-power: 1 +radio.0/cisco/tx-power/current-tx-power: 5 radio.0/cisco/wtp-radio-config/beacon-period: 100 radio.0/cisco/wtp-radio-config/bss-id: .x04fe7f499b90 radio.0/cisco/wtp-radio-config/cfg-period: 4 @@ -170,7 +175,7 @@ radio.0/wlan.1/add-wlan/scan-defer-time: 100 radio.0/wlan.1/add-wlan/session-timout: 1800 radio.0/wlan.1/add-wlan/ssid: tubeC radio.0/wlan.1/add-wlan/wep-encryption: false -radio.0/wlan.1/add-wlan/wep-key: .x31772582ab25934f97c565949f +radio.0/wlan.1/add-wlan/wep-key: .x1994f9d6d5f332f6531f532803 radio.0/wlan.1/add-wlan/wep-key-index: 1 radio.0/wlan.1/add-wlan/wlan-capability: 1073 radio.0/wlan.1/add-wlan/wlan-id: 1 @@ -187,32 +192,42 @@ radio.0/wlan.13/add-wlan/scan-defer-time: 100 radio.0/wlan.13/add-wlan/session-timout: 1800 radio.0/wlan.13/add-wlan/ssid: SuperSSID radio.0/wlan.13/add-wlan/wep-encryption: false -radio.0/wlan.13/add-wlan/wep-key: .x31772582ab25934f97c565949f +radio.0/wlan.13/add-wlan/wep-key: .x1994f9d6d5f332f6531f532803 radio.0/wlan.13/add-wlan/wep-key-index: 1 radio.0/wlan.13/add-wlan/wlan-capability: 1057 radio.0/wlan.13/add-wlan/wlan-id: 13 -radio.0/wtp-radio-information: 1 radio.1/admin-state: 1 - enabled +radio.1/capwap80211/rate-set: .x8c129824b048606c +radio.1/capwap80211/tx-power/@cisco/cfg-type: 2 - custom +radio.1/capwap80211/tx-power/current-tx-power: 1 +radio.1/capwap80211/wtp-radio-information: 2 radio.1/cisco/air-space-capability: 0 -radio.1/cisco/antenna-payload/802-11n-rx-antennas: 7 -radio.1/cisco/antenna-payload/802-11n-tx-antennas: 0 +radio.1/cisco/antenna-payload/802-11n-rx-antennas: 3 +radio.1/cisco/antenna-payload/802-11n-tx-antennas: 7 radio.1/cisco/antenna-payload/antenna-1: 1 -radio.1/cisco/antenna-payload/antenna-2: 1 +radio.1/cisco/antenna-payload/antenna-2: 0 radio.1/cisco/antenna-payload/antenna-mode: 3 -radio.1/cisco/antenna-payload/diversity-selection: 255 +radio.1/cisco/antenna-payload/diversity-selection: 0 radio.1/cisco/antenna-payload/number-of-antennas: 2 -radio.1/cisco/antenna-payload/unknown: 3 +radio.1/cisco/antenna-payload/unknown: 1 radio.1/cisco/channel-power: .x0808102408221c16100a04fefe2808221c16100a04fefe2c08221c16100a04fefe3008221c16100a04fefe3408221c16100a04fefe3808221c16100a04fefe3c08221c16100a04fefe4008221c16100a04fefe6408221c16100a04fefe6808221c16100a04fefe6c08221c16100a04fefe7008221c16100a04fefe7408221c16100a04fefe8408221c16100a04fefe8808221c16100a04fefe8c08221c16100a04fefe +radio.1/cisco/direct-sequence-control/cfg-type: 1 - global +radio.1/cisco/direct-sequence-control/current-cca-mode: 0 +radio.1/cisco/direct-sequence-control/current-channel: 1 +radio.1/cisco/direct-sequence-control/energy-detect-threshold: -50 +radio.1/cisco/direct-sequence-control/unknown: 1 radio.1/cisco/elem145: .x01 +radio.1/cisco/elem146: .x690f radio.1/cisco/elem15/cfg-type: 1 - global -radio.1/cisco/elem15/channel: 140 -radio.1/cisco/elem15/rest: .x07ffffffce010101 +radio.1/cisco/elem15/channel: 52 +radio.1/cisco/elem15/rest: .x07ffffffce010001 radio.1/cisco/elem153: .x00 radio.1/cisco/elem156: .x020100 radio.1/cisco/elem16: .x0c121824 radio.1/cisco/elem19: .xc0a800a10001000bc0a800a110000101003ccd774fc43bd27db633509934957d3acb000000000000000052464d000000000000000000000000000000000000000000000000000000000024282c3034383c4064686c707484888c01010101010101010101010101010101 radio.1/cisco/elem22: .x1000b4003224282c3034383c4064686c707484888c radio.1/cisco/elem24: .x003c000c +radio.1/cisco/elem39: .x0078 radio.1/cisco/elem47: .x0100000000000000000000000000000000 radio.1/cisco/elem48: .x00 radio.1/cisco/elem81: .x00000000010101010a001e0a02050fbfffbfff0a00 @@ -236,7 +251,7 @@ radio.1/cisco/multi-domain-capability/number-of-channels: 4 radio.1/cisco/multi-domain-capability/reserved: 1 radio.1/cisco/tx-power-levels: .x070011000e000b000800050002ffff0000 radio.1/cisco/tx-power/cfg-type: 1 - global -radio.1/cisco/tx-power/current-tx-power: 1 +radio.1/cisco/tx-power/current-tx-power: 5 radio.1/cisco/wtp-radio-config/beacon-period: 100 radio.1/cisco/wtp-radio-config/bss-id: .x04fe7f499b90 radio.1/cisco/wtp-radio-config/cfg-period: 4 @@ -263,7 +278,7 @@ radio.1/wlan.1/add-wlan/scan-defer-time: 100 radio.1/wlan.1/add-wlan/session-timout: 1800 radio.1/wlan.1/add-wlan/ssid: tubeC radio.1/wlan.1/add-wlan/wep-encryption: false -radio.1/wlan.1/add-wlan/wep-key: .x4b0706ccd5d0a8b98b0b4084f1 +radio.1/wlan.1/add-wlan/wep-key: .xef86466b27791853131dd3073c radio.1/wlan.1/add-wlan/wep-key-index: 1 radio.1/wlan.1/add-wlan/wlan-capability: 17 radio.1/wlan.1/add-wlan/wlan-id: 1 @@ -280,16 +295,15 @@ radio.1/wlan.13/add-wlan/scan-defer-time: 100 radio.1/wlan.13/add-wlan/session-timout: 1800 radio.1/wlan.13/add-wlan/ssid: SuperSSID radio.1/wlan.13/add-wlan/wep-encryption: false -radio.1/wlan.13/add-wlan/wep-key: .x4b0706ccd5d0a8b98b0b4084f1 +radio.1/wlan.13/add-wlan/wep-key: .xef86466b27791853131dd3073c radio.1/wlan.13/add-wlan/wep-key-index: 1 radio.1/wlan.13/add-wlan/wlan-capability: 1 radio.1/wlan.13/add-wlan/wlan-id: 13 -radio.1/wtp-radio-information: 2 radio.2/cisco/lwelem33: .x00 radio.255/admin-state: 1 - enabled radio.255/operational-state/cause: Normal radio.255/operational-state/state: enabled -session-id: .x4a230869 +session-id: .x5a230869 statistics-timer: 180 wtp-board-data/board-id: .x0000 wtp-board-data/mac-address: .x0800276edf58 diff --git a/src/wtp/wtp_main.c b/src/wtp/wtp_main.c index ce37bcb9..a3ebd457 100644 --- a/src/wtp/wtp_main.c +++ b/src/wtp/wtp_main.c @@ -142,6 +142,10 @@ int main (int argc, char **argv) conn->dtls_mtu = 1200; conn->msgset=msgset; conn->global_cfg = global_cfg; + + conn->cfg_list[0]=conn->local_cfg; + conn->cfg_list[1]=conn->global_cfg; + conn->cfg_list[2]=NULL; conn->role = CW_ROLE_WTP; conn->wbid=1; @@ -172,13 +176,18 @@ int main (int argc, char **argv) /* cw_run_discovery(conn, "255.255.255.255",NULL, &dis);*/ struct cw_DiscoveryResulsts * results; -// cw_run_discovery(conn, "192.168.0.162","192.168.0.14", &dis); - //cw_run_discovery(conn, "255.255.255.255","192.168.0.14", &dis); + //cw_run_discovery(conn, "192.168.0.24","192.168.0.14", &dis); + // + + results = cw_run_discovery(conn, "255.255.255.255","192.168.0.14"); // cw_run_discovery(conn, "192.168.0.255","192.168.0.14", &dis); //results = cw_run_discovery(conn, "255.255.255.255","192.168.0.14"); +// results = cw_run_discovery(conn, "192.168.0.24","192.168.0.14"); // results = cw_run_discovery(conn, "255.255.255.255","172.16.67.119"); // results = cw_run_discovery(conn, "255.255.255.255","172.16.67.185"); - results = cw_run_discovery(conn, "172.16.67.255","172.16.67.185"); +// results = cw_run_discovery(conn, "172.16.67.255","172.16.67.185"); + + if (!join(conn,results)){ cw_discovery_results_destroy(results);