Compare commits

..

No commits in common. "4995cac9b864178c9092a3ce36f61f6e9aa0d778" and "4a565efff12b12677a3657a82d3bedb8971b1647" have entirely different histories.

11 changed files with 496 additions and 182 deletions

View File

@ -35,6 +35,7 @@ CWSRC=\
cw_put_elem_radio_operational_state.c\
cw_put_image_data.c\
cw_put_local_ip_address.c\
cw_radio_set_admin_state.c\
cw_rand.c\
cw_randint.c\
cw_read_ac_descriptor.c\
@ -63,6 +64,7 @@ CWSRC=\
cw_write_radio_element.c\
cw_detect_nat.c\
cw_read_from.c \
cw_in_generic_struct.c\
# cw_in_check_disc_req.c\
# cw_in_check_img_data_req_ac.c\
@ -75,13 +77,46 @@ CWSRC=\
# cw_process_element.c\
# cw_out_generic_struct.c\
cw_in_radio_generic_struct.c\
cw_in_generic_struct.c\
cw_radio_set_admin_state.c\
KTVSRC=\
cfg.c\
# cw_ktv_add.c\
cw_ktv_idx_get.c\
cw_ktv_mavlcmp.c\
cw_ktv_mavlcmp_type_by_name.c\
cw_ktv_mavldel.c\
# cw_ktv_parser.c\
# cw_ktv_del_sub.c\
# cw_ktv_base_exists.c\
cw_ktv_add_from_str.c\
cw_ktv_read_file.c\
cw_ktv_readline.c\
cw_ktv_save.c\
cw_ktv_std_types.c\
cw_ktv_read_struct.c\
cw_ktv_write_struct.c\
# cw_ktv_get_byte.c\
cw_ktv_get_bool.c\
cw_ktv_get_bstr16.c\
cw_ktv_set_byte.c\
cw_ktv_set_word.c\
cw_ktv_set_dword.c\
# cw_ktv_get_word.c\
cw_ktv_get_dword.c\
cw_ktv_get_sysptr.c\
cw_ktv_get_str.c\
# cw_ktv_cast.c\
cw_ktv_replace.c\
cw_ktv_get.c\
LWSRC=\
lw_addelem.c\
lw_checksum.c\

View File

