From 276a282369ea145117e34219cbc8c73764f4e65a Mon Sep 17 00:00:00 2001 From: 7u83 <7u83@mail.ru> Date: Fri, 26 Aug 2022 17:38:28 +0200 Subject: [PATCH] Moved a lot cfg entries from / to /capwap etc --- src/ac/rpc.c | 6 +- src/ac/wtpman.c | 16 ++- src/cw/conn.c | 2 +- src/cw/cw.c | 2 +- src/cw/discovery.c | 6 +- src/mod/capwap/capwap_actions.c | 2 +- src/mod/cisco/cisco_actions.c | 4 +- src/wtp/cisco.ckv | 184 +++++++++++++++----------------- src/wtp/configure.c | 3 + src/wtp/discovery.c | 4 +- src/wtp/join.c | 4 +- src/wtp/wtp_main.c | 7 +- 12 files changed, 118 insertions(+), 122 deletions(-) diff --git a/src/ac/rpc.c b/src/ac/rpc.c index 0fa5ffcf..0106bb4c 100644 --- a/src/ac/rpc.c +++ b/src/ac/rpc.c @@ -140,8 +140,9 @@ int exit_cmd(struct rpcdata *sd, const char *cmd) { //fprintf(sd->out,"Unknown command: '%s'\n\r\n\r",cmd); - printf("Exitcmd %s\n",cmd); - fprintf(sd->out,"END: %s\n\r",cmd); +// printf("Exitcmd %s\n",cmd); + //fprintf(sd->out,"END: %s\n\r",cmd); + finish_cmd(sd->out); fflush(sd->out); return 1; } @@ -453,7 +454,6 @@ int execute_cmd (struct rpcdata * sd, const char *str) } } else{ - printf("unknow command\n"); fprintf(sd->out,"Unknown command: '%s'\n",cmd); finish_cmd(sd->out); } diff --git a/src/ac/wtpman.c b/src/ac/wtpman.c index 2cedc798..4df58717 100644 --- a/src/ac/wtpman.c +++ b/src/ac/wtpman.c @@ -451,9 +451,17 @@ static void copy(struct cw_ElemHandlerParams * params) static int discovery_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len) { + struct cw_Conn * conn = (struct cw_Conn*)params->conn; + char filename[200]; + cw_dbg(DBG_X,"DISCOVERY Callback"); copy(params); + + const char * wtpname = cw_cfg_get(conn->remote_cfg,"capwap/wtp-name","default"); + sprintf(filename,"wtp-discovery-%s.ckv",wtpname); + cw_cfg_save(filename,params->cfg,NULL); cw_cfg_clear(params->cfg); + return 0; } @@ -464,7 +472,7 @@ static int join_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, in cw_dbg(DBG_X,"JOIN Callback"); copy(params); - const char * wtpname = cw_cfg_get(conn->local_cfg,"capwap/wtp-name","default"); + const char * wtpname = cw_cfg_get(conn->remote_cfg,"capwap/wtp-name","default"); sprintf(filename,"wtp-join-%s.ckv",wtpname); cw_cfg_save(filename,params->cfg,NULL); cw_cfg_clear(params->cfg); @@ -481,7 +489,7 @@ static int update_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, cw_dbg(DBG_X,"UPDATE Callback"); copy(params); - const char * wtpname = cw_cfg_get(conn->local_cfg,"capwap/wtp-name","default"); + const char * wtpname = cw_cfg_get(conn->remote_cfg,"capwap/wtp-name","default"); sprintf(filename,"wtp-status-%s.ckv",wtpname); cw_cfg_save(filename,params->cfg,NULL); //stop(); @@ -498,9 +506,9 @@ static int event_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, i cw_dbg(DBG_X,"WTP EVENT Callback"); copy(params); - const char * wtpname = cw_cfg_get(conn->local_cfg,"capwap/wtp-name","default"); + const char * wtpname = cw_cfg_get(conn->remote_cfg,"capwap/wtp-name","default"); sprintf(filename,"wtp-event-%s.ckv",wtpname); - cw_cfg_save(filename,params->cfg,NULL); + cw_cfg_save(filename,conn->remote_cfg,NULL); //stop(); return 0; } diff --git a/src/cw/conn.c b/src/cw/conn.c index 526d54a7..45c17397 100644 --- a/src/cw/conn.c +++ b/src/cw/conn.c @@ -534,7 +534,7 @@ static int process_elements(struct cw_Conn *conn, uint8_t * rawmsg, int len, cw_send_error_response(conn, rawmsg, result_code); } else if (result_code == 0) { - cw_cfg_set_int(conn->update_cfg, "result-code", + cw_cfg_set_int(conn->update_cfg, "capwap/result-code", result_code); if (ui->next) { conn->capwap_prevstate = conn->capwap_state; diff --git a/src/cw/cw.c b/src/cw/cw.c index ef265471..cb01ce82 100644 --- a/src/cw/cw.c +++ b/src/cw/cw.c @@ -118,7 +118,7 @@ int cw_out_radio_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerP int radios; len =0; - radios = cw_cfg_get_byte_l(params->cfg_list,"wtp-descriptor/max-radios",0); + radios = cw_cfg_get_byte_l(params->cfg_list,"capwap/wtp-descriptor/max-radios",0); for(i=0;itype; diff --git a/src/cw/discovery.c b/src/cw/discovery.c index 669e1a05..c2690748 100644 --- a/src/cw/discovery.c +++ b/src/cw/discovery.c @@ -69,7 +69,7 @@ void cw_discovery_results_add(struct cw_DiscoveryResults *dis, } else { /* Get priority for AC from * ac-name-with-priority list */ - sprintf(key, "ac-name-with-priority/%s", acname); + sprintf(key, "capwap/ac-name-with-priority/%s", acname); e.prio = cw_cfg_get_byte(wtp_cfg, key, 255); } @@ -78,7 +78,7 @@ void cw_discovery_results_add(struct cw_DiscoveryResults *dis, do { const char *ipval; - sprintf(key, "capwap-control-ip-address.%d/wtps", i); + sprintf(key, "capwap/control-ip-address.%d/wtps", i); e.wtps = cw_cfg_get_word(ac_cfg, key, 65535); @@ -86,7 +86,7 @@ void cw_discovery_results_add(struct cw_DiscoveryResults *dis, if (e.wtps == 65535) break; - sprintf(key, "capwap-control-ip-address.%d/address", i); + sprintf(key, "capwap/control-ip-address.%d/address", i); ipval = cw_cfg_get(ac_cfg, key, ""); sprintf(key, "%04d%05d%04d", e.prio, e.wtps, dis->nr); diff --git a/src/mod/capwap/capwap_actions.c b/src/mod/capwap/capwap_actions.c index d3da72bf..a244fb96 100644 --- a/src/mod/capwap/capwap_actions.c +++ b/src/mod/capwap/capwap_actions.c @@ -442,7 +442,7 @@ static struct cw_ElemHandler handlers[] = { 0,0, /* Vendor / Proto */ 1,513, /* min/max length */ CW_TYPE_BSTR16, /* type */ - "capwap/ac-name-with-index", /* Key */ + "capwap/ac-name-with-priority", /* Key */ cw_in_generic_with_index, /* get */ cw_out_generic_with_index /* put */ } diff --git a/src/mod/cisco/cisco_actions.c b/src/mod/cisco/cisco_actions.c index 6bed4894..f51a3a3b 100644 --- a/src/mod/cisco/cisco_actions.c +++ b/src/mod/cisco/cisco_actions.c @@ -301,7 +301,7 @@ int cisco_out_ap_regulatory_domain(struct cw_ElemHandler * eh, type = NULL; - result = cw_cfg_get_val_l(params->cfg_list,"wtp-descriptor/software/version",CW_TYPE_BSTR16); + result = cw_cfg_get_val_l(params->cfg_list,"capwap/wtp-descriptor/software/version",CW_TYPE_BSTR16); if (result!=NULL){ if(result->type->len(result)==4){ uint32_t rv; @@ -1824,7 +1824,7 @@ static struct cw_ElemHandler handlers70[] = { CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */ 1,513, /* min/max length */ CW_TYPE_BSTR16, /* type */ - "ac-name-with-index", /* Key */ + "capwap/ac-name-with-priority", /* Key */ cw_in_generic_with_index, /* get */ cw_out_generic_with_index /* put */ } diff --git a/src/wtp/cisco.ckv b/src/wtp/cisco.ckv index 7010f072..d2d3f4cd 100644 --- a/src/wtp/cisco.ckv +++ b/src/wtp/cisco.ckv @@ -2,24 +2,45 @@ # This file is igenerated by WAT # If you edit this, your cahnges might be overwritten # -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: 30 -capwap-timers/max-discovery-interval: 10 capwap/ac-name: -capwap/discovery-type: 1 -cisco-8011-assoc-limit/enable: false -cisco-8011-assoc-limit/interval: 500 -cisco-8011-assoc-limit/limit: 25 -cisco/ac-ip-addr-with-index.0: 0.0.0.0 -cisco/ac-ip-addr-with-index.1: 0.0.0.0 -cisco/ac-ip-addr-with-index.2: 0.0.0.0 +capwap/idle-timeout: 300 +capwap/local-ip-address: 192.168.0.24 +capwap/location-data: default location +capwap/maximum-message-length: 14000 +capwap/session-id: .x14c4c46b +capwap/statistics-timer: 180 +capwap/timers/echo-interval: 30 +capwap/timers/max-discovery-interval: 10 +capwap/wtp-board-data/board-id: .x0000 +capwap/wtp-board-data/mac-address: .x0800276edf58 +capwap/wtp-board-data/model-no: "AIR-LAP1142N-E-K9 " +capwap/wtp-board-data/revision: A0 +capwap/wtp-board-data/serial-no: FCZ1406W232 +capwap/wtp-board-data/vendor: 4232704 +capwap/wtp-descriptor/bootloader/vendor: 4232704 +capwap/wtp-descriptor/bootloader/version: .x0c041200 +capwap/wtp-descriptor/hardware/vendor: 4232704 +capwap/wtp-descriptor/hardware/version: .x01000000 +capwap/wtp-descriptor/max-radios: 2 +capwap/wtp-descriptor/radios-in-use: 2 +capwap/wtp-descriptor/software/vendor: 4232704 +capwap/wtp-descriptor/software/version: .x07007400 +capwap/wtp-fallback: 1 +capwap/wtp-frame-tunnel-mode: 4 +capwap/wtp-mac-type: 1 - Split MAC +capwap/wtp-name: Soft-WTP +capwap/wtp-reboot-statistics/ac-initiated-count: 113 +capwap/wtp-reboot-statistics/hw-failure-count: 0 +capwap/wtp-reboot-statistics/last-failure-type: 1 +capwap/wtp-reboot-statistics/link-failure-count: 0 +capwap/wtp-reboot-statistics/other-failure-count: 1 +capwap/wtp-reboot-statistics/reboot-count: 0 +capwap/wtp-reboot-statistics/sw-failure-count: 0 +capwap/wtp-reboot-statistics/unknown-failure-count: 0 +cisco/8011-assoc-limit/enable: false +cisco/8011-assoc-limit/interval: 500 +cisco/8011-assoc-limit/limit: 25 cisco/ap-backup-software-version: .x00000000 -cisco/ap-core-dump/compression: false -cisco/ap-core-dump/filename: -cisco/ap-core-dump/tftp-server: 0.0.0.0 cisco/ap-dtls-data-cfg/cabable: true cisco/ap-dtls-data-cfg/enabled: false cisco/ap-ethernet-port-type: .x000000 @@ -32,7 +53,7 @@ cisco/ap-mode-and-type/type: 15 cisco/ap-model/image: 12.4(23c)JA2 cisco/ap-model/model: "AIR-LAP1142N-E-K9 " cisco/ap-power-injector-config/selection: 0 -cisco/ap-power-injector-config/state: 34 +cisco/ap-power-injector-config/state: 17 cisco/ap-power-injector-config/switch-mac-address: .x000000000000 cisco/ap-pre-std-switch-config: 0 cisco/ap-regulatory-domain.0/code0: 0 @@ -43,18 +64,16 @@ cisco/ap-regulatory-domain.1/code0: 0 cisco/ap-regulatory-domain.1/code1: 1 cisco/ap-regulatory-domain.1/set: true cisco/ap-regulatory-domain.1/slot: 1 -cisco/ap-static-domain/enable: true -cisco/ap-static-domain/name: planix.org cisco/ap-static-ip-addr/address: 192.168.0.13 -cisco/ap-static-ip-addr/enabled: true +cisco/ap-static-ip-addr/enabled: false cisco/ap-static-ip-addr/gateway: 192.168.0.1 cisco/ap-static-ip-addr/netmask: 255.255.255.0 cisco/ap-static-ip-addr/unknown: 0.0.0.0 cisco/ap-sub-mode: 0 cisco/ap-telnet-ssh/ssh: false cisco/ap-telnet-ssh/telnet: false -cisco/ap-uptime/current-uptime: 84 -cisco/ap-uptime/last-uptime: 1 +cisco/ap-uptime/current-uptime: 36527 +cisco/ap-uptime/last-uptime: 36513 cisco/ap-username-and-password/login-credentials/enable-password: $1$qve.$obrsuC2vFk5/TepRMiMxa. cisco/ap-username-and-password/login-credentials/option: 1025 cisco/ap-username-and-password/login-credentials/password: $1$MX4t$F19wCuY8yN5jBD7g2Qutr/ @@ -62,14 +81,14 @@ 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/loghost-config/last-joined-ap: None +cisco/loghost-config/last-joined-ap: actube_X cisco/loghost-config/loghost: 255.255.255.255 cisco/lw-path-mtu/len: 1095 cisco/lw-path-mtu/max: 1485 -cisco/lwelem105: .x0000 -cisco/lwelem14: .x000100000000000000000000000000000000 +cisco/lwelem105: .x000b +cisco/lwelem14: .x000000000000000000000000000000000000 cisco/mcast-mgid-info: .x0000000d0000000000000000000000000000000101000000 -cisco/mwar-addr/address: 192.168.0.14 +cisco/mwar-addr/address: 192.168.0.24 cisco/mwar-addr/mwar-type: 0 cisco/mwar-addr/unknown: 0 cisco/reset-button-state: true @@ -78,7 +97,6 @@ cisco/rouge-and-mss/tcp-adjust-mss: 0 cisco/rouge-detection/rest: .x0000000a cisco/rouge-detection/rouge-detection: true cisco/sig-toggle: true -cisco/sig-toogle: true cisco/spam-domain-secret: .xe1ffd18a8f15b3b59c0a47a7f17a96e7cb36174f00 cisco/ssl-certfile: ../../ssl/certs/wtpc.crt cisco/ssl-cipher: SHA1 @@ -88,18 +106,18 @@ cisco/wtp-board-data/card-revision: 0 cisco/wtp-board-data/ethernet-mac-address: .xc47d4f3af8a6 cisco/wtp-board-data/options/ant-type: 1 cisco/wtp-board-data/options/ap-type: 1 -cisco/wtp-board-data/options/failover-priority: 1 +cisco/wtp-board-data/options/failover-priority: 0 cisco/wtp-board-data/options/flex-connect: 1 cisco/wtp-board-data/wtp-model-hi: 0 cisco/wtp-board-data/wtp-model-lo: 0 cisco/wtp-board-data/wtp-serial-number: FCZ1406W232 cisco/wtp-use-ac-version: true -idle-timeout: 300 -location-data: default location -maximum-message-length: 14000 -radio.0/admin-state: 1 - enabled +radio.0/capwap/admin-state: 1 - enabled +radio.0/capwap/decryption-error-report-period: 120 +radio.0/capwap/operational-state/cause: Normal +radio.0/capwap/operational-state/state: enabled radio.0/capwap80211/rate-set: .x82848b960c1218243048606c -radio.0/capwap80211/tx-power/@cisco/cfg-type: 2 - custom +radio.0/capwap80211/tx-power/@cisco/cfg-type: 1 - global radio.0/capwap80211/tx-power/current-tx-power: 1 radio.0/capwap80211/wtp-radio-information: 1 radio.0/cisco/air-space-capability: 0 @@ -110,7 +128,7 @@ 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: 1 +radio.0/cisco/antenna-payload/unknown: 0 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 @@ -125,16 +143,14 @@ 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 radio.0/cisco/lwelem11: .x00000203 -radio.0/cisco/lwelem27: .x00000000000000000000000000000000000000000000000000 +radio.0/cisco/lwelem27: .x182c0000000000000000000000000000ffff00000000000000 radio.0/cisco/lwelem28: .x0303020202000000000000000000000000000000000000000000313f01 -radio.0/cisco/lwelem29: .x00010000000000000200001400 +radio.0/cisco/lwelem29: .x00010100000000000200001400 radio.0/cisco/lwelem48: .x01055a0101a6c405b06432b03232 -radio.0/cisco/lwelem55: .x000000000000000000000000 radio.0/cisco/lwelem9: .x0100000000000000000000000000000000 radio.0/cisco/mac-operation/fragmentation-threshold: 2346 radio.0/cisco/mac-operation/long-retry: 4 @@ -147,9 +163,11 @@ radio.0/cisco/multi-domain-capability/first-channel: 1 radio.0/cisco/multi-domain-capability/max-tx-power-level: 20 radio.0/cisco/multi-domain-capability/number-of-channels: 13 radio.0/cisco/multi-domain-capability/reserved: 1 +radio.0/cisco/radio-module-info/descr: 802.11N 2.4GHz Radio +radio.0/cisco/radio-module-info/name: UNKNOWN +radio.0/cisco/radio-module-info/serial: FOC14053DBQ +radio.0/cisco/radio-module-info/type: Dot11Radio0 radio.0/cisco/tx-power-levels: .x070011000e000b000800050002ffff0000 -radio.0/cisco/tx-power/cfg-type: 1 - global -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 @@ -159,10 +177,6 @@ radio.0/cisco/wtp-radio-config/country-str1: "DE " radio.0/cisco/wtp-radio-config/country-str2: "DE " radio.0/cisco/wtp-radio-config/occupancy-limit: 100 radio.0/cisco/wtp-radio-config/reg: 167772416 -radio.0/decryption-error-report-period: 120 -radio.0/operational-state/cause: Normal -radio.0/operational-state/state: enabled -radio.0/rate_set: .x82848b960c1218243048606c radio.0/wlan.1/add-wlan/aironet-ie: true radio.0/wlan.1/add-wlan/broadcast-ssid: true radio.0/wlan.1/add-wlan/dtim-period: 1 @@ -176,7 +190,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: .x4568d9877819af1f317267e3b7 +radio.0/wlan.1/add-wlan/wep-key: .xfeded530fa8b8949e048495d86 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 @@ -193,34 +207,31 @@ 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: .x4568d9877819af1f317267e3b7 +radio.0/wlan.13/add-wlan/wep-key: .xfeded530fa8b8949e048495d86 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.1/admin-state: 1 - enabled +radio.1/capwap/admin-state: 1 - enabled +radio.1/capwap/decryption-error-report-period: 120 +radio.1/capwap/operational-state/cause: Normal +radio.1/capwap/operational-state/state: enabled radio.1/capwap80211/rate-set: .x8c129824b048606c -radio.1/capwap80211/tx-power/@cisco/cfg-type: 2 - custom +radio.1/capwap80211/tx-power/@cisco/cfg-type: 1 - global 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: 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: 0 +radio.1/cisco/antenna-payload/antenna-2: 1 radio.1/cisco/antenna-payload/antenna-mode: 3 -radio.1/cisco/antenna-payload/diversity-selection: 0 +radio.1/cisco/antenna-payload/diversity-selection: 255 radio.1/cisco/antenna-payload/number-of-antennas: 2 -radio.1/cisco/antenna-payload/unknown: 1 +radio.1/cisco/antenna-payload/unknown: 0 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: 132 +radio.1/cisco/elem15/channel: 56 radio.1/cisco/elem15/rest: .x07ffffffce010001 radio.1/cisco/elem153: .x00 radio.1/cisco/elem156: .x020100 @@ -228,14 +239,13 @@ 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 radio.1/cisco/lwelem11: .x00010203 -radio.1/cisco/lwelem27: .x00000000000000000000000000000000000000000000000000 +radio.1/cisco/lwelem27: .x186e0000000000000000000000000000ffff00000000000000 radio.1/cisco/lwelem28: .x0303020202000000000000000000000000000000000000000000313f01 -radio.1/cisco/lwelem29: .x00010003000000000200001400 +radio.1/cisco/lwelem29: .x00018803000000000200002803 radio.1/cisco/lwelem33: .x00 radio.1/cisco/lwelem48: .x01055a0101a6c405b06432b03232 radio.1/cisco/lwelem9: .x0100000000000000000000000000000000 @@ -250,9 +260,11 @@ radio.1/cisco/multi-domain-capability/first-channel: 36 radio.1/cisco/multi-domain-capability/max-tx-power-level: 20 radio.1/cisco/multi-domain-capability/number-of-channels: 4 radio.1/cisco/multi-domain-capability/reserved: 1 +radio.1/cisco/radio-module-info/descr: 802.11N 5GHz Radio +radio.1/cisco/radio-module-info/name: UNKNOWN +radio.1/cisco/radio-module-info/serial: FOC14053DBQ +radio.1/cisco/radio-module-info/type: Dot11Radio1 radio.1/cisco/tx-power-levels: .x070011000e000b000800050002ffff0000 -radio.1/cisco/tx-power/cfg-type: 1 - global -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 @@ -262,10 +274,6 @@ radio.1/cisco/wtp-radio-config/country-str1: "DE " radio.1/cisco/wtp-radio-config/country-str2: "DE " radio.1/cisco/wtp-radio-config/occupancy-limit: 100 radio.1/cisco/wtp-radio-config/reg: 167772416 -radio.1/decryption-error-report-period: 120 -radio.1/operational-state/cause: Normal -radio.1/operational-state/state: enabled -radio.1/rate_set: .x8c129824b048606c radio.1/wlan.1/add-wlan/aironet-ie: true radio.1/wlan.1/add-wlan/broadcast-ssid: true radio.1/wlan.1/add-wlan/dtim-period: 1 @@ -279,7 +287,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: .xe541d298736af873037ee6e44b +radio.1/wlan.1/add-wlan/wep-key: .x65b5f32dd6ccbf71ed95894438 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 @@ -296,39 +304,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: .xe541d298736af873037ee6e44b +radio.1/wlan.13/add-wlan/wep-key: .x65b5f32dd6ccbf71ed95894438 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.2/cisco/lwelem33: .x00 -radio.255/admin-state: 1 - enabled -radio.255/operational-state/cause: Normal -radio.255/operational-state/state: enabled -session-id: .x5a230869 -statistics-timer: 180 -wtp-board-data/board-id: .x0000 -wtp-board-data/mac-address: .x0800276edf58 -wtp-board-data/model-no: "AIR-LAP1142N-E-K9 " -wtp-board-data/revision: A0 -wtp-board-data/serial-no: FCZ1406W232 -wtp-board-data/vendor: 4232704 -wtp-descriptor/bootloader/vendor: 4232704 -wtp-descriptor/bootloader/version: .x0c041200 -wtp-descriptor/hardware/vendor: 4232704 -wtp-descriptor/hardware/version: .x01000000 -wtp-descriptor/max-radios: 2 -wtp-descriptor/radios-in-use: 2 -wtp-descriptor/software/vendor: 4232704 -wtp-descriptor/software/version: .x07007400 -wtp-fallback: 1 -wtp-frame-tunnel-mode: 4 -wtp-mac-type: 1 - Split MAC -wtp-name: Soft-WTP -wtp-reboot-statistics/ac-initiated-count: 1 -wtp-reboot-statistics/hw-failure-count: 0 -wtp-reboot-statistics/last-failure-type: 1 -wtp-reboot-statistics/link-failure-count: 0 -wtp-reboot-statistics/other-failure-count: 15 -wtp-reboot-statistics/reboot-count: 0 -wtp-reboot-statistics/sw-failure-count: 0 -wtp-reboot-statistics/unknown-failure-count: 0 +radio.255/capwap/admin-state: 1 - enabled +radio.255/capwap/operational-state/cause: Normal +radio.255/capwap/operational-state/state: enabled +radio.255/cisco/radio-module-info/descr: Cisco Aironet 1140 Series (IEEE 802.11n) Access Point +radio.255/cisco/radio-module-info/name: AIR-LAP1142N-E-K9 A0 +radio.255/cisco/radio-module-info/serial: FCZ1406W232 +radio.255/cisco/radio-module-info/type: AP1140 diff --git a/src/wtp/configure.c b/src/wtp/configure.c index 8445315f..9d02b009 100644 --- a/src/wtp/configure.c +++ b/src/wtp/configure.c @@ -32,6 +32,9 @@ int configure(struct cw_Conn * conn) int rc; cw_cfg_copy(conn->global_cfg,conn->update_cfg,0,""); + +cw_cfg_dump(conn->update_cfg); + rc = cw_send_request(conn, CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST); cw_cfg_clear(conn->update_cfg); diff --git a/src/wtp/discovery.c b/src/wtp/discovery.c index 65ea2c55..bd0ca569 100644 --- a/src/wtp/discovery.c +++ b/src/wtp/discovery.c @@ -45,9 +45,9 @@ static struct cw_DiscoveryResults * run_discovery(struct cw_Conn *conn) results = cw_discovery_results_create(); - min = cw_cfg_get_byte(conn->global_cfg,"capwap-timers/min-discovery-interval", + min = cw_cfg_get_byte(conn->global_cfg,"capwap/timers/min-discovery-interval", CAPWAP_MIN_DISCOVERY_INTERVAL); - max = cw_cfg_get_byte(conn->global_cfg,"capwap-timers/max-discovery-interval", + max = cw_cfg_get_byte(conn->global_cfg,"capwap/timers/max-discovery-interval", CAPWAP_MAX_DISCOVERY_INTERVAL); delay = cw_randint(min,max); diff --git a/src/wtp/join.c b/src/wtp/join.c index 1e1094f4..b7d6596d 100644 --- a/src/wtp/join.c +++ b/src/wtp/join.c @@ -110,8 +110,8 @@ static int run_join_d(struct cw_Conn * conn, struct sockaddr *sa,cw_Cfg_t * cfg) int rc; /* Check if we support the same auth methods as the AC */ - lsec = cw_cfg_get_byte(conn->global_cfg,"ac-descriptor/security",255); - rsec = cw_cfg_get_byte(cfg,"ac-descriptor/security",0); + lsec = cw_cfg_get_byte(conn->global_cfg,"capwap/ac-descriptor/security",255); + rsec = cw_cfg_get_byte(cfg,"capwap/ac-descriptor/security",0); if ((lsec & rsec) == 0){ cw_log(LOG_ERR, "Can't establish DTLS with AC, my sec: %d, remote sec %d",lsec,rsec); return 0; diff --git a/src/wtp/wtp_main.c b/src/wtp/wtp_main.c index a73568b8..30c8a83b 100644 --- a/src/wtp/wtp_main.c +++ b/src/wtp/wtp_main.c @@ -144,9 +144,10 @@ int main (int argc, char **argv) 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->cfg_list[0]=conn->update_cfg; + conn->cfg_list[1]=conn->local_cfg; + conn->cfg_list[2]=conn->global_cfg; + conn->cfg_list[3]=NULL; conn->role = CW_ROLE_WTP; conn->wbid=1;