@ -80,13 +80,7 @@ static void del(void *ptr)
free((void *) e->val);
}
/**
* Create an empty cfg
* @return A pointer to the cfg or NULL if an error has accoured.
*
* In case of an error consult errno to find out the reason.
* The created config must be freed by #cw_cfg_destroy.
*/
cw_Cfg_t *cw_cfg_create()
{
cw_Cfg_t * cfg;
@ -94,7 +88,6 @@ cw_Cfg_t *cw_cfg_create()
if (cfg == NULL)
return NULL;
memset(cfg,0,sizeof(cw_Cfg_t));
cfg->name = CW_CFG_DEFAULT_NAME;
cfg->cfg = mavl_create(cmp, del, sizeof(struct cw_Cfg_entry));
if (cfg->cfg==NULL){
cw_cfg_destroy(cfg);
@ -689,6 +682,7 @@ void cw_cfg_set_int(cw_Cfg_t * cfg, const char * key, int val)
}
int cw_cfg_get_next_index(cw_Cfg_t * cfg, const char *key)
{
char ikey[CW_CFG_MAX_KEY_LEN];

View File

@ -5,53 +5,28 @@
#include "val.h"
#include "bstr.h"
#define CW_CFG_MAX_KEY_LEN 1024
/**
*@file
*@brief
*@defgroup CFG SOCK
*@{
*/
/** Maximum size of a key used in cfg objects */
#define CW_CFG_MAX_KEY_LEN 1024
/** Default name for fresh cfg's created by #cw_cfg_create */
#define CW_CFG_DEFAULT_NAME "[anonymous]"
/**
* A Cfg object
*/
struct cw_Cfg {
struct mavl * cfg; /**< The AVL-tree containig the keys
and vals */
const char *name; /**< A name for this config object */
struct mavl * cfg;
const char *name;
int dbg_level;
const char *dbg_prefix;
};
typedef struct cw_Cfg cw_Cfg_t;
/**
* An antry for a Cfg object
*/
struct cw_Cfg_entry{
const char *key; /**< A string representing the key
of this entry */
const char *val; /**< The value, represented by a string */
};
cw_Cfg_t * cw_cfg_create();
int cw_cfg_set(cw_Cfg_t *cfg,const char *key, const char *val);
void cw_cfg_dump(cw_Cfg_t *cfg);
int cw_cfg_read_from_file(FILE * file, cw_Cfg_t * cfg);
int cw_cfg_load(const char *filename,cw_Cfg_t * cfg);
struct cw_Cfg_entry{
const char *key;
const char *val;
};
struct cw_Cfg_iter{
struct mavliter it;
@ -99,6 +74,3 @@ int cw_cfg_set_val(cw_Cfg_t * cfg, const char *key, const struct cw_Type *t, con
#endif
/**@}*/

51
src/cw/radioinfo.h Normal file
View File

@ -0,0 +1,51 @@
/*
This file is part of libcapwap.
libcapwap is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
libcapwap is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Foobar. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __RADIOINFO_H
#define __RADIOINFO_H
#include "bstr.h"
struct radioinfo{
char set;
int rid;
uint32_t type;
int admin_state;
int state;
int cause;
bstr_t rmac;
uint16_t regDomain;
uint8_t country_str[4];
uint8_t country_str2[4];
int cfp_period;
int cfp_max_duration;
int beacon_period;
int dtim_period;
int max_bssid;
int occupancy_limit;
bstr_t bssid;
};
#endif

View File

@ -1993,13 +1993,12 @@ static struct cw_ElemHandler handlers70[] = {
CISCO_LWELEM_ADD_WLAN, /* Element ID */
CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */
7,1117, /* min/max length */
CW_TYPE_STRUCT, /* type */
cisco_add_lwwlan, /* type */
"radio/wlan/add-lw-wlan", /* Key */
cw_in_generic, /* get */
cw_in_generic_struct, /* get */
cw_out_traverse, /* put */
cisoc_add_lwwlan_mkkey,
cisco_patch_add_lwwlan,
cisco_add_lwwlan,
cisco_patch_add_lwwlan
}
,

View File

@ -1,51 +1,44 @@
#
# 1142 startup
# Join Request
#
capwap/location-data: default location
capwap/maximum-message-length: 14000
capwap/session-id: .x45e59826
capwap/wtp-board-data/board-id: .x0000
capwap/wtp-board-data/mac-address: .xc47d4f3af8a6
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-frame-tunnel-mode: 4
capwap/wtp-mac-type: 1 - Split MAC
capwap/wtp-name: APc47d.4f3a.f8a6
capwap-local-ip-address: 192.168.0.13
cisco/ap-group-name: default-group
cisco/lw-path-mtu/len: 1095
cisco/lw-path-mtu/max: 1485
cisco/mwar-addr/address: 192.168.0.161
cisco/mwar-addr/address: 192.168.0.14
cisco/mwar-addr/mwar-type: 0
cisco/mwar-addr/unknown: 0
cisco/wtp-board-data/options/ant-type: 1
cisco/wtp-board-data/options/ap-type: 0
cisco/wtp-board-data/options/failover-priority: 1
cisco/wtp-board-data/options/flex-connect: 0
radio.0/capwap80211/wtp-radio-information: 1
radio.1/capwap80211/wtp-radio-information: 2
location-data: default location
maximum-message-length: 14000
radio.0/wtp-radio-information: 1
radio.1/wtp-radio-information: 2
session-id: .x4a230869
wtp-board-data/board-id: .x0000
wtp-board-data/mac-address: .xc47d4f3af8a6
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-frame-tunnel-mode: 4
wtp-mac-type: 1 - Split MAC
wtp-name: APc47d.4f3a.f8a6
#
# Configuration Status Request
#
capwap/ac-name:
capwap/statistics-timer: 180
capwap/wtp-reboot-statistics/ac-initiated-count: 1
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: 17
capwap/wtp-reboot-statistics/reboot-count: 0
capwap/wtp-reboot-statistics/sw-failure-count: 0
capwap/wtp-reboot-statistics/unknown-failure-count: 0
cisco/ap-backup-software-version: .x00000000
cisco/ap-dtls-data-cfg/cabable: true
cisco/ap-dtls-data-cfg/enabled: false
@ -77,11 +70,11 @@ 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: 291
cisco/ap-uptime/current-uptime: 84
cisco/ap-uptime/last-uptime: 1
cisco/ap-username-and-password/login-credentials/enable-password: $1$AmeO$sVDsj.7u2p72.6OD7ZxEo.
cisco/ap-username-and-password/login-credentials/enable-password: $1$.q2F$Fkcs06gZJpIE3LnX8oxmN.
cisco/ap-username-and-password/login-credentials/option: 1
cisco/ap-username-and-password/login-credentials/password: $1$5oz2$kFPn2Dsy576Q50Z3XwVVx.
cisco/ap-username-and-password/login-credentials/password: $1$ZFkU$zIX6UG1NozXk2.V1lZNIV.
cisco/ap-username-and-password/login-credentials/username: Cisco
cisco/cisco-discovery-protocol/data: 513
cisco/cisco-discovery-protocol/enabled: false
@ -104,9 +97,7 @@ 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
radio.0/capwap/admin-state: 1 - enabled
radio.0/capwap80211/tx-power/@cisco/cfg-type: 1 - global
radio.0/capwap80211/tx-power/current-tx-power: 0
radio.0/admin-state: 1 - enabled
radio.0/cisco/antenna-payload/802-11n-rx-antennas: 0
radio.0/cisco/antenna-payload/802-11n-tx-antennas: 0
radio.0/cisco/antenna-payload/antenna-1: 1
@ -115,9 +106,14 @@ 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: 0
radio.0/cisco/ap-mfp-cap-subtype: 515
radio.0/cisco/channel-power: .x08080d0108221c16100a04fefe0208221c16100a04fefe0308221c16100a04fefe0408221c16100a04fefe0508221c16100a04fefe0608221c16100a04fefe0708221c16100a04fefe0808221c16100a04fefe0908221c16100a04fefe0a08221c16100a04fefe0b08221c16100a04fefe0c08221c16100a04fefe0d08221c16100a04fefe
radio.0/cisco/elem16: .x02040b0c
radio.0/cisco/elem47: .x0100000000000000000000000000000000
radio.0/cisco/elem48: .x00
radio.0/cisco/lwelem11: .x00000203
radio.0/cisco/lwelem27: .x00000000000000000000000000000000000000000000000000
radio.0/cisco/lwelem28: .x0303020202000000000000000000000000000000000000000000313f01
radio.0/cisco/lwelem29: .x00010000000000000200001400
radio.0/cisco/mac-operation/fragmentation-threshold: 0
radio.0/cisco/mac-operation/long-retry: 0
radio.0/cisco/mac-operation/reserved: 1
@ -129,27 +125,9 @@ radio.0/cisco/multi-domain-capability/first-channel: 1
radio.0/cisco/multi-domain-capability/max-tx-power-level: 65535
radio.0/cisco/multi-domain-capability/number-of-channels: 13
radio.0/cisco/multi-domain-capability/reserved: 1
radio.0/cisco/phy-ht-cap/extendend-ht-cap-info: 0
radio.0/cisco/phy-ht-cap/ht-cap-info: 0
radio.0/cisco/phy-ht-cap/rest: .x000000000000000000000000000000000000000000
radio.0/cisco/phy-ht-control/cfg-type: 1 - global
radio.0/cisco/phy-ht-control/current-freq: 0
radio.0/cisco/phy-ht-control/enable-ht: 0
radio.0/cisco/phy-ht-control/rest: .x00000000000200001400
radio.0/cisco/proformance-profile/bytes-per-sec: 0
radio.0/cisco/proformance-profile/cfg-type: 1 - global
radio.0/cisco/proformance-profile/excpection-level: 0
radio.0/cisco/proformance-profile/foreigh-threshold: 0
radio.0/cisco/proformance-profile/min-num-clients: 0
radio.0/cisco/proformance-profile/min-perf-snr: 0
radio.0/cisco/proformance-profile/num-clients-threshold: 0
radio.0/cisco/proformance-profile/rf-busy-threshold: 0
radio.0/cisco/proformance-profile/rssi-threshold: 0
radio.0/cisco/spam-cfp-status: false
radio.0/cisco/station-cfg/cfg-type: 3
radio.0/cisco/station-cfg/current-freq: 3
radio.0/cisco/station-cfg/rest: .x020202000000000000000000000000000000000000000000313f01
radio.0/cisco/tx-power-levels: .x070011000e000b000800050002ffff0000
radio.0/cisco/tx-power/cfg-type: 1 - global
radio.0/cisco/tx-power/current-tx-power: 0
radio.0/cisco/wtp-radio-config/beacon-period: 0
radio.0/cisco/wtp-radio-config/bss-id: .x04fe7f499b90
radio.0/cisco/wtp-radio-config/cfg-period: 0
@ -159,9 +137,7 @@ radio.0/cisco/wtp-radio-config/country-str1:
radio.0/cisco/wtp-radio-config/country-str2:
radio.0/cisco/wtp-radio-config/occupancy-limit: 0
radio.0/cisco/wtp-radio-config/reg: 256
radio.1/capwap/admin-state: 1 - enabled
radio.1/capwap80211/tx-power/@cisco/cfg-type: 1 - global
radio.1/capwap80211/tx-power/current-tx-power: 0
radio.1/admin-state: 1 - enabled
radio.1/cisco/antenna-payload/802-11n-rx-antennas: 0
radio.1/cisco/antenna-payload/802-11n-tx-antennas: 0
radio.1/cisco/antenna-payload/antenna-1: 1
@ -170,9 +146,14 @@ radio.1/cisco/antenna-payload/antenna-mode: 3
radio.1/cisco/antenna-payload/diversity-selection: 255
radio.1/cisco/antenna-payload/number-of-antennas: 2
radio.1/cisco/antenna-payload/unknown: 0
radio.1/cisco/ap-mfp-cap-subtype: 66051
radio.1/cisco/channel-power: .x0808102408221c16100a04fefe2808221c16100a04fefe2c08221c16100a04fefe3008221c16100a04fefe3408221c16100a04fefe3808221c16100a04fefe3c08221c16100a04fefe4008221c16100a04fefe6408221c16100a04fefe6808221c16100a04fefe6c08221c16100a04fefe7008221c16100a04fefe7408221c16100a04fefe8408221c16100a04fefe8808221c16100a04fefe8c08221c16100a04fefe
radio.1/cisco/elem16: .x0c121824
radio.1/cisco/elem47: .x0100000000000000000000000000000000
radio.1/cisco/elem48: .x00
radio.1/cisco/lwelem11: .x00010203
radio.1/cisco/lwelem27: .x00000000000000000000000000000000000000000000000000
radio.1/cisco/lwelem28: .x0303020202000000000000000000000000000000000000000000313f01
radio.1/cisco/lwelem29: .x00010003000000000200001400
radio.1/cisco/mac-operation/fragmentation-threshold: 0
radio.1/cisco/mac-operation/long-retry: 0
radio.1/cisco/mac-operation/reserved: 1
@ -184,27 +165,9 @@ radio.1/cisco/multi-domain-capability/first-channel: 36
radio.1/cisco/multi-domain-capability/max-tx-power-level: 65535
radio.1/cisco/multi-domain-capability/number-of-channels: 16
radio.1/cisco/multi-domain-capability/reserved: 1
radio.1/cisco/phy-ht-cap/extendend-ht-cap-info: 0
radio.1/cisco/phy-ht-cap/ht-cap-info: 0
radio.1/cisco/phy-ht-cap/rest: .x000000000000000000000000000000000000000000
radio.1/cisco/phy-ht-control/cfg-type: 1 - global
radio.1/cisco/phy-ht-control/current-freq: 0
radio.1/cisco/phy-ht-control/enable-ht: 0
radio.1/cisco/phy-ht-control/rest: .x03000000000200001400
radio.1/cisco/proformance-profile/bytes-per-sec: 0
radio.1/cisco/proformance-profile/cfg-type: 1 - global
radio.1/cisco/proformance-profile/excpection-level: 0
radio.1/cisco/proformance-profile/foreigh-threshold: 0
radio.1/cisco/proformance-profile/min-num-clients: 0
radio.1/cisco/proformance-profile/min-perf-snr: 0
radio.1/cisco/proformance-profile/num-clients-threshold: 0
radio.1/cisco/proformance-profile/rf-busy-threshold: 0
radio.1/cisco/proformance-profile/rssi-threshold: 0
radio.1/cisco/spam-cfp-status: false
radio.1/cisco/station-cfg/cfg-type: 3
radio.1/cisco/station-cfg/current-freq: 3
radio.1/cisco/station-cfg/rest: .x020202000000000000000000000000000000000000000000313f01
radio.1/cisco/tx-power-levels: .x070011000e000b000800050002ffff0000
radio.1/cisco/tx-power/cfg-type: 1 - global
radio.1/cisco/tx-power/current-tx-power: 0
radio.1/cisco/wtp-radio-config/beacon-period: 0
radio.1/cisco/wtp-radio-config/bss-id: .x04fe7f499b90
radio.1/cisco/wtp-radio-config/cfg-period: 0
@ -214,22 +177,25 @@ radio.1/cisco/wtp-radio-config/country-str1:
radio.1/cisco/wtp-radio-config/country-str2:
radio.1/cisco/wtp-radio-config/occupancy-limit: 0
radio.1/cisco/wtp-radio-config/reg: 256
radio.255/capwap/admin-state: 1 - enabled
radio.255/admin-state: 1 - enabled
statistics-timer: 180
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
#
# Local
#
wtp-name: Soft-WTP
cisco/ssl-certfile: ../../ssl/certs/wtpc.crt
cisco/ssl-cipher: SHA1
cisco/ssl-keyfile: ../../ssl/certs/wtpc.key
cisco/wtp-use-ac-version: true
capwap/wtp-board-data/mac-address: .x0800276edf58
capwap/local-ip-address: 192.168.0.14
wtp-board-data/mac-address: .x0800276edf58

320
src/wtp/cisco.ckv Normal file
View File

@ -0,0 +1,320 @@
#
# This file is igenerated by WAT
# If you edit this, your cahnges might be overwritten
#
capwap/ac-name:
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-dtls-data-cfg/cabable: true
cisco/ap-dtls-data-cfg/enabled: false
cisco/ap-ethernet-port-type: .x000000
cisco/ap-group-name: default-group
cisco/ap-led-state-config/led-state: 1
cisco/ap-log-facility: 0
cisco/ap-min-ios-version: .x08036f00
cisco/ap-mode-and-type/mode: 0
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: 17
cisco/ap-power-injector-config/switch-mac-address: .x000000000000
cisco/ap-pre-std-switch-config: 0
cisco/ap-regulatory-domain.0/code0: 0
cisco/ap-regulatory-domain.0/code1: 1
cisco/ap-regulatory-domain.0/set: true
cisco/ap-regulatory-domain.0/slot: 0
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-ip-addr/address: 192.168.0.13
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: 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/
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: actube_X
cisco/loghost-config/loghost: 255.255.255.255
cisco/lw-path-mtu/len: 1095
cisco/lw-path-mtu/max: 1485
cisco/lwelem105: .x000b
cisco/lwelem14: .x000000000000000000000000000000000000
cisco/mcast-mgid-info: .x0000000d0000000000000000000000000000000101000000
cisco/mwar-addr/address: 192.168.0.24
cisco/mwar-addr/mwar-type: 0
cisco/mwar-addr/unknown: 0
cisco/reset-button-state: true
cisco/rouge-and-mss/enable: false
cisco/rouge-and-mss/tcp-adjust-mss: 0
cisco/rouge-detection/rest: .x0000000a
cisco/rouge-detection/rouge-detection: true
cisco/sig-toggle: true
cisco/spam-domain-secret: .xe1ffd18a8f15b3b59c0a47a7f17a96e7cb36174f00
cisco/ssl-certfile: ../../ssl/certs/wtpc.crt
cisco/ssl-cipher: SHA1
cisco/ssl-keyfile: ../../ssl/certs/wtpc.key
cisco/wtp-board-data/card-id: 0
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: 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
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: 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
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: 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
radio.0/cisco/direct-sequence-control/current-channel: 1
radio.0/cisco/direct-sequence-control/energy-detect-threshold: -50
radio.0/cisco/direct-sequence-control/unknown: 1
radio.0/cisco/elem145: .x01
radio.0/cisco/elem146: .x690f
radio.0/cisco/elem153: .x00
radio.0/cisco/elem156: .x020100
radio.0/cisco/elem16: .x02040b0c
radio.0/cisco/elem19: .xc0a800a10001000cc0a800a103000101001ecd774fc43bd27db633509934957d3acb000000000000000052464d000000000000000000000000000000000000000000000000000000000001060b010101
radio.0/cisco/elem22: .x0d00b400320102030405060708090a0b0c0d
radio.0/cisco/elem24: .x003c000c
radio.0/cisco/elem47: .x0100000000000000000000000000000000
radio.0/cisco/elem48: .x00
radio.0/cisco/elem81: .x00000000010101010a001e0a02051cbfffbfff0a00
radio.0/cisco/lwelem11: .x00000203
radio.0/cisco/lwelem27: .x182c0000000000000000000000000000ffff00000000000000
radio.0/cisco/lwelem28: .x0303020202000000000000000000000000000000000000000000313f01
radio.0/cisco/lwelem29: .x00010100000000000200001400
radio.0/cisco/lwelem48: .x01055a0101a6c405b06432b03232
radio.0/cisco/lwelem9: .x0100000000000000000000000000000000
radio.0/cisco/mac-operation/fragmentation-threshold: 2346
radio.0/cisco/mac-operation/long-retry: 4
radio.0/cisco/mac-operation/reserved: 1
radio.0/cisco/mac-operation/rts-threshold: 2347
radio.0/cisco/mac-operation/rx-msdu-lifetime: 512
radio.0/cisco/mac-operation/short-retry: 7
radio.0/cisco/mac-operation/tx-msdu-lifetime: 512
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/wtp-radio-config/beacon-period: 100
radio.0/cisco/wtp-radio-config/bss-id: .x04fe7f499b90
radio.0/cisco/wtp-radio-config/cfg-period: 4
radio.0/cisco/wtp-radio-config/cfg-type: 1
radio.0/cisco/wtp-radio-config/cfp-maximum-duration: 60
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/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
radio.0/wlan.1/add-wlan/encryption-policy: 4
radio.0/wlan.1/add-wlan/hreap-local-switch: 0
radio.0/wlan.1/add-wlan/profile-name: tubeC
radio.0/wlan.1/add-wlan/qos: 0
radio.0/wlan.1/add-wlan/radio-id: 0
radio.0/wlan.1/add-wlan/scan-defer-period: 28784
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: .x1978b2c072f90ff26e4e24c806
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
radio.0/wlan.13/add-wlan/aironet-ie: true
radio.0/wlan.13/add-wlan/broadcast-ssid: true
radio.0/wlan.13/add-wlan/dtim-period: 19
radio.0/wlan.13/add-wlan/encryption-policy: 1
radio.0/wlan.13/add-wlan/hreap-local-switch: 16
radio.0/wlan.13/add-wlan/profile-name: SuerWLAN
radio.0/wlan.13/add-wlan/qos: 0
radio.0/wlan.13/add-wlan/radio-id: 0
radio.0/wlan.13/add-wlan/scan-defer-period: 15420
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: .x1978b2c072f90ff26e4e24c806
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/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: 1 - global
radio.1/capwap80211/tx-power/current-tx-power: 6
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: 1
radio.1/cisco/antenna-payload/antenna-mode: 3
radio.1/cisco/antenna-payload/diversity-selection: 255
radio.1/cisco/antenna-payload/number-of-antennas: 2
radio.1/cisco/antenna-payload/unknown: 0
radio.1/cisco/channel-power: .x0808102408221c16100a04fefe2808221c16100a04fefe2c08221c16100a04fefe3008221c16100a04fefe3408221c16100a04fefe3808221c16100a04fefe3c08221c16100a04fefe4008221c16100a04fefe6408221c16100a04fefe6808221c16100a04fefe6c08221c16100a04fefe7008221c16100a04fefe7408221c16100a04fefe8408221c16100a04fefe8808221c16100a04fefe8c08221c16100a04fefe
radio.1/cisco/elem145: .x01
radio.1/cisco/elem15/cfg-type: 1 - global
radio.1/cisco/elem15/channel: 56
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: .xc0a800a10001000bc0a800a110000101001ecd774fc43bd27db633509934957d3acb000000000000000052464d000000000000000000000000000000000000000000000000000000000024282c3034383c4064686c707484888c01010101010101010101010101010101
radio.1/cisco/elem22: .x1000b4003224282c3034383c4064686c707484888c
radio.1/cisco/elem24: .x003c000c
radio.1/cisco/elem47: .x0100000000000000000000000000000000
radio.1/cisco/elem48: .x00
radio.1/cisco/elem81: .x00000000010101010a001e0a02050fbfffbfff0a00
radio.1/cisco/lwelem11: .x00010203
radio.1/cisco/lwelem27: .x186e0000000000000000000000000000ffff00000000000000
radio.1/cisco/lwelem28: .x0303020202000000000000000000000000000000000000000000313f01
radio.1/cisco/lwelem29: .x00018803000000000200002803
radio.1/cisco/lwelem33: .x00
radio.1/cisco/lwelem48: .x01055a0101a6c405b06432b03232
radio.1/cisco/lwelem9: .x0100000000000000000000000000000000
radio.1/cisco/mac-operation/fragmentation-threshold: 2346
radio.1/cisco/mac-operation/long-retry: 4
radio.1/cisco/mac-operation/reserved: 1
radio.1/cisco/mac-operation/rts-threshold: 2347
radio.1/cisco/mac-operation/rx-msdu-lifetime: 512
radio.1/cisco/mac-operation/short-retry: 7
radio.1/cisco/mac-operation/tx-msdu-lifetime: 512
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/wtp-radio-config/beacon-period: 100
radio.1/cisco/wtp-radio-config/bss-id: .x04fe7f499b90
radio.1/cisco/wtp-radio-config/cfg-period: 4
radio.1/cisco/wtp-radio-config/cfg-type: 1
radio.1/cisco/wtp-radio-config/cfp-maximum-duration: 60
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/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
radio.1/wlan.1/add-wlan/encryption-policy: 4
radio.1/wlan.1/add-wlan/hreap-local-switch: 0
radio.1/wlan.1/add-wlan/profile-name: tubeC
radio.1/wlan.1/add-wlan/qos: 0
radio.1/wlan.1/add-wlan/radio-id: 1
radio.1/wlan.1/add-wlan/scan-defer-period: 28784
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: .x166ad266a0adea9f140cadf37f
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
radio.1/wlan.13/add-wlan/aironet-ie: true
radio.1/wlan.13/add-wlan/broadcast-ssid: true
radio.1/wlan.13/add-wlan/dtim-period: 19
radio.1/wlan.13/add-wlan/encryption-policy: 1
radio.1/wlan.13/add-wlan/hreap-local-switch: 16
radio.1/wlan.13/add-wlan/profile-name: SuerWLAN
radio.1/wlan.13/add-wlan/qos: 0
radio.1/wlan.13/add-wlan/radio-id: 1
radio.1/wlan.13/add-wlan/scan-defer-period: 15420
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: .x166ad266a0adea9f140cadf37f
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/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
wfat-rem/bind-addr: 0.0.0.0
wfat-rem/discovery-addr: 255.255.255.255

View File

@ -14,7 +14,7 @@ static int config_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr,
{
cw_dbg(DBG_X,"*** Configurations Status Response received ****");
cw_cfg_copy(params->cfg, params->conn->global_cfg,DBG_CFG_UPDATES,"GlbalCfg");
cw_cfg_save(bootcfg.config_file, params->conn->global_cfg,
cw_cfg_save(bootcfg.cfgfilename, params->conn->global_cfg,
"#\n# This file is igenerated by WAT\n# If you edit this, your cahnges might be overwritten\n#\n");
cw_dbg(DBG_X,"*** Cnofig Saved ***");

View File

@ -6,6 +6,7 @@
#include "cw/cw.h"
#include "cw/capwap.h"
#include "cw/conn.h"
#include "cw/radioinfo.h"
#include "cw/log.h"
#include "cw/dtls.h"
#include "cw/sock.h"
@ -35,7 +36,7 @@ static int update_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr,
// cw_dbg(DBG_X," **** Configuration Update Request Received ***");
// cw_cfg_dump(params->conn->global_cfg);
cw_cfg_copy(params->cfg, params->conn->global_cfg,DBG_CFG_UPDATES,"GlobalCfg");
cw_cfg_save(bootcfg.config_file, params->conn->global_cfg,
cw_cfg_save(bootcfg.cfgfilename, params->conn->global_cfg,
"#\n# This file is igenerated by WAT\n# If you edit this, your cahnges might be overwritten\n#\n");
// cw_dbg(DBG_X," **** Configuration Update Request Received Saved ***");
return 0;

View File

@ -27,8 +27,7 @@ struct bootcfg{
const char * modnames[MAX_MODS];
int nmods;
const char * modpath;
const char * config_file;
const char * startup_file;
const char * cfgfilename;
};
extern struct bootcfg bootcfg;

View File

@ -32,10 +32,9 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
int c;
opterr = 1;
bootcfg->config_file = "config.ckv";
bootcfg->startup_file = "startup.ckv";
bootcfg->cfgfilename = "config.ckv";
while ( (c = getopt (argc, argv, "s:p:d:vc:m:h")) != -1) {
while ( (c = getopt (argc, argv, "p:d:vc:m:h")) != -1) {
switch (c) {
case 'v':
@ -60,10 +59,7 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
cw_mod_set_path(optarg);
break;
case 'c':
bootcfg->config_file = optarg;
break;
case 's':
bootcfg->startup_file = optarg;
bootcfg->cfgfilename = optarg;
break;
case '?':
exit(EXIT_FAILURE);
@ -90,7 +86,7 @@ int main (int argc, char **argv)
struct cw_Conn * conn=NULL;
//FILE * file;
cw_Cfg_t * global_cfg =NULL;
cw_Cfg_t * cfg=NULL;
//const cw_Type_t ** ti;
int i;
int rc=EXIT_FAILURE;
struct cw_DiscoveryResults * results;
@ -124,31 +120,14 @@ int main (int argc, char **argv)
cw_log(LOG_ERR, "Error creating global_cfg: %s", strerror(errno));
goto errX;
}
global_cfg->name = "Global CFG";
/* read the startup config file */
rc = cw_cfg_load(bootcfg.startup_file,global_cfg);
/* read the initial config file */
rc = cw_cfg_load(bootcfg.cfgfilename,global_cfg);
if (rc){
cw_log(LOG_ERR,"Can't open file '%s':%s",bootcfg.startup_file, strerror(errno));
cw_log(LOG_ERR,"Can't open file '%s':%s",bootcfg.cfgfilename, strerror(errno));
goto errX;
}
/* Create a temp. cfg */
cfg = cw_cfg_create();
if (cfg==NULL)
goto errX;
/* read the current config file into temp. cfg */
rc = cw_cfg_load(bootcfg.config_file,cfg);
if (rc){
cw_cfg_destroy(cfg);
cw_log(LOG_ERR,"Can't open file '%s':%s",bootcfg.config_file, strerror(errno));
goto errX;
}
/* copy the temp. cfg into startup cfg - and show debug messages */
cw_cfg_copy(cfg, global_cfg,DBG_CFG_UPDATES,"Startup CFG");
/* create a connection object */
conn = conn_create_noq(-1, NULL);
@ -158,8 +137,6 @@ int main (int argc, char **argv)
goto errX;
}
cw_cfg_destroy(cfg);
/* conn->mod=mod;*/
conn->detected = 1;