Fixed some bugs, added more Cisco elements

Almost able to create a WLAN

src/ac/Makefile

@@ -31,6 +31,10 @@ INCL_DIRS=-I../ -I/usr/local/include -I./ -I../../include
 #FLAGS=-DWITH_IPV6 -DWITH_OPENSSL -DSYS_ARCH="$(ARCH)" -DSYS_ARCH="XXX"
 FLAGS=-DWITH_IPV6 -DUSE_OPENSSL -DSYS_ARCH='"$(KERNEL)/$(ARCH)"'
 
+all: act actube
+
+act: act.c
+	$(CC) act.c $(INCL_DIRS) $(LIBPATH) -DSYS_ARCH='"$(KERNEL)/$(ARCH)"' -o act -l:libcw.a -lasan -lcrypto -ledit
 
 	
 
@@ -43,8 +47,9 @@ all: $(PRG) $(ACTPRG)
 $(PRG): $(OBJS) 
 	$(CC) $(OBJS) -o $(PRG) $(LIBPATH) $(LDFLAGS) $(LIBS) 
 
-$(ACTPRG): $(ACTOBJS)
+#$(ACTPRG): $(ACTOBJS)
-	$(CC) $(ACTOBJS) -o $(ACTPRG) $(LIBPATH) $(LDFLAGS) $(LIBS) -ledit 
+#	$(CC) $(ACTOBJS) -o $(ACTPRG) $(LIBPATH) $(LIBS) -ledit  
+	#$(CC) $(ACTOBJS) $(ACTPRG) $(LIBPATH) $(LDFLAGS) $(LIBS) -ledit  
 
 
 

src/ac/config.ckv

@@ -17,10 +17,14 @@ capwap/ssl-certfile: "../../ssl/intermediate-ca/int-ca.crt"
 
 cisco/ssl-keyfile:  "../../ssl/intermediate-ca/int-ca.key"
 cisco/ssl-certfile: "../../ssl/intermediate-ca/int-ca.crt"
-cisco/ssl-cipher: DEFAULT
+#cisco/ssl-cipher: DEFAULT
+cisco/ssl-cipher: RSA
 cisco/ssl-dhbits: 2048
 
 
+
+
+
 # 
 # Whether or not to use IPv4/IPv6 
 #
@@ -43,6 +47,7 @@ actube/mod.2: capwap80211
 #actube/rpc/listen: unix:/tmp/actube
 actube/rpc/listen: tcp:127.0.0.1:5000
 actube/rpc/enable: true
+actube/rpc/macros-dir: ./rpc-macros
 
 
 capwap/ac-descriptor/dtls-policy:  1
@@ -59,17 +64,29 @@ capwap/ac-descriptor/station-limit: 1000
 capwap/ac-descriptor/stations: 0
 
 
-capwap/control-ip-address/address.0: 192.168.0.24
+capwap/control-ip-address/address.0: 192.168.0.14
 
 
+wlan.0/capwap80211/capability: 0
+wlan.0/capwap80211/key-index: 0
+wlan.0/capwap80211/key-status: 0
+wlan.0/capwap80211/key: 1234
+wlan.0/capwap80211/group-tcs: 123
+wlan.0/capwap80211/qos: 0
+wlan.0/capwap80211/auth-type: 1
+wlan.0/capwap80211/mac-mode: 1
+wlan.0/capwap80211/tunnel-mode: 1
+wlan.0/capwap80211/suppress-ssid: false
+wlan.0/capwap80211/ssid: ssid
+
 
 #
 # CAPWAP Timers
 #
-capwap/timers/change-state-pending-timer: Word: 3
+capwap/timers/change-state-pending-timer: 3
-capwap/timers/data-check-timer: Word: 10
+capwap/timers/data-check-timer: 10
-capwap/timers/echo-interval :Byte: 30
+capwap/timers/echo-interval: 30
-capwap/timers/max-discovery-interval :Byte: 10
+capwap/timers/max-discovery-interval: 10
-
+capwap/decryption-error-report-period: 120
-
+capwap/idle-timeout: 300
 

src/ac/db.c

@@ -1,487 +0,0 @@
-
-#include <sqlite3.h>
-
-
-#include "cw/log.h"
-#include "cw/dbg.h"
-
-#include "cw/conn.h"
-
-
-
-#include "conf.h"
-
-static sqlite3 *handle;
-
-
-static const char * init_tables = "\
-	CREATE TABLE IF NOT EXISTS acs (acid TEXT PRIMARY KEY, acname TEXT, lastseen TIMESTAMP); \
-	CREATE TABLE IF NOT EXISTS radios (\
-		wtpid TEXT,\
-		rid TEXT,\
-		key TEXT,\
-		sub_key,\
-		val TEXT, \
-		upd INTEGER, \
-		PRIMARY KEY (wtpid,rid,key,sub_key)\
-	);\
-	CREATE TABLE IF NOT EXISTS acips (acid TEXT,ip TEXT); \
-	CREATE TABLE IF NOT EXISTS wtps (wtpid TEXT PRIMARY KEY, acid TEXT,lastseen TIMESTAMP); \
-	CREATE TABLE IF NOT EXISTS wtpprops (\
-		wtpid TEXT NOT NULL,\
-		id TEXT NOT NULL,\
-		sub_id TEXT NOT NULL,\
-		val TEXT,\
-		upd INTEGER,\
-		PRIMARY KEY(wtpid,id,sub_id)\
-	);\
-	CREATE TABLE IF NOT EXISTS wlans (wlanid INTEGER PRIMARY KEY);\
-	CREATE TABLE IF NOT EXISTS wlanprops (wlanid INTEGER, id TEXT NOT NULL, val TEXT, PRIMARY KEY(wlanid,id));\
-	";
-	
-
-
-
-int db_init()
-{
-
-	int rc;
-	const char * filename="ac.sqlite3";
-	cw_dbg(DBG_INFO,"Initializing Sqlite3 DB: %s, SQLite3 Version %s",filename,SQLITE_VERSION);
-
-	rc = sqlite3_config(SQLITE_CONFIG_SERIALIZED);
-	if (rc!=SQLITE_OK){
-		cw_log(LOG_ERR,"Error configuring SQLite3: %s",sqlite3_errmsg(handle)); 
-		return 0;
-	} 
-	
-	rc = sqlite3_initialize();
-	if (rc!=SQLITE_OK){
-		cw_log(LOG_ERR,"Error initializing SQLite3 DB : %s",sqlite3_errmsg(handle)); 
-		return 0;
-	} 
-	
-
-	
-	rc = sqlite3_open(filename,&handle);
-	if (rc != SQLITE_OK)
-	{
-		cw_log(LOG_ERR,"Error opening SQLite3 DB %s: %s",filename,sqlite3_errmsg(handle)); 
-		return 0;
-	}
-
-	const char * cmd = init_tables;
-	rc = sqlite3_exec(handle,cmd,0,0,0);
-	if (rc)
-	{
-		const char *em = sqlite3_errmsg(handle);
-		cw_log(LOG_ERR,"Error executing SQL \"%s\"\nSQL Error Message: %s",cmd, em);
-		return 0;
-
-	}
-
-	return 1;
-}
-
-
-static sqlite3_stmt * ping_stmt;
-static sqlite3_stmt * put_wtp_prop_stmt;
-
-
-static sqlite3_stmt * get_tasks_stmt;
-
-static sqlite3_stmt * stmt_get_radio_tasks;
-
-static sqlite3_stmt * stmt_ping_wtp;
-static sqlite3_stmt * stmt_put_radio_prop;
-
-int db_start()
-{
-	cw_dbg(DBG_INFO,"Starting Sqlite3 DB");
-
-	const char *sql="";
-
-	sqlite3_stmt *stmt;
-	int rc = sqlite3_prepare_v2(handle, "INSERT OR REPLACE INTO acs (acid,acname) VALUES (?,?);",-1,&stmt,0);
-	if (rc)
-		goto errX;
-
-	rc = sqlite3_bind_text(stmt,1,conf_acid,-1,SQLITE_STATIC);
-
-	rc = sqlite3_bind_text(stmt,2,conf_acname,-1,SQLITE_STATIC);
-
-	sqlite3_step(stmt);
-
-	rc = sqlite3_prepare_v2(handle, "UPDATE acs SET lastseen=datetime('now') WHERE acid=?;",-1,&ping_stmt,0);
-	rc = sqlite3_bind_text(ping_stmt,1,conf_acid,-1,SQLITE_STATIC);
-
-
-	/* Prepare statement to update a WTP property */
-	sql = "INSERT OR REPLACE INTO wtpprops\
-                (wtpid,id,sub_id,val,upd)\
-                VALUES (?,?,?,?,?)";
-
-	rc = sqlite3_prepare_v2(handle, sql,-1, &put_wtp_prop_stmt,0);
-	if (rc) 
-		goto errX;
-
-
-	sql = "INSERT OR REPLACE INTO radios\
-	       (wtpid,rid,key,sub_key,val,upd)\
-	       VALUES (?,?,?,?,?,0)";
-
-	rc = sqlite3_prepare_v2(handle, sql,-1, &stmt_put_radio_prop,0);
-	if (rc) 
-		goto errX;
-
-
-	/* Prepare WTP ping statement */
-	sql = "INSERT OR REPLACE INTO wtps  (wtpid,acid,lastseen) VALUES(?,?,datetime('now'))";
-	rc = sqlite3_prepare_v2(handle, sql,-1, &stmt_ping_wtp,0);
-	if (rc) 
-		goto errX;
-
-
-	
-	sql = "SELECT wtpid,id,sub_id,val FROM wtpprops WHERE upd>0 AND wtpid=?";
-	rc = sqlite3_prepare_v2(handle, sql,-1, &get_tasks_stmt,0);
-	if (rc) 
-		goto errX;
-
- 
-	sql = "SELECT wtpid,rid,key,sub_key,val FROM radios WHERE upd>0 AND wtpid=?";
-	rc = sqlite3_prepare_v2(handle, sql,-1, &stmt_get_radio_tasks,0);
-	if (rc) 
-		goto errX;
-
-
-
-	return 1;
-
-errX:
-	cw_log(LOG_ERR,"Fatal: Can't start Sqlite3 DB, Error while executing '%s' - %d - %s",sql,rc,sqlite3_errmsg(handle));
-	return 0;
-
-
-}
-
-void db_put_radio_prop(const char *wtp_id,const char *rid, const char * key,const char *sub_key,const char * val)
-{
-	int rc=0;
-
-/*//	DBGX("Putting %s/%s:%s",id,sub_id,val);
-//	       (wtpid,rid,key,sub_key,val,upd)
-*/
-	sqlite3_reset(stmt_put_radio_prop);
-	sqlite3_clear_bindings(stmt_put_radio_prop);
-
-	if(sqlite3_bind_text(stmt_put_radio_prop,1,wtp_id,-1,SQLITE_STATIC))
-		goto errX;
-	
-	if(sqlite3_bind_text(stmt_put_radio_prop,2,rid,-1,SQLITE_STATIC))
-		goto errX;
-
-
-
-	if (sqlite3_bind_text(stmt_put_radio_prop,3,key,-1,SQLITE_STATIC))
-		goto errX;
-
-
-/*	if (!sub_key) 
-		sub_key=CW_ITEM_NONE;
-*/
-	if (sqlite3_bind_text(stmt_put_radio_prop,4,sub_key,-1,SQLITE_STATIC))
-		goto errX;
-
-	if (sqlite3_bind_text(stmt_put_radio_prop,5,val,-1,SQLITE_STATIC))
-		goto errX;
-
-	
-/*
-//	if (sqlite3_bind_int(put_wtp_prop_stmt,5,0))
-//		goto errX;
-
-//	cw_dbg(DBG_X,"Her I am already, next is step");
-*/
-	rc = sqlite3_step(stmt_put_radio_prop);
-	if (rc != SQLITE_DONE)
-		goto errX;
-
-/*
-//	cw_dbg(DBG_X,"SQL schould be fine");
-*/
-	return;
-errX:
-/*//	cw_dbg (DBG_X, "Iam on err %d\n",rc);*/
-
-
-	if (rc) {
-		cw_log(LOG_ERR,"Can't update database with WTP props: %d - %s",
-			rc,sqlite3_errmsg(handle));
-	}
-
-}
-
-
-
-
-
-void db_ping()
-{
-	int rc = sqlite3_step(ping_stmt);
-	if (rc!=SQLITE_DONE){
-		cw_log(LOG_ERR,"Error: Can't ping database, error code %d - %s",rc,sqlite3_errmsg(handle));
-	}
-}
-
-
-void db_ping_wtp(const char *wtpid,const char *acid)
-{
-	int rc=0;
-	sqlite3_reset(stmt_ping_wtp);
-	sqlite3_clear_bindings(stmt_ping_wtp);
-	if(sqlite3_bind_text(stmt_ping_wtp,1,wtpid,-1,SQLITE_STATIC))
-		goto errX;
-	
-	if(sqlite3_bind_text(stmt_ping_wtp,2,acid,-1,SQLITE_STATIC))
-		goto errX;
-
-	rc = sqlite3_step(stmt_ping_wtp);
-errX:
-	if (rc!=SQLITE_DONE) {
-		cw_log(LOG_ERR,"Can't ping database for WTP: %d - %s",
-			rc,sqlite3_errmsg(handle));
-	}
-
-
-
-}
-
-void db_put_wtp_prop(const char *wtp_id,const char * id,const char *sub_id,const char * val)
-{
-	int rc=0;
-
-/*//	DBGX("Putting %s/%s:%s",id,sub_id,val);
-*/
-
-	sqlite3_reset(put_wtp_prop_stmt);
-	sqlite3_clear_bindings(put_wtp_prop_stmt);
-
-	if(sqlite3_bind_text(put_wtp_prop_stmt,1,wtp_id,-1,SQLITE_STATIC))
-		goto errX;
-	
-	if(sqlite3_bind_text(put_wtp_prop_stmt,2,id,-1,SQLITE_STATIC))
-		goto errX;
-
-/*	if (!sub_id) 
-		sub_id=CW_ITEM_NONE;
-*/
-
-	if (sqlite3_bind_text(put_wtp_prop_stmt,3,sub_id,-1,SQLITE_STATIC))
-		goto errX;
-
-	if (sqlite3_bind_text(put_wtp_prop_stmt,4,val,-1,SQLITE_STATIC))
-		goto errX;
-
-	if (sqlite3_bind_int(put_wtp_prop_stmt,5,0))
-		goto errX;
-
-/*//	cw_dbg(DBG_X,"Her I am already, next is step");
-*/
-	rc = sqlite3_step(put_wtp_prop_stmt);
-	if (rc != SQLITE_DONE)
-		goto errX;
-
-/*
-//	cw_dbg(DBG_X,"SQL schould be fine");
-*/
-	return;
-errX:
-/*//	cw_dbg (DBG_X, "Iam on err %d\n",rc);*/
-
-
-	if (rc) {
-		cw_log(LOG_ERR,"Can't update database with WTP props: %d - %s",
-			rc,sqlite3_errmsg(handle));
-	}
-
-}
-
-/*// TODO XXXX*/
-mavl_t db_get_update_tasks(struct conn * conn,const char * wtpid)
-{
-/*
-	sqlite3_reset(get_tasks_stmt);
-	sqlite3_clear_bindings(get_tasks_stmt);
-
-	mavl_conststr_t r = mavl_create_conststr();
-	if (!r)
-		return NULL;
-
-
-	int rc=0;
-
-
-	if(sqlite3_bind_text(get_tasks_stmt,1,wtpid,-1,SQLITE_STATIC))
-		goto errX;
-
-	while (SQLITE_ROW == sqlite3_step(get_tasks_stmt)) {
-
-		int ii;
-		//DBGX("-----------------------------------------------------","");
-		for (ii=0; ii<5; ii++){
-
-			//DBGX("CVALL: %s",(const char*)sqlite3_column_text(get_tasks_stmt,ii));
-
-
-		}
-
-		const char *id =  (const char*)sqlite3_column_text(get_tasks_stmt,1);
-		if (!id) {
-			continue;
-		}
-
-		const char *sub_id =  (const char*)sqlite3_column_text(get_tasks_stmt,2);
-
-		const char *val =  (const char*)sqlite3_column_text(get_tasks_stmt,3);
-
-		//DBGX("ID: (%s), SubID (%s), Val (%s)",id,sub_id,val);
-	
-		const struct cw_itemdef * cwi = cw_itemdef_get(conn->actions->items,id,sub_id);
-		if (!cwi) {
-			//DBGX("Not item definition found for: %s/%s",id,sub_id);
-			continue;	
-		}
-
-		//uint8_t data[2048];
-
-		if (!cwi->type->from_str) {
-			cw_log(LOG_ERR,"Can't convert from string %s/%s - No method defined.",id,sub_id);
-			continue;
-		}
-
-
-		mbag_item_t * i = cwi->type->from_str(val);
-		i->id=cwi->id;
-
-		mbag_set(conn->outgoing,i);
-	
-		mavl_add(r,(void*)cwi->id);
-	}
-
-	if (r->count)
-		return r;
-	
-	mavl_destroy(r);
-	return NULL;
-
-
-errX:
-	if (rc) {
-		cw_log(LOG_ERR,"Can't get tasks: %d - %s",
-			rc,sqlite3_errmsg(handle));
-	}
-
-	if (r)
-		mavl_destroy(r);
-		
-
-	return NULL;
-*/
-}
-
-
-
-mavl_t db_get_radio_tasks(struct conn * conn,const char * wtpid)
-{
-/*
-//cw_dbg(DBG_X,"Get Radio Tasks for  %s",wtpid);
-
-	sqlite3_reset(stmt_get_radio_tasks);
-	sqlite3_clear_bindings(stmt_get_radio_tasks);
-
-	mavl_conststr_t r = mavl_create_conststr();
-	if (!r)
-		return NULL;
-
-
-	int rc=0;
-
-
-	if(sqlite3_bind_text(stmt_get_radio_tasks,1,wtpid,-1,SQLITE_STATIC))
-		goto errX;
-
-	while (SQLITE_ROW == sqlite3_step(stmt_get_radio_tasks)) {
-
-		int ii;
-		//DBGX("-----------------------------------------------------","");
-		for (ii=0; ii<6; ii++){
-
-			DBGX("CVALL: %s",(const char*)sqlite3_column_text(stmt_get_radio_tasks,ii));
-
-
-		}
-		const char *strrid=  (const char*)sqlite3_column_text(stmt_get_radio_tasks,1);
-
-		const char *id =  (const char*)sqlite3_column_text(stmt_get_radio_tasks,2);
-		if (!id) {
-			continue;
-		}
-
-		const char *sub_id =  (const char*)sqlite3_column_text(stmt_get_radio_tasks,3);
-
-		const char *val =  (const char*)sqlite3_column_text(stmt_get_radio_tasks,4);
-
-		//DBGX("ID: (%s), SubID (%s), Val (%s)",id,sub_id,val);
-	
-		const struct cw_itemdef * cwi = cw_itemdef_get(conn->actions->radioitems,id,sub_id);
-		if (!cwi) {
-			DBGX("No item definition found for: %s/%s",id,sub_id);
-			continue;	
-		}
-
-
-		if (!cwi->type->from_str) {
-			cw_log(LOG_ERR,"Can't convert from string %s/%s - No method defined.",id,sub_id);
-			continue;
-		}
-
-
-		mbag_item_t * i = cwi->type->from_str(val);
-		i->id=cwi->id;
-
-		int rid = atoi(strrid);			
-		cw_dbg(DBG_X,"RID: %d",rid);
-
-
-		mbag_t radio = mbag_i_get_mbag_c(conn->radios_upd,rid,mbag_create);
-		mbag_set(radio,i);
-
-
-		//mbag_set(conn->outgoing,i);
-	
-		mavl_add(r,(void*)cwi->id);
-	}
-
-	if (r->count)
-		return r;
-	
-	mavl_destroy(r);
-	return NULL;
-
-
-errX:
-	if (rc) {
-		cw_log(LOG_ERR,"Can't get tasks: %d - %s",
-			rc,sqlite3_errmsg(handle));
-	}
-
-	if (r)
-		mavl_destroy(r);
-		
-
-	return NULL;
-*/
-}
-
-

src/ac/db.h

@@ -1,21 +0,0 @@
-#ifndef CW_MAVL_H
-#define CW_MAVL_H
-
-#include "mavl.h"
-
-extern void db_ping();
-extern void db_ping_wtp(const char *wtpid,const char *acid);
-
-extern int db_init();
-int db_start();
-int db_get_tasks(struct conn * conn,const char * wtpid);
-void db_put_wtp_prop(const char *wtp_id,const char * id,const char *sub_id,const char * val);
-mavl_t db_get_update_tasks(struct conn * conn,const char * wtpid);
-
-void db_put_radio_prop(const char *wtp_id,const char *rid, const char * key,const char *sub_key,const char * val);
-extern mavl_t db_get_radio_tasks(struct conn * conn,const char * wtpid);
-
-
-#endif
-
-

src/ac/mod_cipwap.c

@@ -1,29 +0,0 @@
-
-
-#include "module.h"
-
-
-static int init()
-{
-//	regn = cw_register_actions_cipwap_ac(&capwap_actions);
-	return 1;
-}
-
-
-
-static struct ac_module module = {
-	.name="Cipwap",
-	.init= init,
-	.detect_by_discovery = 0
-	
-
-};
-
-
-
-
-struct ac_module * mod_cipwap()
-{
-
-	return &module;
-}

src/ac/module.h

@@ -1,13 +0,0 @@
-#ifndef __MODULE_H
-#define __MODULE_H
-
-struct ac_module
-{
-	const char *name;
-	int (*init)();
-	int (*detect_by_raw)(const char *msg, int len);
-	int (*detect_by_discovery)(const char*);
-};
-
-
-#endif

src/ac/rpc-macros/led-off.ckv

@@ -0,0 +1,5 @@
+#
+# Managed by acTube
+#
+
+cisco/ap-led-state-config/led-state: 0

src/ac/rpc-macros/led-on.ckv

@@ -0,0 +1,5 @@
+#
+# Managed by acTube
+#
+
+cisco/ap-led-state-config/led-state: 1

src/ac/rpc-macros/telnet-off.ckv

@@ -0,0 +1,5 @@
+#
+# Managed by acTube
+#
+
+cisco/ap-telnet-ssh/telnet: false

src/ac/rpc-macros/telnet-on.ckv

@@ -0,0 +1,5 @@
+#
+# Managed by acTube
+#
+
+cisco/ap-telnet-ssh/telnet: true

src/ac/rpc.c

@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
+#include <ctype.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -16,6 +17,7 @@
 #include "cw/log.h"
 #include "cw/dbg.h"
 
+#include "wtpman.h"
 
 #include "cw/connlist.h"
 
@@ -64,6 +66,11 @@ int wlan0_cmd(struct rpcdata *sd, const char * cmd);
 int exit_cmd(struct rpcdata *sd, const char * cmd);
 int prompt_cmd(struct rpcdata *sd, const char * cmd);
 int global_cfg_cmd(struct rpcdata *sd, const char * cmd);
+int status_cmd(struct rpcdata *sd, const char * cmd);
+void print_mw(FILE *f, int w, const char * str);
+int clear_cmd(struct rpcdata *sd, const char *cmd);
+int load_cmd(struct rpcdata *sd, const char *cmd);
+int save_cmd(struct rpcdata *sd, const char *cmd);
 
 //void show_cfg (FILE *out, mavl_t ktv);
 int show_aps (FILE *out);
@@ -88,6 +95,11 @@ static struct command cmdlist[]={
 	{"set", set_cmd },
 	{"wlan0",wlan0_cmd},
 	{"global_cfg", global_cfg_cmd},
+	{"status",status_cmd},
+	{"clear",clear_cmd},
+	{"load",load_cmd},
+	{"save",save_cmd},
+
 
 	{"@prompt",prompt_cmd},
 
@@ -112,9 +124,18 @@ int prompt_cmd(struct rpcdata *sd, const char *cmd)
 }
 
 
-int global_cfg_cmd(struct rpcdata *sd, const char *cmd)
+int global_cfg_cmd(struct rpcdata *sd, const char *str)
 {
-	cw_cfg_fdump(sd->out,sd->global_cfg);
+	char *s;
+	while( isspace( *str ) )  
+		 str++; 
+	s=(char*)str;
+	while (!isspace(*s) && *s!=0)
+		s++;
+	*s=0;
+
+
+	cw_cfg_fdump(sd->out,sd->global_cfg,str);
 	finish_cmd(sd->out);
 	return 0;
 }
@@ -149,8 +170,18 @@ int exit_cmd(struct rpcdata *sd, const char *cmd)
 
 
 
-int cfg_cmd(struct rpcdata *sd, const char *cmd)
+int cfg_cmd(struct rpcdata *sd, const char *str)
 {
+	char *s;
+	while( isspace( *str ) )  
+		 str++; 
+	s=(char*)str;
+	while (!isspace(*s) && *s!=0)
+		s++;
+	*s=0;
+
+
+
 	struct cw_Conn * conn;
 	wtplist_lock();
 	conn = find_ap(sd->prompt);
@@ -158,37 +189,112 @@ int cfg_cmd(struct rpcdata *sd, const char *cmd)
 		fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
 	}
 	else {
-		cw_cfg_fdump(sd->out,conn->remote_cfg);
+		cw_cfg_fdump(sd->out,conn->remote_cfg,str);
 	}
 	finish_cmd(sd->out);
 	wtplist_unlock();
 	return 0;
 }
 
-int ucfg_cmd(struct rpcdata *sd, const char *cmd)
+
+int status_cmd(struct rpcdata *sd, const char *cmd)
 {
-//	struct cw_Conn * conn;
+	struct cw_Conn * conn;
-	stop();
+	int i;
-//	show_cfg(sd->out,sd->update_cfg);
+	char key[CW_CFG_MAX_KEY_LEN];
+
+	wtplist_lock();
+	print_mw(sd->out,8,"Radio");
+	print_mw(sd->out,15,"Admin State");
+	print_mw(sd->out,15,"Oper State");
+	print_mw(sd->out,13,"Cause");
+	fprintf(sd->out,"\n");
+
+	conn = find_ap(sd->prompt);
+	if (conn==NULL){
+		fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
+		goto errX;
+	}
+
+	i=0;
+	do {
+		char tmp[128];
+		sprintf(key,"radio.%d",i);
+		if (!cw_cfg_base_exists(conn->remote_cfg,key))
+			break;
+
+		sprintf(tmp,"%d",i);
+		print_mw(sd->out,8,tmp);
+
+		sprintf(key,"radio.%d/capwap/admin-state",i);
+		print_mw(sd->out,15, cw_cfg_get(conn->remote_cfg,key,"?"));
+		sprintf(key,"radio.%d/capwap/operational-state/state",i);
+		print_mw(sd->out,15, cw_cfg_get(conn->remote_cfg,key,"?"));
+		sprintf(key,"radio.%d/capwap/operational-state/cause",i);
+		print_mw(sd->out,13, cw_cfg_get(conn->remote_cfg,key,"?"));
+		fprintf(sd->out,"\n");
+
+		i++;	
+	}while(1);
+
+errX:	
+	finish_cmd(sd->out);
+	wtplist_unlock();
+	return 0;
+}
+
+
+
+
+
+int ucfg_cmd(struct rpcdata *sd, const char *str)
+{
+	char *s;
+	while( isspace( *str ) )  
+		 str++; 
+	s=(char*)str;
+	while (!isspace(*s) && *s!=0)
+		s++;
+	*s=0;
+
+
+	cw_cfg_fdump(sd->out,sd->update_cfg,str);
+	finish_cmd(sd->out);
+	return 0;
+}
+
+int clear_cmd(struct rpcdata *sd, const char *cmd)
+{
+	cw_cfg_clear(sd->update_cfg);
+	fprintf(sd->out,"ucfg cleard\n");
+	finish_cmd(sd->out);
 	return 0;
 }
 
-#include "wtpman.h"
 
 int
 send_cmd(struct rpcdata * sd, const char *cmd)
 {
-
+	struct wtpman * wtpman;
 	struct cw_Conn * conn;
 	wtplist_lock();
 	conn = find_ap(sd->prompt);
 	if (conn==NULL){
 		fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
+		goto errX;
 	}
 	else {
-		conn->update_cfg=sd->update_cfg;
+		wtpman=conn->data;
+		cw_cfg_copy(sd->update_cfg,conn->update_cfg,0,NULL);
+		wtpman->update=1;
+
+		fprintf(sd->out, "Sending update cmd\n");
+
+//		conn->update_cfg=sd->update_cfg;
 	}
+errX:	
 	wtplist_unlock();
+	finish_cmd(sd->out);
 	return 0;
 }
 
@@ -217,33 +323,74 @@ int set_cmd(struct rpcdata *sd, const char *str)
 {
 
 	cw_Cfg_t *cfg;
+
 	cfg = cw_cfg_create();
 
 	cw_cfg_read_from_string(str,cfg);
 
-	cw_cfg_fdump(sd->out,cfg);
+	cw_cfg_fdump(sd->out,cfg,NULL);
+	cw_cfg_copy(cfg,sd->update_cfg,DBG_CFG_UPDATES,"rpc ucfg");
 
 	cw_cfg_destroy(cfg);
 
 	finish_cmd(sd->out);
-
-//	cw_ktv_init_str_reader(&r,str,strlen(str));
-	
-//	cw_ktv_parse_string(&r,key,type,val);
-	/*cw_ktv_parse_string(key,type,val, 2048);*/
-	
-//	fprintf(sd->out,"%s %s\n",key,val);
-//	cw_ktv_add(sd->update_cfg,key,CW_TYPE_STR,NULL,val,strlen(val));
 	return 0;
 }
 
+int load_cmd(struct rpcdata *sd, const char *str)
+{
+	char fn[CW_CFG_MAX_KEY_LEN];
+	int rc;
+	const char * dir=cw_cfg_get(sd->global_cfg,"actube/rpc/macros-dir","./rpc-macros");
+
+	sprintf(fn,"%s/%s.ckv",dir,str);
+	rc= cw_cfg_load(fn,sd->update_cfg);
+
+	if (rc){
+		fprintf(sd->out,"Error loading %s: %s\n",fn,strerror(rc));
+	}
+
+
+	finish_cmd(sd->out);
+	return 0;
+}
+
+int save_cmd(struct rpcdata *sd, const char *str)
+{
+	char fn[CW_CFG_MAX_KEY_LEN];
+	int rc;
+	const char * dir=cw_cfg_get(sd->global_cfg,"actube/rpc/macros-dir","./rpc-macros");
+
+	sprintf(fn,"%s/%s.ckv",dir,str);
+	rc= cw_cfg_save(fn,sd->update_cfg,"#\n# Managed by acTube\n#\n\n");
+
+	if (rc){
+		fprintf(sd->out,"Error saving %s: %s\n",fn,strerror(rc));
+	}
+
+
+	finish_cmd(sd->out);
+	return 0;
+}
+
+
+
+
 int del_cmd(struct rpcdata *sd, const char *str)
 {
-	char key[CW_CFG_MAX_KEY_LEN];
+	char *s;
-	sscanf(str,"%s",key);
+
-	stop();
+	while( isspace( *str ) )  
-//	cw_ktv_del_sub(sd->update_cfg,key);
+		 str++; 
-//
+	s=(char*)str;
+	while (!isspace(*s) && *s!=0)
+		s++;
+	*s=0;
+
+
+	fprintf(sd->out,"DEL: '%s'\n",str);
+	cw_cfg_del(sd->update_cfg,str);
+	finish_cmd(sd->out);
 	return 0;
 }
 
@@ -450,7 +597,19 @@ int execute_cmd (struct rpcdata * sd, const char *str)
 	searchcmd = find_cmd(cmd);
 	if (searchcmd!=NULL){
 		if (searchcmd->fun != NULL){
-			return searchcmd->fun(sd, str+strlen(cmd));
+			char *args;
+			int n;
+		      	args = (char*)(str+strlen(cmd));
+			while( isspace( *args ) )  
+				 args++; 
+			n = strlen(args);
+			n--;
+
+			while (n>=0 && isspace(args[n]))
+				n--;
+			args[n+1]=0;
+
+			return searchcmd->fun(sd, args);
 		}
 	}
 	else{
@@ -540,6 +699,7 @@ void rpc_loop (FILE *file, cw_Cfg_t *global_cfg)
 	sd.in = file;
 	sd.out = file;	
 	sd.global_cfg=global_cfg;
+	sd.update_cfg=cw_cfg_create();
 
 
 	sprintf(sd.prompt,"%s","*");

src/ac/wtpman.c

@@ -298,6 +298,18 @@ int cw_run_state_machine(struct cw_Conn *conn, time_t * timer)
 
 /*#define CW_TRANSITION(prestate,state) (prestate<<16|state)*/
 
+
+int run_update(struct wtpman *wtpman)
+{
+	int rc;
+	if (!wtpman->update)
+		return EAGAIN;
+	rc = cw_send_request(wtpman->conn, CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST);
+        cw_cfg_clear(wtpman->conn->update_cfg);
+	wtpman->update=0;
+	return rc;
+}
+
 static void *wtpman_main(void *arg)
 {
 	//mavl_t r;
@@ -343,6 +355,7 @@ static void *wtpman_main(void *arg)
 	conn->capwap_prevstate = CAPWAP_STATE_DTLS_SETUP;
 	conn->capwap_state = CAPWAP_STATE_JOIN;
 	rc = 0;
+	wtpman->update=0;
 
 	while (1) {
 
@@ -359,59 +372,25 @@ static void *wtpman_main(void *arg)
 
 
 		while (!cw_timer_timeout(timer)) {
+			rc = run_update(wtpman);
+			if (rc !=EAGAIN)
+				break;
 
 			rc = cw_read_messages(wtpman->conn);
+			
 			if (rc < 0) {
-				if (errno == EAGAIN)
+				if (errno == EAGAIN){
 					continue;
 				}
+			}
 			break;
 		}
-
 		if (rc < 0) {
 			conn->capwap_prevstate = conn->capwap_state;
 			conn->capwap_state = CAPWAP_STATE_TIMEOUT;
 		}
 
 	}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-	/* dtls is established, goto join state */
-/*
-	conn->capwap_state = CAPWAP_STATE_JOIN;
-	if (!wtpman_join(wtpman)) {
-		wtpman_remove(wtpman);
-		return NULL;
-	}
-
-
-
-	cw_dbg(DBG_INFO, "WTP from %s has joined with session id: %s",
-	       sock_addr2str_p(&conn->addr, sock_buf),
-	       format_bin2hex(conn->session_id, 16));
-
-*/
-
 	exit(0);
 
 	return NULL;
@@ -433,20 +412,7 @@ void wtpman_destroy(struct wtpman *wtpman)
 
 static void copy(struct cw_ElemHandlerParams * params)
 {
-//	struct wtpman * wtpman;
-	//struct cw_Conn * conn;
-	//wtpman = (struct wtpman*)params->conn->data;
-	//conn = (struct cw_Conn*)params->conn;
-
-
-//	cw_dbg(DBG_X,"-------------  Here is the config we ve got from WTP ---------------- ");
-//	cw_cfg_dump(params->cfg);
-//	cw_dbg(DBG_X,"-------------  This was the config we ve got from WTP ---------------- ");
-//	cw_dbg(DBG_X,"Now copying:");
-//	cw_cfg_copy(params->cfg,conn->local_cfg,0,"");
         cw_cfg_copy(params->cfg, params->conn->remote_cfg,DBG_CFG_UPDATES,"GlobalCfg");
-
-//	cw_dbg(DBG_X,"Copying done.");
 }
 
 static int discovery_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
@@ -479,6 +445,32 @@ static int join_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, in
 	return 0;
 }
 
+static int fill_update_cfg(struct cw_Conn * conn)
+{
+	struct cw_Cfg_iter cfi;
+	struct cw_Cfg_entry *e;
+	cw_Cfg_t * u;
+	u=cw_cfg_create();
+	if( cw_cfg_load("status_response.ckv",u)){
+		cw_log(LOG_ERR,"Cant load file");
+		stop();
+	};
+	cw_cfg_dump(conn->remote_cfg);
+        cw_cfg_iter_init(u, &cfi, NULL);
+	while ((e = cw_cfg_iter_next(&cfi, NULL))!=NULL){
+		const char * r;
+		r = cw_cfg_get(conn->remote_cfg, e->key, "[]");
+	//	cw_dbg(DBG_CFG_UPDATES,"check: %s: %s",e->key,e->val);
+		if (strcmp(r,e->val)==0)
+			continue;
+
+		cw_dbg(DBG_CFG_UPDATES,"Status reps: %s: %s -> %s",e->key,r,e->val);
+	}
+
+	return 0;
+}
+
+
 static int update_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
 {
 	struct cw_Conn * conn = (struct cw_Conn*)params->conn;
@@ -488,6 +480,7 @@ static int update_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr,
 	
 	cw_dbg(DBG_X,"UPDATE Callback");
 	copy(params);
+	fill_update_cfg(params->conn);
 
 	const char * wtpname = cw_cfg_get(conn->remote_cfg,"capwap/wtp-name","default");
 	sprintf(filename,"wtp-status-%s.ckv",wtpname);
@@ -499,6 +492,8 @@ static int update_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr,
 static int event_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
 {
 	struct cw_Conn * conn = (struct cw_Conn*)params->conn;
+	struct wtpman * wtpman = (struct wtpman *)conn->data;
+
 	char filename[200];
 
 
@@ -507,9 +502,26 @@ static int event_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, i
 	copy(params);
 
 	const char * wtpname = cw_cfg_get(conn->remote_cfg,"capwap/wtp-name","default");
-	sprintf(filename,"wtp-event-%s.ckv",wtpname);
+	sprintf(filename,"wtp-event-%d-%s.ckv",wtpman->ctr++,wtpname);
-	cw_cfg_save(filename,conn->remote_cfg,NULL);
+	cw_cfg_save(filename,params->cfg,NULL);
-//stop();	
+	return 0;
+}
+
+static int change_state_event_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
+{
+	struct cw_Conn * conn = (struct cw_Conn*)params->conn;
+	struct wtpman * wtpman = (struct wtpman *)conn->data;
+
+	char filename[200];
+
+
+	
+	cw_dbg(DBG_X,"WTP EVENT Callback");
+	copy(params);
+
+	const char * wtpname = cw_cfg_get(conn->remote_cfg,"capwap/wtp-name","default");
+	sprintf(filename,"wtp-change-event-%d-%s.ckv",wtpman->ctr++,wtpname);
+	cw_cfg_save(filename,params->cfg,NULL);
 	return 0;
 }
 
@@ -530,6 +542,8 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 	if (!wtpman)
 		return 0;
 
+	wtpman->ctr=0;
+
 	if (socklist[socklistindex].type != SOCKLIST_UNICAST_SOCKET) {
 
 		int port = sock_getport(&socklist[socklistindex].addr);
@@ -600,6 +614,10 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 			CAPWAP_MSG_WTP_EVENT_REQUEST,
 			event_cb);
 
+	cw_conn_set_msg_cb(wtpman->conn,
+			CAPWAP_MSG_CHANGE_STATE_EVENT_REQUEST,
+			change_state_event_cb);
+
 
 
 

src/ac/wtpman.h

@@ -40,8 +40,8 @@ struct wtpman {
 
 	cw_Cfg_t * wtp_cfg;
 
-	
+	int update;	
-
+	int ctr;
 };
 
 /*

src/cw/Makefile

@@ -18,13 +18,11 @@ CWSRC=\
 	cw_in_capwap_local_ipv4_address.c\
 	cw_in_capwap_local_ipv6_address.c\
 	cw_in_generic_with_index.c\
-	cw_in_radio_generic_struct.c\
 	cw_in_idx_generic.c\
 	cw_in_idx_generic_struct.c\
 	cw_in_generic_indexed_enum.c\
 	cw_out_generic_indexed_enum.c\
 	cw_in_generic_enum.c\
-	cw_out_generic_struct.c\
 	cw_out_idx_generic_struct.c\
 	cw_init_data_keep_alive_msg.c\
 	cw_inline.c\
@@ -37,7 +35,6 @@ 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\
@@ -62,11 +59,11 @@ CWSRC=\
 	cw_type_ipaddress.c\
 	cw_type_word.c\
 	cw_type_sysptr.c\
+	cw_type_array.c\
 	cw_write_descriptor_subelem.c\
 	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\
@@ -77,46 +74,15 @@ CWSRC=\
 #	cw_out_generic.c\
 #	
 #	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\

src/cw/capwap80211.h

@@ -86,12 +86,15 @@ enum radioelems {
 };
 
 
-/** IEEE 802.11 Radio Information Message Element */
+
-#define CAPWAP80211_ELEM_WTP_RADIO_INFORMATION		1048
+/** IEEE 802.11 Add WLAN Message element */
+#define	CAPWAP80211_ELEM_ADD_WLAN			1024
 /** IEEE 802.11 Antenna Message element */
 #define CAPWAP80211_ELEM_ANTENNA			1025
-
+/** IEEE 802.11 WTP Radio Configuration */
-
+#define CAPWAP80211_ELEM_WTP_RADIO_CONFIGURATION	1046
+/** IEEE 802.11 Radio Information Message Element */
+#define CAPWAP80211_ELEM_WTP_RADIO_INFORMATION		1048
 
 
 /**

src/cw/cfg.c

@@ -80,7 +80,13 @@ 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;
@@ -88,6 +94,7 @@ 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);
@@ -122,6 +129,16 @@ int cw_cfg_set(cw_Cfg_t * cfg, const char *key, const char *val)
 	return -1;
 }
 
+
+void cw_cfg_del(cw_Cfg_t * cfg, const char *key)
+{
+	struct cw_Cfg_entry e;
+	e.key = key;
+	e.val=NULL;
+	mavl_del(cfg->cfg,&e);
+}
+
+
 const char *cw_cfg_get(cw_Cfg_t * cfg, const char *key, const char *def)
 {
 	struct cw_Cfg_entry e, *r;
@@ -186,7 +203,7 @@ void cw_cfg_dump(cw_Cfg_t * cfg)
 	}
 }
 
-void cw_cfg_fdump(FILE *f, cw_Cfg_t * cfg)
+void cw_cfg_fdump(FILE *f, cw_Cfg_t * cfg, const char *filter)
 {
 	mavliter_t it;
 	struct cw_Cfg_entry *e;
@@ -194,6 +211,13 @@ void cw_cfg_fdump(FILE *f, cw_Cfg_t * cfg)
 	mavliter_foreach(&it) {
 
 		e = mavliter_get(&it);
+		if (filter != NULL){
+			if (strlen(filter)){
+				if (strstr(e->key,filter)==NULL){
+					continue;
+				}
+			}
+		}
 		fprintf(f,"%s: '%s'\n", e->key, e->val);
 	}
 }
@@ -487,6 +511,7 @@ int cw_cfg_load(const char *filename, cw_Cfg_t * cfg)
 	FILE *f = fopen(filename, "rb");
 	if (!f)
 		return errno;
+	errno=0;
 	errs = cw_cfg_read_from_file(f, cfg);
 	fclose(f);
 
@@ -559,6 +584,11 @@ void cw_cfg_iter_init(cw_Cfg_t * cfg, struct cw_Cfg_iter *cfi, const char *base)
 	search.key = base;
 
 	mavliter_init(&(cfi->it), cfg->cfg);
+	if (base == NULL){
+		mavliter_seek_set(&(cfi->it));
+		mavliter_next(&(cfi->it));
+	}
+	else
 		mavliter_seek(&(cfi->it), &search, 0);
 	cfi->base = base;
 }
@@ -569,15 +599,15 @@ struct cw_Cfg_entry *cw_cfg_iter_next(struct cw_Cfg_iter *cfi, const char *nnkey
 	struct cw_Cfg_entry *e;
 	int bl, kl;
 	const char *d;
-
 	e = mavliter_get(&(cfi->it));
-	if (e == NULL)
+	if (e == NULL){
 		return NULL;
-
+	}
+	if (cfi->base ==NULL)
+		goto eeX;
 
 	bl = strlen(cfi->base);
 	kl = strlen(e->key);
-
 	if (bl > kl)
 		return NULL;
 
@@ -593,13 +623,12 @@ struct cw_Cfg_entry *cw_cfg_iter_next(struct cw_Cfg_iter *cfi, const char *nnkey
 	d = strchr(e->key, '.');
 	if (d == NULL)
 		return NULL;
-
 	if (d - e->key != bl)
 		return NULL;
 
 	if (strncmp(cfi->base, e->key, bl) != 0)
 		return NULL;
-
+eeX:
 	mavliter_next(&(cfi->it));
 	return e;
 }
@@ -682,8 +711,7 @@ void cw_cfg_set_int(cw_Cfg_t * cfg, const char * key, int val)
 }
 
 
-
+int cw_cfg_get_new_index(cw_Cfg_t * cfg, const char *key)
-int cw_cfg_get_next_index(cw_Cfg_t * cfg, const char *key)
 {
 	char ikey[CW_CFG_MAX_KEY_LEN];
 	struct cw_Cfg_entry search, * result;
@@ -699,7 +727,7 @@ int cw_cfg_get_next_index(cw_Cfg_t * cfg, const char *key)
 		return 0;
 	}
 	
-	d = strchr(result->key,'.');
+	d = strrchr(result->key,'.');
 	if (d==NULL){
 		return 0;
 	}
@@ -710,6 +738,46 @@ int cw_cfg_get_next_index(cw_Cfg_t * cfg, const char *key)
 	return atoi(d+1)+1;
 }
 
+
+int cw_cfg_get_first_index(cw_Cfg_t * cfg, const char *key, int n)
+{
+	char ikey[CW_CFG_MAX_KEY_LEN];
+	struct cw_Cfg_entry search, * result;
+	char *d;
+	int l;
+	
+	sprintf(ikey,"%s.%d",key,n);
+	search.key=ikey;
+	
+	result = mavl_get_first(cfg->cfg,&search);
+	if (result == NULL){
+		return -1;
+	}
+
+	d = strrchr(ikey,'.');
+	if (d==NULL){
+		return -1;
+	}
+	l = d-ikey;
+	if (strncmp(result->key,ikey,l)!=0)
+		return -1;
+	
+	return atoi(result->key+l+1);
+}
+
+int cw_cfg_get_first_index_l(cw_Cfg_t ** cfgs, const char *key, int n)
+{
+	int r;
+	while(*cfgs != NULL){
+		r = cw_cfg_get_first_index(*cfgs,key,n);
+		if (r!=-1)
+			return r;
+		cfgs++;
+	}
+	return -1;
+}
+
+
 int cw_cfg_set_val(cw_Cfg_t * cfg, const char *key, const struct cw_Type *type, const void * valguard, const uint8_t * data, int len)
 {
 	cw_Val_t mdata, *mresult;
@@ -808,22 +876,43 @@ void cw_cfg_clear(cw_Cfg_t *cfg)
 int cw_cfg_base_exists(cw_Cfg_t * cfg, const char *key)
 {
         struct cw_Cfg_entry e, *result;
-//cw_dbg(DBG_X,"LOOX FOR: %s",key);
+	int rl,kl;
-        e.key=key;
+	char skey[CW_CFG_MAX_KEY_LEN];
-        result = mavl_get_first(cfg->cfg,&e);
+	char * delimiters = "/.";
-        if (result == NULL)
+	char * d;
-                return 0;
-//cw_dbg(DBG_X,"BASEXXX: %s",result->key);
 
-	if (strlen(result->key)<strlen(key))
+	/* can we find the base exactly ?*/
-		return 0;		
+	if (cw_cfg_get(cfg,key,NULL)!=NULL)
-//cw_dbg(DBG_X,"BASEXXX1: %d",strlen(key));
-	if (result->key[strlen(key)]!='/' && result->key[strlen(key)]!='.')
-		return 0;
-//cw_dbg(DBG_X,"BASEXXX2: ");
-	if (strncmp(result->key,key,strlen(key))==0)
 		return 1;
-cw_dbg(DBG_X,"BASEXXX3: ");
+
+
+	for(d=delimiters; *d!=0; d++){
+		sprintf(skey,"%s%c",key,*d);
+
+	        e.key=skey;
+	        result = mavl_get_first(cfg->cfg,&e);
+
+	
+		/* if we've found nothing, we can't check more */
+	        if (result == NULL)
+	                continue;
+
+		rl = strlen(result->key);
+		kl = strlen(skey);
+
+		/* if result key is shorter than key */
+		if (rl<kl)
+			continue;
+
+		/* both keys are identical in length */
+		if (rl==kl){
+			if (strcmp(result->key,key)==0)
+				return 1;
+		}
+	
+		if (strncmp(result->key,skey,kl)==0)
+			return 1;
+	}
 
 	return 0;
 }

src/cw/cfg.h

@@ -5,28 +5,53 @@
 #include "val.h"
 #include "bstr.h"
 
+
+/**
+ *@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;
+	struct mavl * cfg;	/**< The AVL-tree containig the keys 
-	const char *name;
+				     and vals */
+	const char *name;	/**< A name for this config object */
 	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;
@@ -44,7 +69,7 @@ void cw_cfg_set_int(cw_Cfg_t * cfg, const char * key, int val);
 uint8_t cw_cfg_get_byte(cw_Cfg_t * cfg, char *key, uint8_t def);
 bstr16_t cw_cfg_get_bstr16(cw_Cfg_t * cfg, const char * key, const char *def);
 int cw_cfg_set_bstr16(cw_Cfg_t * cfg, const char * key, bstr16_t str);
-int cw_cfg_get_next_index(cw_Cfg_t * cfg, const char *key);
+int cw_cfg_get_new_index(cw_Cfg_t * cfg, const char *key);
 const char *cw_cfg_get_l(cw_Cfg_t ** cfg, const char * key, const char *def);
 void cw_cfg_copy(cw_Cfg_t *src, cw_Cfg_t *dst,int dbg_level,const char *dbg_prefix);
 void cw_cfg_destroy(cw_Cfg_t *cfg);
@@ -56,9 +81,13 @@ int cw_cfg_base_exists_l(cw_Cfg_t ** cfgs, const char *key);
 int cw_cfg_save(const char *filename, cw_Cfg_t *cfg, const char *format, ...);
 
 uint16_t cw_cfg_get_word_l(cw_Cfg_t ** cfg, const char *key, uint16_t def);
-void cw_cfg_fdump(FILE *f, cw_Cfg_t * cfg);
+void cw_cfg_fdump(FILE *f, cw_Cfg_t * cfg, const char *filter);
-int cw_cfg_read_from_string(const char *str, cw_Cfg_t *cfg);
 
+int cw_cfg_read_from_string(const char *str, cw_Cfg_t *cfg);
+void cw_cfg_del(cw_Cfg_t * cfg, const char *key);
+
+int cw_cfg_get_first_index(cw_Cfg_t * cfg, const char *key, int n);
+int cw_cfg_get_first_index_l(cw_Cfg_t ** cfgs, const char *key, int n);
 
 
 
@@ -74,3 +103,6 @@ int cw_cfg_set_val(cw_Cfg_t * cfg, const char *key, const struct cw_Type *t, con
 
 #endif
 
+
+/**@}*/
+

src/cw/conn.c

@@ -554,7 +554,6 @@ static int process_elements(struct cw_Conn *conn, uint8_t * rawmsg, int len,
 		 * Put further actions here, if needed.
 		 */
 	}
-
 	if (params.unrecognized)
 		mlist_destroy(params.unrecognized);
 	cw_cfg_destroy(params.cfg);

src/cw/cw.c

@@ -36,10 +36,9 @@ int cw_in_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams *
 
 
 
-int cw_out_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
+int cw_out_generic0(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
-			, uint8_t * dst)
+			, uint8_t * dst,const char *key)
 {
-
 	int start, len, l;
 	
 //	cw_dbg(DBG_X,"cw_out_generic (%s)%s",((struct cw_Type*)handler->type)->name,handler->key);
@@ -47,10 +46,23 @@ int cw_out_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams
 //	cw_dbg(DBG_X,"Generic out!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
 //	cw_cfg_dump(params->cfg);
 //	cw_dbg(DBG_X,"Generic out!!!!!!!!!!!!!!!!!!!!!!!!!!!! ENDDUMP");
+//
+//
+	if (!params->elemdata->mand){
+		if (!cw_cfg_base_exists(params->cfg_list[0],key)){
+			cw_dbg(DBG_MSG_COMPOSE,"    Add Elem: %d %d %d %s %s - (bskip)", 
+				params->elemdata->proto, 
+				params->elemdata->vendor, 
+				params->elemdata->id, 
+				handler->name, key);
+			return 0;
+		}
+	}	
+
 
 	start = params->msgset->header_len(handler);
 	len = ((const cw_Type_t*)(handler->type))->
-		write(params->cfg_list,handler->key,dst+start,handler->param);
+		write(params->cfg_list,key,dst+start,handler->param);
 //	cw_dbg(DBG_X, "Type result is %d",len);
 
 	if (len == -1) {
@@ -62,7 +74,7 @@ int cw_out_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams
 			cw_log(LOG_ERR,
 			       "Can't put mandatory element %s %d-(%s) into %s. No value for '%s' found.",
 				vendor, handler->id, handler->name, params->msgdata->name
-			       , handler->key
+			       , key
 			    );
 		}
 		else{
@@ -79,6 +91,15 @@ int cw_out_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams
 	l = params->msgset->write_header(handler,dst,len);
 
 	return l;
+
+
+}
+
+
+int cw_out_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
+			, uint8_t * dst)
+{
+	return cw_out_generic0(handler,params,dst,handler->key);
 }
 
 
@@ -118,6 +139,39 @@ int cw_out_radio_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerP
 	int radios;
 	len =0;
 
+	for (i=0; (i=cw_cfg_get_first_index_l(params->cfg_list,"radio",i))!=-1; i++){
+		sprintf(key,"radio.%d/%s",i,handler->key);
+		if (!params->elemdata->mand){
+			if (!cw_cfg_base_exists(params->cfg_list[0],key)){
+				cw_dbg(DBG_MSG_COMPOSE,"    Add Elem: %d %d %d %s %s - (skip)", 
+						params->elemdata->proto, 
+						params->elemdata->vendor, 
+						params->elemdata->id, 
+						handler->name, key);
+				continue;
+			}
+		}
+
+		type = (struct cw_Type*)handler->type;
+		start = params->msgset->header_len(handler)+len;
+
+		l = type->write(params->cfg_list, key,dst+start+1,handler->param);
+		if (l==-1)
+			continue;
+
+		l += cw_put_byte(dst+start,i);
+
+		l = params->msgset->write_header(handler,dst+len,l);
+		len+=l;
+		
+
+	}
+
+	return len;
+
+
+
+	
 	radios = cw_cfg_get_byte_l(params->cfg_list,"capwap/wtp-descriptor/max-radios",0);
 	for(i=0;i<radios;i++){
 
@@ -270,3 +324,148 @@ cw_put_descriptor_subelem (uint8_t *dst, cw_Cfg_t ** cfg_list,
 	
 	return d-dst;
 }
+
+
+
+/*
+int cw_out_traverse0(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
+			, uint8_t * dst, int i, const char *current, const char * next, 
+			int * stack)
+{
+	char *sl;
+	int l;
+	char key[CW_CFG_MAX_KEY_LEN];
+	int len;
+	len = 0;
+
+printf("Next: %s\n", next);
+
+	sl = strchr(next,'/');
+	if (sl==NULL){
+		cw_Val_t * result;
+		sprintf(key,"%s/%s",current,next);
+		result = cw_ktv_base_exists(params->cfg,key);
+		if (result != NULL){
+			int offset;
+			int i,l;
+			offset = params->msgset->header_len(handler);
+			printf("Yea! We can do it: %s\n",result->key);
+			for (i=0;i<stack[0];i++){
+				printf("I=%i\n",stack[i+1]);
+			}
+			l= cw_ktv_write_struct(params->cfg,params->cfg, 
+				handler->type,key,dst+offset);
+			
+			printf("Write struct len %i\n",l);
+			
+			l=params->msgset->write_header(handler,dst,l);
+			printf("header wr len %d\n",l);
+			if (handler->patch){
+				handler->patch(dst+offset,stack);
+			}
+			
+			return l;
+		}
+		
+		return 0;
+	}
+	
+	strcpy(key,current);
+
+printf("current is %s\n", current);	
+
+	if (key[0!=0])
+		strcat(key,"/");
+	l = sl - next;
+	strncat(key,next,l);
+	
+	
+	printf("Here we are %s\n",key);
+	cw_dbg_ktv_dump(params->cfg,DBG_INFO,"start"," ", "end" );
+	i=-1;
+	while(1){
+		char basekey[CW_CFG_MAX_KEY_LEN];
+		cw_Val_t * result;
+		
+		i = cw_ktv_idx_get_next(params->cfg,key,i+1);
+		
+		if (i==-1)
+			break;
+		sprintf(basekey,"%s.%d",key,i);
+		printf("Our basekey is %s\n",basekey);
+		result = cw_ktv_base_exists(params->cfg,basekey);
+		if (result == NULL){
+			continue;
+		}
+
+		stack[0]++;
+		stack[stack[0]]=i;
+		len += cw_out_traverse0(handler,params,dst+len,-1,basekey,next+l+1, stack);
+		printf("Len is now %d\n", len);
+	}
+
+
+	return len;
+	
+	return 0;
+}
+*/
+int cw_out_traverse(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
+			, uint8_t * dst)
+
+{
+/*	char current[CW_CFG_MAX_KEY_LEN];
+	int stack[10];
+	stack[0]=0;
+	current[0]=0;
+//	return cw_out_traverse0(handler,params,dst,-1,current,handler->key, stack);*/
+	return 0;
+}
+
+
+
+int walk0(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
+		, uint8_t * dst, const char *current, const char * next)
+{
+        char key[CW_CFG_MAX_KEY_LEN];
+        const char *sl;
+	int rc;
+        int len=0;
+
+        /* Is this the last key ? */
+        sl = strchr(next,'/');
+        if (sl){
+                char basekey[CW_CFG_MAX_KEY_LEN+13];
+                int i,l;
+                strcpy(key,current);
+                l = sl - next;
+                strncat(key,next,l);
+
+                for (i=0; (i=cw_cfg_get_first_index_l(params->cfg_list,key,i))!=-1; i++){
+                        sprintf(basekey,"%s.%d%c",key,i, *(sl+1) ?'/':'\0');
+                        rc = walk0(handler,params,dst,basekey,next+l+1);
+			if (rc>0)
+				len+=rc;
+                }
+                return len;
+
+        }
+
+        printf("Final %s [%s]\n",current,next);
+	return cw_out_generic0(handler,params,dst,current);
+
+        return 0;
+
+}
+
+int cw_out_generic_walk(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
+			, uint8_t * dst)
+{
+        char current[CW_CFG_MAX_KEY_LEN];
+//        int stack[10];
+ //       stack[0]=0;
+        current[0]=0;
+
+	return walk0(handler,params,dst,current,handler->key);
+}
+

src/cw/cw.h

@@ -558,6 +558,8 @@ int cw_put_descriptor_subelem (uint8_t *dst, cw_Cfg_t ** cfg_list,
 
 
 int cw_send_request(struct cw_Conn *conn,int msg_id);
+int cw_out_generic_walk(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
+			, uint8_t * dst);
 
 /**
  *@}

src/cw/cw_in_generic_struct.c

@@ -1,36 +0,0 @@
-
-#include "capwap.h"
-#include "msgset.h"
-#include "val.h"
-#include "log.h"
-#include "dbg.h"
-
-int cw_in_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params,
-		uint8_t * elem_data, int elem_len)
-{
-	cw_dbg(DBG_X,"STRUCT KEY: %s",handler->key);
-	stop();
-/*	const char * key;
-	char tmpkey[CW_CFG_MAX_KEY_LEN];
-
-	
-	if (handler->mkkey != NULL){
-		handler->mkkey(key,elem_data,elem_len, tmpkey);
-		key = tmpkey;
-	}
-	else{
-		key = handler->key;
-	}
-
-//printf("CW_IN_GENERIC STRUCT: %s\n",key);	
-
-
-	if (!handler->type){
-		cw_log(LOG_ERR,"Can't handle element: %s, no type defined",handler->name);
-		return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
-	}
-
-	cw_ktv_read_struct(params->cfg,handler->type,key,elem_data,elem_len);
-*/
-	return CAPWAP_RESULT_SUCCESS;
-}

src/cw/cw_in_idx_generic_struct.c

@@ -10,12 +10,14 @@
 int cw_in_idx_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params,
 		uint8_t * elem_data, int elem_len)
 {
+	stop();
+
+	/*
 	char key[CW_CFG_MAX_KEY_LEN];
 	int idx;
 
 
 	cw_dbg(DBG_X,"Fix cw_in_idx_generic_struct");
-	stop();
 	
 	if (!handler->type){
 		cw_log(LOG_ERR,"Can't handle element: %s, no type defined",handler->name);
@@ -26,6 +28,6 @@ int cw_in_idx_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHand
 	sprintf(key, handler->key, idx);
 
 	cw_ktv_read_struct(params->cfg,handler->type,key,elem_data+1,elem_len-1);
-
+*/
 	return CAPWAP_RESULT_SUCCESS;
 }

src/cw/cw_out_generic_indexed_enum.c

@@ -26,15 +26,16 @@ int cw_out_generic_indexed_enum(struct cw_ElemHandler * handler, struct cw_ElemH
 	
 	e = ie->type;
 
+
+	
 	for(i=0; e[i].name!=NULL; i++) {
 		int b;
 		sprintf(key,"%s/%s",handler->key,e[i].name);
 
-cw_dbg(DBG_X,"Her is the Key: %s %s\n",key,e[i].name);
 
-		b = cw_cfg_base_exists_l(params->cfg_list,handler->key);
+		b = cw_cfg_base_exists(params->cfg_list[0],handler->key);
 		if (!b){
-			stop();
+			//stop();
 			continue;
 		}
 		start = params->msgset->header_len(handler);

src/cw/cw_out_generic_struct.c

@@ -1,48 +0,0 @@
-#include "capwap.h"
-#include "msgset.h"
-#include "val.h"
-#include "log.h"
-#include "cw.h"
-
-#include "dbg.h"
-
-
-int cw_out_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
-			, uint8_t * dst)
-{
-	cw_dbg(DBG_X,"Key: %s",handler->key);
-	stop();
-
-
-	int start;
-	int len;
-	cw_Val_t search, *result;
-
-	if (!handler->type){
-		cw_log(LOG_ERR,"Can't handle element: %s, no type defined",handler->name);
-		return 0;
-	}
-	
-	search.key = (char*)handler->key;
-	result = mavl_get_first(params->cfg,&search);
-	if (result == NULL ){
-		if (params->elemdata->mand)
-			cw_log(LOG_ERR,"Can't put mandatory message element %s, no data available",handler->name);
-		return 0;
-	}
-	
-	if (strncmp(result->key,handler->key, strlen(handler->key))!=0){
-		if (params->elemdata->mand)
-			cw_log(LOG_ERR,"Can't put mandatory message element %s, no data available",handler->name);
-		return 0;
-	}
-
-	start = params->msgset->header_len(handler);
-
-	len = cw_ktv_write_struct(params->cfg,
-		params->cfg,
-		handler->type,handler->key,dst+start);
-	
-	return params->msgset->write_header(handler,dst,len);
-
-}

src/cw/cw_out_idx_generic_struct.c

@@ -7,7 +7,7 @@ int cw_out_idx_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHan
 {
 
 	stop();
-
+/*
 	char key[CW_CFG_MAX_KEY_LEN];
 	struct cw_Val * elem, search;
 	int i;
@@ -63,6 +63,8 @@ int cw_out_idx_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHan
 		len+=l;
 	}
 * /
+
 	return mdst-dst;
+	*/ return 0;
 }
 

src/cw/cw_out_radio_generic_struct.c

@@ -42,106 +42,8 @@ int cw_out_radio_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemH
 
 		cdst+=params->msgset->write_header(handler,cdst,l);
 	}
-	return cdst-dst;
+	return cdst-dst;*/
 }
 
 
-int cw_out_traverse0(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
-			, uint8_t * dst, int i, const char *current, const char * next, 
-			int * stack)
-{
-	char *sl;
-	int l;
-	char key[CW_CFG_MAX_KEY_LEN];
-	int len;
-	len = 0;
-
-printf("Next: %s\n", next);
-
-	sl = strchr(next,'/');
-	if (sl==NULL){
-		cw_Val_t * result;
-		sprintf(key,"%s/%s",current,next);
-		result = cw_ktv_base_exists(params->cfg,key);
-		if (result != NULL){
-			int offset;
-			int i,l;
-			offset = params->msgset->header_len(handler);
-			printf("Yea! We can do it: %s\n",result->key);
-			for (i=0;i<stack[0];i++){
-				printf("I=%i\n",stack[i+1]);
-			}
-			l= cw_ktv_write_struct(params->cfg,params->cfg, 
-				handler->type,key,dst+offset);
-			
-			printf("Write struct len %i\n",l);
-			
-			l=params->msgset->write_header(handler,dst,l);
-			printf("header wr len %d\n",l);
-			if (handler->patch){
-				handler->patch(dst+offset,stack);
-			}
-			
-			return l;
-		}
-		
-		return 0;
-	}
-	
-	strcpy(key,current);
-
-printf("current is %s\n", current);	
-
-	if (key[0!=0])
-		strcat(key,"/");
-	l = sl - next;
-	strncat(key,next,l);
-	
-	
-	printf("Here we are %s\n",key);
-	cw_dbg_ktv_dump(params->cfg,DBG_INFO,"start"," ", "end" );
-	i=-1;
-	while(1){
-		char basekey[CW_CFG_MAX_KEY_LEN];
-		cw_Val_t * result;
-		
-		i = cw_ktv_idx_get_next(params->cfg,key,i+1);
-		
-		if (i==-1)
-			break;
-		sprintf(basekey,"%s.%d",key,i);
-		printf("Our basekey is %s\n",basekey);
-		result = cw_ktv_base_exists(params->cfg,basekey);
-		if (result == NULL){
-			continue;
-		}
-
-		stack[0]++;
-		stack[stack[0]]=i;
-		len += cw_out_traverse0(handler,params,dst+len,-1,basekey,next+l+1, stack);
-		printf("Len is now %d\n", len);
-	}
-
-
-	return len;
-	*/
-	return 0;
-}
-
-int cw_out_traverse(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
-			, uint8_t * dst)
-
-{
-
-	//char current[CW_CFG_MAX_KEY_LEN];
-	//int stack[10];
-	//stack[0]=0;
-
-	//current[0]=0;
-
-	stop();
-	return 0;
-	
-//	return cw_out_traverse0(handler,params,dst,-1,current,handler->key, stack);
-}
 

src/cw/cw_setup_dtls.c

@@ -49,6 +49,8 @@ int cw_setup_dtls(struct cw_Conn *conn, cw_Cfg_t * cfg, const char *prefix,
 	sprintf(key, "%s/%s", prefix, "ssl-cipher");
 	conn->dtls_cipher = cw_cfg_get(cfg, key, default_cipher);
 
+	cw_dbg(DBG_DTLS,"Using cipher: %s",conn->dtls_cipher);
+
 	sprintf(key, "%s/%s", prefix, "ssl-psk");
 	conn->dtls_psk = (bstr16_t)cw_cfg_get(cfg, key, NULL);
 

src/cw/cw_type_array.c

@@ -0,0 +1,188 @@
+/*
+    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/>.
+
+*/
+
+#include <stdio.h>
+
+#include "cw.h"
+#include "val.h"
+#include "dbg.h"
+
+static cw_Val_t *get(cw_Val_t * data, const uint8_t * src, int len)
+{
+	data->type = &cw_type_byte;
+	data->val.byte = cw_get_byte(src);
+	return data;
+}
+
+static int put(const cw_Val_t *data, uint8_t * dst)
+{
+	return cw_put_byte(dst, data->val.byte);
+}
+
+static const char * get_guardstr(int val, const cw_ValValRange_t * valrange)
+{
+	if (valrange==NULL)
+		return NULL;
+
+	while(valrange->name!=NULL){
+		if(val>=valrange->min && val<=valrange->max)
+			return valrange->name;
+		valrange++;
+	}
+	return NULL;
+}
+
+
+static int to_str(const cw_Val_t *data, char *dst, int max_len)
+{
+	if (data->valguard!=NULL){
+		const char * name;
+		name = get_guardstr(data->val.byte,data->valguard);
+		if (name != NULL){
+			return sprintf(dst,"%s",name);
+		}
+	}
+	
+		/*if (max_len<3){
+			return 0;
+		}*/
+	return sprintf(dst, "%d", data->val.byte);
+
+}
+
+static int get_guardval(const char *str, const cw_ValValRange_t * valrange)
+{
+	while(valrange->name!=NULL){
+		if(strcmp(str,valrange->name)==0)
+			return valrange->min;
+		valrange++;
+	}
+	return -1;
+}
+
+
+static cw_Val_t *from_str(cw_Val_t * data, const char *src)
+{
+	data->type = &cw_type_byte;
+	if (data->valguard != NULL){
+		int rc;
+		rc = get_guardval(src,data->valguard);
+		if (rc != -1){
+			data->val.byte = rc;
+			return data;
+		}
+		
+	}
+	
+
+	data->val.byte = atoi(src);
+	return data;
+}
+
+static int len (cw_Val_t * data)
+{
+	return sizeof(data->val.byte);
+}
+
+static void * data(cw_Val_t * data)
+{
+	return &data->val.byte;
+}
+
+static const char * get_type_name(cw_Val_t *data)
+{
+	if (data->valguard != NULL){
+		return CW_TYPE_STR->name;
+	}
+	return CW_TYPE_BYTE->name;
+}
+
+static int cast(cw_Val_t * data)
+{
+	if (strcmp(data->type->name,CW_TYPE_BYTE->name)==0)
+		return 1;
+	if (strcmp(data->type->name,CW_TYPE_STR->name)==0){
+		char *src = data->val.ptr;
+		CW_TYPE_BYTE->from_str(data,src);
+		free(src);
+		return 1;
+	}
+	return 0;
+}
+
+static int bread(cw_Cfg_t *cfg, const char * key, const uint8_t *src, int len, const void *param)
+{
+	uint8_t n,i;
+	int l;
+	char skey[CW_CFG_MAX_KEY_LEN];
+	const struct cw_ValArrayDef * def = param;
+
+	
+	const int (*fun)(cw_Cfg_t*,const char *k,const uint8_t *s,int len,const void *p,int *l) = def->get_count;
+
+	n = fun(cfg,key,src,len,param,&l);
+
+	for (i=0; i<n && l<len; i++){
+		sprintf(skey,"%s.%d",key,i);
+//		printf("SKEY: %s\n",skey);
+		l+=def->type->read(cfg,skey,src,len,def->param);
+	}
+
+	return l;
+
+}
+
+static 	int bwrite(cw_Cfg_t ** cfgs, const char *key, uint8_t *dst, const void * param)
+{
+	int i,l;
+	char skey[CW_CFG_MAX_KEY_LEN];
+	const struct cw_ValArrayDef * def = param;
+	const int (*fun)(cw_Cfg_t**,const char *k, uint8_t *s,const void *p,int l) = def->put_count;
+
+
+	i=0,l=0;
+	do {
+		sprintf(skey,"%s.%d",key,i);
+//		printf("iSKEY %s\n",skey);
+		i++;
+		if (cw_cfg_get_l(cfgs,skey,NULL)==NULL){
+			break;
+		}
+		l+=def->type->write(cfgs,skey,dst,def->param);
+	}while(1);
+
+//	printf("LEN: %d (K: %s)\n",l,key);
+	fun(cfgs,key,dst,param,l);
+	return l;
+}
+
+const struct cw_Type cw_type_array = {
+	"Array",			/* name */
+	NULL,			/* del */
+	put,			/* put */
+	get,			/* get */
+	to_str,			/* to_str */
+	from_str,		/* from_str */ 
+	len,			/* len */
+	data,			/* data */
+	get_type_name,		/* get_type_name */
+	cast,
+	bread,
+	bwrite
+
+};

src/cw/cw_type_struct.c

@@ -81,6 +81,7 @@ static int write_struct(cw_Cfg_t ** cfgs,  const cw_ValStruct_t * stru, const ch
 	int pos, i;
 	const char * result;
 	int wrlen;
+	int rc;
 
 	cw_Val_t val;
 	memset(&val,0,sizeof(cw_Val_t));
@@ -100,7 +101,9 @@ static int write_struct(cw_Cfg_t ** cfgs,  const cw_ValStruct_t * stru, const ch
 		else	
 			sprintf(key,"%s",pkey);
 
-		result = cw_cfg_get_l(cfgs,key,NULL);
+	//	result = cw_cfg_get_l(cfgs,key,NULL);
+		rc = cw_cfg_base_exists_l(cfgs,key);
+//		printf("Base? :%s, %d\n",key,rc);
 		if(result) {
 //			char s[2048];
 //			result->type->to_str(result,s,2048);
@@ -108,9 +111,15 @@ static int write_struct(cw_Cfg_t ** cfgs,  const cw_ValStruct_t * stru, const ch
 		}	
 
 		
-		if (result == NULL){
+		if (!rc){
-			cw_log(LOG_ERR,"Can't put %s, no value found, filling wth zeros.",key);
+			int l;
-			memset(dst+pos,0,stru[i].len);
+			cw_log(LOG_ERR,"Can't put %s, no value found, filling with zeros.",key);
+			l = stru[i].len;
+			if (l==-1)
+				l = 0;
+
+			memset(dst+pos,0,l);
+			wrlen=l;
 		}
 		else{
 			struct cw_Type * type;

src/cw/dbg.c

@@ -90,7 +90,8 @@ static struct cw_StrListElem theme0[] = {
 	{DBG_RFC, ANSI_BRED},
 	{DBG_X, "\x1b[31m"},
 	{DBG_WARN, ANSI_CYAN},
-	{DBG_MOD, ANSI_WHITE},
+	{DBG_MOD_DETAIL, ANSI_WHITE},
+	{DBG_MOD, ANSI_BBLACK ANSI_BOLD },
 //	{DBG_CFG_DMP, ANSI_BCYAN }, 
 	{DBG_CFG_UPDATES,ANSI_GREEN},	
 
@@ -134,6 +135,7 @@ static struct cw_StrListElem prefix[] = {
 	{DBG_DTLS_DETAIL,	 "DTLS - "},
 	{DBG_WARN,	 	"  Warning - "},
 	{DBG_MOD, 		"Mod - "},
+	{DBG_MOD_DETAIL,	"Mod - "},
 	{DBG_STATE, 		"STATEMACHINE - "},
 	{DBG_CFG_UPDATES,	"Cfg - "},
 

src/cw/dbg.h

@@ -125,6 +125,9 @@ enum cw_dbg_levels{
 	
 
 	DBG_X		= (1<<30),
+
+	DBG_MOD_DETAIL	= (1<<31),
+
 	DBG_ALL 	= (0x7fffffff),
 
 

src/cw/dbg_strings.c

@@ -65,6 +65,7 @@ struct cw_StrListElem cw_dbg_strings[] = {
 	{ DBG_DTLS_DETAIL, 	"dtls_detail"},
 
 	{ DBG_CFG_UPDATES, 	"cfg_updates" },
+	{ DBG_X,		"x" },
 
 	
 //	{DBG_CFG_DMP, "cfg_dmp" },
@@ -121,7 +122,7 @@ struct cw_dbg_cfgstrs cw_dbg_cfgstrs[] = {
 	{"elem_err",DBG_ELEM_ERR},
 
 	{"dtls",DBG_DTLS},
-	{"dtls_dietail",DBG_DTLS_DETAIL},
+	{"dtls_detail",DBG_DTLS_DETAIL},
 	{"dtls_bio",DBG_DTLS_BIO},
 	{"dtls_bio_dmp",DBG_DTLS_BIO_DMP},
 

src/cw/dtls_openssl.c

@@ -305,7 +305,10 @@ static unsigned int psk_server_cb(SSL *ssl,const char *identity, unsigned char *
 */
 
 
-
+static unsigned int timer_cb(SSL *s, unsigned int timer_us)
+{
+	return 5000000;
+}
 
 struct dtls_openssl_data * dtls_openssl_data_create(struct cw_Conn * conn, const SSL_METHOD * method, BIO_METHOD * bio)
 {
@@ -322,7 +325,7 @@ struct dtls_openssl_data * dtls_openssl_data_create(struct cw_Conn * conn, const
 		return NULL;
 	}
 
-	rc = SSL_CTX_get_security_level(d->ctx);
+//	rc = SSL_CTX_get_security_level(d->ctx);
 
 	SSL_CTX_set_security_level(d->ctx,0);
 
@@ -338,6 +341,8 @@ struct dtls_openssl_data * dtls_openssl_data_create(struct cw_Conn * conn, const
 		return 0;
 	}
 
+
+
 	/* set dtls psk if exists */
 /*	if (conn->dtls_psk)
 		SSL_CTX_set_psk_server_callback( d->ctx, psk_server_cb);
@@ -456,6 +461,7 @@ struct dtls_openssl_data * dtls_openssl_data_create(struct cw_Conn * conn, const
 		return 0;
 	}
 
+	DTLS_set_timer_cb(d->ssl,timer_cb);
 	
 	d->bio = BIO_new(bio);
 /*	d->bio->ptr = conn;*/

src/cw/lwapp.h

@@ -151,7 +151,7 @@
 
 #define LW_ELEM_CERTIFICATE				44
 #define LW_ELEM_WTP_BOARD_DATA				50
-#define LW_BCAST_SSID_MODE				51
+#define LWAPP_ELEM_BCAST_SSID_MODE			51
 #define LW_ELEM_WTP_MODE_AND_TYPE			54
 #define LW_ELEM_QOS					57
 

src/cw/message.c

@@ -38,16 +38,16 @@ int cw_encode_elements(struct cw_ElemHandlerParams *params, mlist_t elements_lis
 			}
 			continue;
 		}
-
+/*
 		if (!data->mand){
 			if (!cw_cfg_base_exists(params->cfg_list[0],handler->key)){
-				cw_dbg(DBG_MSG_COMPOSE,"    Add Elem: %d %d %d %s - (skip)", 
+				cw_dbg(DBG_MSG_COMPOSE,"    Add Elem: %d %d %d %s %s - (skip)", 
-						data->proto, data->vendor, data->id, handler->name);
+						data->proto, data->vendor, data->id, handler->name, handler->key);
 
 				continue;
 			}
 		}
-
+*/
 
 		l = handler->put(handler,params,dst+len);
 		cw_dbg(DBG_MSG_COMPOSE,"    Add Elem: %d %d %d %s - (%d bytes)", 
@@ -233,6 +233,10 @@ int cw_decode_element(struct cw_ElemHandlerParams *params, int proto,
 
 	/* check the length of the message */
 	if (len < handler->min_len) {
+		if (!handler->flags || cw_dbg_is_level(DBG_ELEM_VNDR))
+			cw_dbg_elem(params->dbg_level, NULL, params->msgdata->type, handler,
+				    data, len);
+		
 		cw_dbg(DBG_ELEM_ERR,
 		       "%d (%s) message element too short, len=%d, min len=%d",
 		       handler->id, handler->name, len, handler->min_len);
@@ -246,6 +250,10 @@ int cw_decode_element(struct cw_ElemHandlerParams *params, int proto,
 
 
 	if (len > handler->max_len && handler->max_len) {
+		if (!handler->flags || cw_dbg_is_level(DBG_ELEM_VNDR))
+			cw_dbg_elem(params->dbg_level, NULL, params->msgdata->type, handler,
+				    data, len);
+			
 		cw_dbg(DBG_ELEM_ERR,
 		       "%d (%s) message element too big, len=%d, max len=%d",
 		       handler->id, handler->name, len, handler->max_len);

src/cw/mod.c

@@ -139,14 +139,14 @@ struct cw_Mod *cw_mod_load(const char *mod_name, cw_Cfg_t * global_cfg, int role
 	/* Search for the module in mods_loaded, to see if it is
 	 * already loaded or was statically linked */
 
-	cw_dbg(DBG_MOD, "MOD: Load module '%s'", mod_name);
+	cw_dbg(DBG_MOD, "Loading module '%s'.", mod_name);
 
 	memset(&search, 0, sizeof(search));
 	search.name = mod_name;
 
 	mod = mavl_get_ptr(mods_loaded, &search);
 	if (mod) {
-		cw_dbg(DBG_MOD, "MOD: Module already loaded '%s'", mod_name);
+		cw_dbg(DBG_MOD, "Module already loaded: '%s'.", mod_name);
 		return mod;
 	}
 
@@ -165,7 +165,7 @@ struct cw_Mod *cw_mod_load(const char *mod_name, cw_Cfg_t * global_cfg, int role
 	if (filename == NULL)
 		return NULL;
 
-	cw_dbg(DBG_MOD, "MOD: loading module from file: %s", filename);
+	cw_dbg(DBG_MOD, "Loading module from file: %s", filename);
 
 	/* Open the DLL */
 	handle = dlopen(filename, RTLD_NOW);
@@ -189,8 +189,11 @@ struct cw_Mod *cw_mod_load(const char *mod_name, cw_Cfg_t * global_cfg, int role
 		goto errX;
 	}
 
-	cw_dbg(DBG_MOD, "MOD: %s sucessfull loaded, calling init now.", filename);
+	cw_dbg(DBG_MOD, "Module %s sucessfull loaded, calling init now.", filename);
-	mod->init(mod, global_cfg, role);
+	if (!mod->init(mod, global_cfg, role)){
+		dlclose(handle);
+		mod=NULL;
+	}		
 	
       errX:
 	free(filename);

src/cw/msgset.c

@@ -223,7 +223,7 @@ static int update_msgdata(struct cw_MsgSet *set, struct cw_MsgData *msgdata,
 				break;
 				continue;
 			case CW_DELETE:
-				cw_dbg(DBG_MOD, "  deleting message element %d %d %d - %s",
+				cw_dbg(DBG_MOD_DETAIL, "  deleting message element %d %d %d - %s",
 				       elemdef->proto,
 				       elemdef->vendor, elemdef->id, handler->name);
 				
@@ -248,11 +248,11 @@ static int update_msgdata(struct cw_MsgSet *set, struct cw_MsgData *msgdata,
 		result = mavl_replace(msgdata->elements_tree, &ed, &replaced);
 
 		if (!replaced) {
-			cw_dbg(DBG_MOD, "  adding message element %d %d %d - %s",
+			cw_dbg(DBG_MOD_DETAIL, "  adding message element %d %d %d - %s",
 			       elemdef->proto,
 			       elemdef->vendor, elemdef->id, handler->name);
 		} else {
-			cw_dbg(DBG_MOD, "  replacing message element %d %d %d - %s",
+			cw_dbg(DBG_MOD_DETAIL, "  replacing message element %d %d %d - %s",
 			       elemdef->proto,
 			       elemdef->vendor, elemdef->id, handler->name);
 		}
@@ -275,7 +275,7 @@ static int update_msgdata(struct cw_MsgSet *set, struct cw_MsgData *msgdata,
 						    result->vendor, result->id);
 		if (result->mand){
 			mlist_append_ptr(msgdata->mand_keys,(void*)handler->key);
-			cw_dbg(DBG_MOD,"    Add mandatory key: %s",handler->key);
+			cw_dbg(DBG_MOD_DETAIL,"    Add mandatory key: %s",handler->key);
 		}
 		/*//printf("Have Result %d %d - %s\n",result->id,result->mand, handler->key);*/
 	}
@@ -294,7 +294,7 @@ int cw_msgset_add(struct cw_MsgSet *set,
 	struct cw_MsgDef *msgdef;
 	/* Create mavl for all handlers */
 	for (handler = handlers; handler->id; handler++) {
-		cw_dbg(DBG_MOD, "Adding handler for element %d - %s - with key: %s",
+		cw_dbg(DBG_MOD_DETAIL, "Adding handler for element %d - %s - with key: %s",
 		       handler->id, handler->name, handler->key);
 		mavl_replace(set->handlers_by_id, handler, NULL);
 		mavl_replace(set->handlers_by_key, handler, NULL);
@@ -339,7 +339,7 @@ int cw_msgset_add(struct cw_MsgSet *set,
 		msg->receiver = msgdef->receiver;
 
 
-		cw_dbg(DBG_MOD, "Add message Type:%d - %s ", msgdef->type, msgdef->name);
+		cw_dbg(DBG_MOD_DETAIL, "Add message Type:%d - %s ", msgdef->type, msgdef->name);
 
 
 		update_msgdata(set, msg, msgdef);
@@ -376,7 +376,7 @@ int cw_msgset_add_states(struct cw_MsgSet * set, cw_StateMachineState_t * states
 		else{
 			repstr = "Adding";
 		}
-		cw_dbg(DBG_MOD,"%s machine state : [%s->%s]",repstr,
+		cw_dbg(DBG_MOD_DETAIL,"%s machine state : [%s->%s]",repstr,
 			cw_strstate(s->prevstate),
 			cw_strstate(s->state));
 		s++;

src/cw/radioinfo.h

@@ -1,51 +0,0 @@
-/*
-    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

src/cw/unused/bstr16_create_from_cfgstr.c

@@ -1,89 +0,0 @@
-/*
-    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/>.
-
-*/
-
-/**
- * @file
- * @brief bstr_create_from_cfgstr function
- */
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "bstr.h"
-
-
-/**
- * Create a bstr16_t string from a string read from config file.
- * 
- * @param s String from config file.
- * @return The create bstr_t string.
- *
- * The string from config file is an ASCII-text which is interpreted
- * as hexadecimal string if it starts with ".x"
- *
- * @see bstr16_t
- */
-uint8_t * bstr16_create_from_cfgstr(const char * s)
-{
-	int l = strlen(s);
-
-	
-	if (s[0]!='.')
-		return bstr16_create((uint8_t*)s,l);
-
-	if (l<=2)
-		return bstr16_create((uint8_t*)s,l);
-
-	if (s[1]=='.')
-		return bstr16_create((uint8_t*)s+1,l-1);
-
-	if (s[1]=='x'){
-		uint8_t * ns=0;
-		int len=0;
-
-		int ch,cl;
-		const char *ss = s+2;
-		int rc ;
-		do {
-			rc = sscanf(ss,"%01X",&ch);
-			if (rc!=1)
-				break;
-			ss++;
-			rc = sscanf(ss,"%01X",&cl);
-			if (rc!=1)
-				cl=0;
-			ss++;
-			int c=(ch<<4) | cl;
-			
-			len++;
-			ns = realloc(ns,len);
-			ns[len-1]=c;
-
-
-		}while (rc==1);
-
-
-		return bstr16_create(ns,len);
-
-	}
-
-	return NULL;
-}
-
-

src/cw/unused/bstr16cfgstr.c

@@ -1,67 +0,0 @@
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "bstr.h"
-
-
-/**
- * Create a bstr1616_t string from a string read from config file.
- * 
- * @param s String from config file.
- * @return The create bstr16_t string.
- *
- * The string from config file is an ASCII-text which is interpreted
- * as hexadecimal string if it starts with ".x"
- *
- * @see bstr16_t
- */
-uint8_t * bstr16cfgstr(const char * s)
-{
-	int l = strlen(s);
-
-	
-	if (s[0]!='.')
-		return bstr16_create((uint8_t*)s,l);
-
-	if (l<=2)
-		return bstr16_create((uint8_t*)s,l);
-
-	if (s[1]=='.')
-		return bstr16_create((uint8_t*)s+1,l-1);
-
-	if (s[1]=='x'){
-		uint8_t * ns=0;
-		int len=0;
-
-		int ch,cl;
-		const char *ss = s+2;
-		int rc ;
-		do {
-			rc = sscanf(ss,"%01X",&ch);
-			if (rc!=1)
-				break;
-			ss++;
-			rc = sscanf(ss,"%01X",&cl);
-			if (rc!=1)
-				cl=0;
-			ss++;
-			int c=(ch<<4) | cl;
-			
-			len++;
-			ns = realloc(ns,len);
-			ns[len-1]=c;
-
-
-		}while (rc==1);
-
-
-		return bstr16_create(ns,len);
-
-
-	}
-	return NULL;
-}
-
-

src/cw/unused/bstr_create_from_cfgstr.c

@@ -1,90 +0,0 @@
-/*
-    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/>.
-
-*/
-
-/**
- * @file
- * @brief bstr_create_from_cfgstr function
- */
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "bstr.h"
-
-
-/**
- * Create a bstr_t string from a string read from config file.
- * 
- * @param s String from config file.
- * @return The create bstr_t string.
- *
- * The string from config file is an ASCII-text which is interpreted
- * as hexadecimal string if it starts with ".x"
- *
- * @see bstr_t
- */
-uint8_t * bstr_create_from_cfgstr(const char * s)
-{
-	int l = strlen(s);
-
-	
-	if (s[0]!='.')
-		return bstr_create((uint8_t*)s,l);
-
-	if (l<=2)
-		return bstr_create((uint8_t*)s,l);
-
-	if (s[1]=='.')
-		return bstr_create((uint8_t*)s+1,l-1);
-
-	if (s[1]=='x'){
-		uint8_t * ns=0;
-		int len=0;
-
-		int ch,cl;
-		const char *ss = s+2;
-		int rc ;
-		do {
-			rc = sscanf(ss,"%01X",&ch);
-			if (rc!=1)
-				break;
-			ss++;
-			rc = sscanf(ss,"%01X",&cl);
-			if (rc!=1)
-				cl=0;
-			ss++;
-			int c=(ch<<4) | cl;
-			
-			len++;
-			ns = realloc(ns,len);
-			ns[len-1]=c;
-
-
-		}while (rc==1);
-
-
-		return bstr_create(ns,len);
-
-
-	}
-
-	return NULL;
-}
-
-

src/cw/unused/bstr_to_str.c

@@ -1,38 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-#include "bstr.h"
-#include "cw_util.h"
-
-int bstr_to_str(char *dst, bstr_t str,char * def)
-{
-	if (!str){
-		if (!def) 
-			return 0;
-		return sprintf(dst,"%s",def);
-	}
-
-	int printable = cw_is_printable(bstr_data(str),bstr_len(str));
-	int l=bstr_len(str);
-
-	if (printable){
-		memcpy((char*)dst,bstr_data(str),l);
-		*(dst+l)=0;
-		return l;
-	}
-
-	int i;
-	int c=0;
-	char *s = dst; 
-	for (i=0; i<l; i++){
-		if (!c){
-
-			s += sprintf(s,"%02X",bstr_data(str)[i]);
-			c=1;
-		}
-		else
-			s += sprintf(s,",%02X",bstr_data(str)[i]);
-	}	
-
-	return s-dst;
-}

src/cw/unused/capwap80211_type_rateset.c

@@ -1,126 +0,0 @@
-#include <stdio.h>
-
-#include "capwap80211_types.h"
-#include "dot11.h"
-
-
-
-/*
-
-static int to_str(void *item,char *dst)
-{
-	mbag_item_t *it= item;
-
-	uint8_t *data = (uint8_t*)it->u2.data;
-	int n=*data;
-	data++;
-
-	char *d=dst;
-	char *space="";
-	int i;
-	for (i=0; i<n; i++){
-		int val = data[i];
-
-
-		d+=sprintf(d,"%s",space);
-		if (val & 0x80){
-			d+=sprintf(d,"*");
-		}
-		
-		d+=sprintf(d,"%0.1f",dot11_rate2float(val & 0x7f));
-
-		space=" ";
-
-	}
-
-	return d-dst;	
-}
-
-
-
-static struct mbag_item *  from_str(const char *src)
-{
-	mbag_item_t * item = mbag_item_new(CAPWAP80211_TYPE_RATESET);
-	if (!item)
-		return NULL;
-
-	if (strlen(src)==0)
-		return 0;
-
-	uint8_t rates[64];
-	int nrates =0;
-
-	const char *s = src;
-
-	while (*s!=0){
-		while (*s==' ') 
-			s++;
-		int m=0;
-		if(*s=='*'){
-			m=0x80;
-			s++;
-		}
-		else{
-			m=0;
-		}
-	
-		float val;
-		int n=sscanf(s,"%f",&val);
-		if (n!=1)
-			break;
-		
-		int r = dot11_float2rate(val) | m;
-
-		rates[nrates++]=r;
-
-
-		while (*s!=0 && *s!=' ')
-			s++;
-
-	}
-
-	uint8_t *data = malloc(nrates+1);
-	*data=nrates;
-	memcpy(data+1,rates,nrates);
-
-	item->u2.data=data;
-
-
-	return item;
-}
-
-static struct mbag_item *  get(const uint8_t *src,int len)
-{
-
-	mbag_item_t * item = mbag_item_new(CAPWAP80211_TYPE_RATESET);
-	if (!item)
-		return NULL;
-
-	uint8_t *data = malloc(len+1);
-	if (!data){
-		free (item);
-		return NULL;
-	}
-	*data=len;
-	memcpy(data+1,src,len);
-	item->u2.data=data;
-	return item;
-}
-
-static  int put(struct mbag_item *i,uint8_t *dst)
-{
-	int l=*((uint8_t*)(i->u2.data));
-	memcpy(dst,i->u2.data+1,l);
-	return l;
-}
-
-
-const struct mbag_typedef capwap80211_type_rateset = {
-	.name = "802.11 Rate Set",
-	.del = free,
-	.from_str = from_str,
-	.to_str = to_str,
-	.get = get,
-	.put = put
-};
-*/

src/cw/unused/capwap_cisco_inline.c

@@ -1,59 +0,0 @@
-
-
-/**
- * Add a Cisco AP Timesync message element to a buffer
- * @param dst destination buffer
- * @param time a unix timestamp
- * @param type of time
- * @return number of bytes put (5)
- */
-/*
-int cw_put_cisco_ap_timesync(uint8_t * dst, time_t time, uint8_t type)
-{
-	cw_put_dword(dst , time);
-	cw_put_byte(dst + 4, type);
-	return 5;
-
-}
-*/
-
-/*
-int cw_addelem_cisco_ap_regulatory_domain(uint8_t *dst, struct radioinfo * ri){
-	uint8_t *d=dst+10;
-	
-	d+=cw_put_byte(d,ri->rid);	// Band ID 
-	d+=cw_put_byte(d,1);		// Set True/False 
-	d+=cw_put_byte(d,ri->rid);	// Slot ID 
-	d+=cw_put_word(d,ri->regDomain);
-	return 5 + cw_put_elem_vendor_hdr(dst, CW_VENDOR_ID_CISCO, CW_CISCO_AP_REGULATORY_DOMAIN, 5);
-}
-*/
-
-/** 
- * Add a Cisco Certificate payload message element
- * @param dst destination buffer
- * @param src pointer to DER certificate
- * @param len length of certificate
- * @return number of bytes put
- */
-/*
-int cw_addelem_cisco_certificate(uint8_t*dst,uint8_t*src,int len){
-	int l = lw_put_certificate(dst+10,src,len);
-	return l+cw_put_elem_vendor_hdr(dst,CW_VENDOR_ID_CISCO,CW_CISCO_CERTIFICATE,l);
-}
-*/
-
-/*
-int cw_addelem_cisco_wtp_radio_cfg(uint8_t * dst,struct radioinfo *ri){
-	int l = lw_put_80211_wtp_wlan_radio_configuration(dst+10,ri);
-	return l+cw_put_elem_vendor_hdr(dst,CW_VENDOR_ID_CISCO,CW_CISCO_STATION_CFG,l);
-}
-*/
-
-/*
-int cw_readelem_cisco_station_cfg(uint8_t *src,int len){
-	
-//	lw_readelem_
-	return 0;
-}
-*/

src/cw/unused/cisco.c

@@ -1,175 +0,0 @@
-#include "capwap.h"
-
-
-
-#include "radio.h"
-#include "log.h"
-#include "dbg.h"
-
-/*
-int cw_put_cisco_wtp_radio_cfg(uint8_t *dst, int rid, mbag_t radio)
-{
-
-	cw_put_byte(dst,rid);
-
-	cw_put_byte(dst+1,0); //?
-	cw_put_word(dst+2,mbag_get_word(radio,CW_RADIO_OCCUPANCY_LIMIT,12));
-	cw_put_byte(dst+4,mbag_get_byte(radio,CW_RADIO_CFP_PERIOD,8));
-
-	cw_put_word(dst+5,mbag_get_word(radio,CW_RADIO_CFP_MAX_DURATION,200));
-
-
-	bstr_t	grmac = mbag_get_bstr(radio,CW_RADIO_BSSID,NULL);
-
-//printf("GRMAC: %d\n",bstr_len(grmac));
-	if ( grmac) {
-		if (bstr_len(grmac)!=6){
-			cw_log(LOG_ERR,"Wrong bssid size");
-exit(0);
-			grmac =NULL;
-		}
-	}
-
-	bstr_t rmac;
-
-	if (!grmac){
-		uint8_t defrmac[]={0,0,0,0,0,0};
-		rmac = bstr_create(defrmac,6);
-	}
-	else
-		rmac = grmac;
-		
-
-	cw_put_bstr(dst+7,rmac);
-
-	if ( !grmac )
-		free(rmac);
-	
-	cw_put_word(dst+13,0); // beacon period
-
-
-	cw_put_data(dst+15,mbag_get_raw(radio,CW_RADIO_COUNTRY_STRING,"DE "),3);
-	cw_put_data(dst+18,mbag_get_raw(radio,CW_RADIO_COUNTRY_STRING,"DE "),3);
-
-	cw_put_byte(dst+21,10); // gPeriod
-
-	cw_put_dword(dst+22,0x3538);	// ?
-
-	cw_put_word(dst+26,0);
-
-	return 26+2; //+cw_put_elem_vendor_hdr(dst,CW_VENDOR_ID_CISCO,CW_CISCO_WTP_RADIO_CFG,28);
-}
-
-*/
-
-/*
-int cw_put_elem_cisco_ap_regulatory_domain(uint8_t *dst,int rid, mbag_t radio)
-{
-	//int l=0;
-	uint8_t *d=dst+10;
-	
-	d+=cw_put_byte(d,rid);		//Band ID 
-	d+=cw_put_byte(d,1);		// Set True/False 
-	d+=cw_put_byte(d,rid);		//* Slot ID 
-	d+=cw_put_word(d,mbag_get_word(radio,CW_RADIO_REG_DOMAIN,1));
-
-	return 5 + cw_put_elem_vendor_hdr(dst, CW_VENDOR_ID_CISCO, CW_CISCO_AP_REGULATORY_DOMAIN, 5);
-	
-
-}
-
-*/
-
-/*
-int cw_put_elem_cisco_radio_cfg(uint8_t * dst,int rid, mbag_t radio)
-{
-	int l = cw_put_cisco_wtp_radio_cfg(dst+10,rid,radio);
-	return l+cw_put_elem_vendor_hdr(dst,CW_VENDOR_ID_CISCO,CW_CISCO_WTP_RADIO_CFG,l);
-}
-
-int cw_out_cisco_wtp_radio_cfg(struct conn *conn, struct cw_action_out *a, uint8_t * dst)
-{
-
-	int l=0;
-	MAVLITER_DEFINE(it,conn->radios);
-	mavliter_foreach(&it){
-		struct mbag_item *i = mavliter_get(&it);
-		if ( i->type != MBAG_MBAG ) {
-			continue;
-		}
-//		l+=cw_put_elem_radio_info(dst+l,i->id,i->data);
-		l+=cw_put_elem_cisco_radio_cfg(dst+l,i->u1.iid,i->u2.data);
-		l+=cw_put_elem_cisco_ap_regulatory_domain(dst+l,i->u1.iid,i->u2.data);
-
-	}
-	return l;
-
-
-
-
-
-
-
-//	MAVLITER_DEFINE
-//	int l = cw_out_cisco_wtp_radio_cfg_(conn,a,dst,0);
-
-//	return l+cw_out_cisco_wtp_radio_cfg_(conn,a,dst+l,1);
-}
-
-
-
-
-
-
-int cw_in_cisco_radio_cfg(struct conn *conn, struct cw_action_in *a, uint8_t * data, int len,
-		  struct sockaddr *from)
-{
-
-	int rid = cw_get_byte(data);
-	mbag_t radio = mbag_i_get_mbag(conn->radios,rid,NULL);
-	if ( !radio){
-		cw_dbg(DBG_ELEM_ERR,"Radio ID %d not defined",rid);
-		return 0;
-	}
-
-	
-//	printf("Here we are %d\n",rid);
-	return 0;
-}
-
-
-int cw_radio_cisco_set_state(struct conn * conn, uint8_t *data, int len, int cause)
-{
-
-	int rid = cw_get_byte(data);
-	int state = cw_get_byte(data+1);
-	if (rid != 255)
-		return cw_radio_set_admin_state(conn->radios,rid,state,cause);
-
-
-	MAVLITER_DEFINE(it,conn->radios);
-	mavliter_foreach(&it){
-		mbag_item_t *i = mavliter_get(&it);
-		cw_radio_set_admin_state(conn->radios,i->u1.iid,state,cause);
-
-	}
-	return 1;	
-
-}
-
-
-int cw_in_cisco_radio_administrative_state(struct conn *conn, struct cw_action_in *a, uint8_t * data, int len,
-		  struct sockaddr *from)
-{
-	return cw_radio_cisco_set_state(conn,data,len,-1);	
-}
-
-
-int cw_in_cisco_radio_administrative_state_wtp(struct conn *conn, struct cw_action_in *a, uint8_t * data, int len,
-		  struct sockaddr *from)
-{
-	return cw_radio_cisco_set_state(conn,data,len,3);	
-}
-
-
-*/

src/cw/unused/conn_clear_upd.c

@@ -1,33 +0,0 @@
-
-#include "capwap.h"
-
-#include "conn.h"
-
-#include "mavl.h"
-
-/*
-void conn_clear_upd(struct conn *conn, int merge)
-{
-	if (merge){
-		mavl_merge(conn->config, conn->config_upd);
-
-		MAVLITER_DEFINE (it,conn->radios_upd);
-
-		mavliter_foreach(&it){
-			struct mbag_item * ruitem = mavliter_get(&it);
-			mavl_t radio_upd = ruitem->u2.data;
-
-			mbag_t radio = mbag_i_get_mbag(conn->radios,ruitem->u1.iid,NULL);
-			if (radio){
-				mavl_merge(radio,radio_upd);
-			}
-
-		}		
-		
-	}
-	mavl_del_all(conn->config_upd);
-	mavl_del_all(conn->radios_upd);
-
-}
-
-*/

src/cw/unused/cw_addelem_cisco_wtp_radio_cfg.c

@@ -1,26 +0,0 @@
-#include "capwap.h"
-#include "cw.h"
-
-int cw_addelem_cisco_wtp_radio_cfg(uint8_t*dst,struct radioinfo *ri)
-{
-	cw_put_byte(dst+10,ri->rid);
-	cw_put_byte(dst+10+1,0);
-	cw_put_word(dst+10+2,ri->occupancy_limit);
-	cw_put_byte(dst+10+4,ri->cfp_period);
-	cw_put_word(dst+10+5,ri->cfp_max_duration);
-
-	/* XXX catch rmac shorter or longer than 6*/
-
-	cw_put_bstr(dst+10+7,ri->rmac);	/* length MUST be 6 */
-	
-	cw_put_word(dst+10+13,ri->beacon_period);
-	cw_put_data(dst+10+15,ri->country_str,3);
-	cw_put_data(dst+10+18,ri->country_str2,3);
-
-	cw_put_byte(dst+10+21,10); // gPeriod
-
-	cw_put_dword(dst+10+22,0x3538);	// ?
-
-/*	return 28+cw_put_elem_vendor_hdr(dst,CW_VENDOR_ID_CISCO,CW_CISCO_WTP_RADIO_CFG,28);*/
-}
-

src/cw/unused/cw_in_80211_mac_operation.c

@@ -1,18 +0,0 @@
-#include "cw.h"
-#include "dbg.h"
-#include "cw_80211.h"
-
-/*
-int cw_in_80211_mac_operation(struct conn *conn, struct cw_action_in *a, uint8_t * data,
-			 int len, struct sockaddr *from)
-{
-	int rid = cw_get_byte(data);
-	mbag_t r = mbag_i_get_mbag(conn->radios,rid,NULL);
-	if (!r){
-		cw_dbg(DBG_ELEM_ERR,"Radio %d not defined. Can't set mac operation.");
-		return 0;
-	}
-
-	return cw_read_80211_mac_operation(data+2,r);
-}
-*/

src/cw/unused/cw_in_cisco_image_identifier.c

@@ -1,38 +0,0 @@
-
-
-#include "dbg.h"
-
-#include "capwap.h"
-
-
-/*
-int cw_in_cisco_image_identifier(struct conn *conn,struct cw_action_in * a,uint8_t *data,int len,struct sockaddr *from)
-{
-
-	if (len<a->min_len) {
-		cw_dbg(DBG_ELEM_ERR,"Message element too short, %d < %d", len,a->min_len);
-		return 0;
-	}
-
-	uint32_t vendor_id = cw_get_dword(data);
-	int dstart;
-
-	switch (vendor_id) {
-		case CW_VENDOR_ID_ZYXEL:
-		case CW_VENDOR_ID_CISCO:
-		case CW_VENDOR_ID_FSF:
-		case 0:
-			dstart=4;
-			len-=4;
-			break;
-		default:
-			vendor_id=CW_VENDOR_ID_CISCO;
-			dstart=0;
-	}
-
-//	mbag_set(conn->remote,a->item_id,a->itemtype,data+dstart,len);
-//	mbag_set_bstrv(conn->incomming,a->item_id,vendor_id,data+dstart,len);
-	return 1;
-}
-
-*/

src/cw/unused/cw_in_radio_administrative_state.c

@@ -1,22 +0,0 @@
-
-
-
-#include "dbg.h"
-#include "log.h"
-
-#include "cw.h"
-#include "radio.h"
-
-
-
-int cw_in_radio_administrative_state(struct conn *conn, struct cw_action_in *a, uint8_t * data, int len,
-		  struct sockaddr *from)
-{
-/*	int rid = cw_get_byte(data);
-	int state = cw_get_byte(data+1);
-	return cw_radio_set_admin_state(conn->radios,rid,state,-1);
-*/
-}
-
-
-

src/cw/unused/cw_in_radio_administrative_state_wtp.c

@@ -1,26 +0,0 @@
-
-
-
-#include "dbg.h"
-#include "log.h"
-
-#include "capwap.h"
-#include "radio.h"
-
-
-
-
-int cw_in_radio_administrative_state_wtp(struct conn *conn, struct cw_action_in *a, uint8_t * data, int len,
-		  struct sockaddr *from)
-{
-
-	if (!cw_in_radio_administrative_state(conn,a,data,len,from) ) 
-		return 0; 
-
-
-	return 1;
-
-}
-
-
-

src/cw/unused/cw_in_wtp_board_data.c

@@ -1,123 +0,0 @@
-/*
-    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/>.
-
-*/
-
-
-#include <stdlib.h>
-#include <string.h>
-
-
-
-#include "cw.h"
-
-
-
-
-#include "cw_util.h"
-#include "dbg.h"
-
-
-/*
-static void readsubelems_wtp_board_data(mbag_t itemstore, uint8_t * msgelem,
-					int len)
-{
-	if (len<4)
-		return;
-
-	int i = 0;
-//	uint32_t val;
-	do {
-//		val = ntohl(*((uint32_t *) (msgelem + i)));
-//		int subtype = (val >> 16) & 0xffff;
-//		int sublen = val & 0xffff;
-//
-		int subtype = cw_get_word(msgelem+i);
-		int sublen = cw_get_word(msgelem+i+2);
-		i += 4;
-		if (sublen + i > len) {
-			cw_dbg(DBG_ELEM_ERR,
-			       "WTP Board data sub-element too long, type=%d,len=%d",
-			       subtype, sublen);
-			return;
-		}
-
-		cw_dbg(DBG_SUBELEM, "board data sub-element, type=%d (%s), len=%d",
-		       subtype, cw_strboardelem(subtype),sublen);
-
-		cw_dbg_dmp(DBG_SUBELEM,msgelem+i,sublen,"Dump...");
-
-		switch (subtype) {
-			case CW_BOARDDATA_MODELNO:
-				mbag_set_bstrn(itemstore,
-						       CW_ITEM_WTP_BOARD_MODELNO,
-						       msgelem + i, sublen);
-				break;
-			case CW_BOARDDATA_SERIALNO:
-				mbag_set_bstrn(itemstore,
-						       CW_ITEM_WTP_BOARD_SERIALNO,
-						       msgelem + i, sublen);
-
-				break;
-			case CW_BOARDDATA_MACADDRESS:
-				mbag_set_bstrn(itemstore,
-						       CW_ITEM_WTP_BOARD_MACADDRESS,
-						       msgelem + i, sublen);
-
-				break;
-			case CW_BOARDDATA_BOARDID:
-				mbag_set_bstrn(itemstore, CW_ITEM_WTP_BOARD_ID,
-						       msgelem + i, sublen);
-				break;
-			case CW_BOARDDATA_REVISION:
-				mbag_set_bstrn(itemstore,
-						       CW_ITEM_WTP_BOARD_REVISION,
-						       msgelem + i, sublen);
-			default:
-				break;
-		}
-		i += sublen;
-
-	} while (i < len);
-}
-
-*/
-
-/**
- * Parse a WTP Board Data messag element and put results to itemstore.
- */
- 
- 
- /*
-int cw_in_wtp_board_data(struct conn *conn, struct cw_action_in *a, uint8_t * data,
-			 int len, struct sockaddr *from)
-{
-
-	if (len < 4) {
-		cw_dbg(DBG_ELEM_ERR,
-		       "Discarding WTP_BOARD_DATA msgelem, wrong size, type=%d, len=%d",
-		       a->elem_id, len);
-		return 0;
-	}
-
-	mbag_t itemstore = conn->incomming;
-	mbag_set_dword(itemstore, CW_ITEM_WTP_BOARD_VENDOR, cw_get_dword(data));
-
-	readsubelems_wtp_board_data(itemstore, data + 4, len - 4);
-
-	return 1;
-}
-*/

src/cw/unused/cw_out_80211_supported_rates.c

@@ -1,36 +0,0 @@
-#include "cw.h"
-#include "capwap80211.h"
-#include "radio.h"
-
-/*
-int cw_put_elem_80211_supported_rates(uint8_t*dst,int radio_id,mbag_t radio)
-{
-
-	struct mbag_item * sr = mbag_get(radio,CW_RADIO_SUPPORTED_RATES);
-	if (!sr)
-		return 0;
-
-	int n = cw_put_byte(dst+4,radio_id);
-
-	n+=cw_put_mbag_item(dst+5,sr);
-	return 5 + cw_put_elem_hdr(dst,CW_ELEM80211_SUPPORTED_RATES,5);
-}
-
-
-int cw_out_80211_supported_rates(struct conn *conn, struct cw_action_out *a, uint8_t * dst)
-{
-
-	int l=0;
-	MAVLITER_DEFINE(it,conn->radios);
-	mavliter_foreach(&it){
-		struct mbag_item *i = mavliter_get(&it);
-		if ( i->type != MBAG_MBAG ) {
-			continue;
-		}
-		l+=cw_put_elem_80211_supported_rates(dst+l,i->u1.iid,i->u2.data);
-	}
-	return l;
-}
-
-
-*/

src/cw/unused/cw_out_ac_name_with_priority.c

@@ -1,42 +0,0 @@
-
-
-#include "cw.h"
-
-
-#include "dbg.h"
-#include "log.h"
-
-#include "acpriolist.h"
-
-
-
-int cw_put_ac_name_with_priority(uint8_t *dst,cw_acprio_t * acprio)
-{
-	int len = strlen(acprio->name);
-	cw_put_byte(dst,acprio->prio);
-	cw_put_data(dst+1,(uint8_t*)acprio->name,len);
-	return len+1;
-	
-}
-
-int cw_out_ac_name_with_priority(struct conn *conn, struct cw_action_out *a, uint8_t * dst)
-{
-/*	cw_acpriolist_t prios = mbag_get_mavl(conn->config,CW_ITEM_AC_NAME_WITH_PRIORITY);
-	if (!prios)
-		return 0;
-	
-	uint8_t *d = dst;
-	
-	MAVLITER_DEFINE(it,prios);
-	mavliter_foreach(&it){
-		cw_acprio_t * ac = mavliter_get(&it);
-		
-		int l = cw_put_ac_name_with_priority(d+4,ac);
-		d+=cw_put_elem_hdr(d,CW_ELEM_AC_NAME_WITH_PRIORITY,l)+l;		
-
-	}
-
-	return d-dst;
-*/
-}
-

src/cw/unused/cw_out_capwap_local_ip_address.c

@@ -1,57 +0,0 @@
-/*
-    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/>.
-
-*/
-
-/**
- * @file 
- * @brief Implementation output handler of capwap cw_out_local_ip_address
- */
-
-#include <errno.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <string.h>
-#include "cw.h"
-
-
-#include "dbg.h"
-#include "log.h"
-#include "conn.h"
-
-
-/**
- * Output handler for Capwap Local IP Address message element.
- *
- * @param conn Connection object
- * @param action Pointer to action which called this handler
- * @param dst Destination buffer
- *
- * This handler determines the IP address from #conn->sock.
- * It can deal both with IPv4 and IPv6 sockets.
- *
- */
- 
- /*
-int cw_out_capwap_local_ip_address(struct conn *conn, struct cw_action_out *action,
-				   uint8_t * dst)
-{
-	return cw_put_local_ip_address(conn->sock,dst,CW_ELEM_CAPWAP_LOCAL_IPV4_ADDRESS,CW_ELEM_CAPWAP_LOCAL_IPV6_ADDRESS);
-}
-
-*/

src/cw/unused/cw_out_image_data.c

@@ -1,58 +0,0 @@
-#include <stdio.h>
-#include <errno.h>
-
-#include "cw.h"
-
-
-#include "log.h"
-#include "dbg.h"
-
-
-#include "sock.h"
-
-#include "lwapp.h"
-
-
-
-
-
-
-int cw_out_image_data(struct conn *conn, struct cw_action_out *a, uint8_t * dst)
-{
-	/*
-	mbag_item_t * item = mbag_get(conn->outgoing,CW_ITEM_IMAGE_FILEHANDLE);
-	if (!item) {
-		cw_log(LOG_ERR,"Can't put element Image Data, no image filehandle found");
-		return 0;
-	}
-
-	FILE *infile = item->u2.data;
-	if (infile==NULL){
-		cw_log(LOG_ERR,"Image Data Request infile = NULL");
-		return 0;
-	}
-	
-	int bytes=0;
-	switch ( conn->capwap_mode_out){
-		case CW_MODE_CISCO:
-			bytes = lw_put_image_data(dst+4,infile);
-			if ( bytes != LW_BLOCKSIZE_IMAGE_DATA + 3) {
-       		        	avltree_del(conn->outgoing, item);
-			}
-			break;
-		default:
-			bytes = cw_put_image_data(dst+4,infile);
-			if (dst[4] != 1){
-       		        	avltree_del(conn->outgoing, item);
-			}
-	}
-
-	if ( ferror(infile)){
-		cw_log(LOG_ERROR,"Aborting image data transfer: %s",strerror(errno));
-	}
-
-	return bytes + cw_put_elem_hdr(dst,a->elem_id,bytes);
-	 */
-	 return 0;
-}
-

src/cw/unused/cw_out_radio_generic.c

@@ -1,50 +0,0 @@
-
-
-/*
-
-#include "cw.h"
-#include "cw/dbg.h"
-
-int cw_out_radio_generic(struct conn *conn, struct cw_action_out *a, uint8_t * dst)
-{
-cw_dbg(DBG_X,"Radio Generic out %s",a->item_id);
-	
-	int l=0;
-	MAVLITER_DEFINE(it,conn->radios_upd);
-	mavliter_foreach(&it){
-		struct mbag_item *radio = mavliter_get(&it);
-		if ( radio->type != MBAG_MBAG ) {
-			continue;
-		}
-
-		// Size for msg elem header depends on 
-		  // vendor specific payload 
-		int start = a->vendor_id ? 10 : 4;
-
-		uint8_t * d = dst+l;
-
-
-
-		struct mbag_item * item = mbag_get(radio->u2.data,a->item_id);
-		if (!item){
-cw_dbg(DBG_X,"Not found! %s for rid %d",a->item_id,radio->u1.iid);
-			continue;
-		}
-		int len=0;
-		len += cw_put_byte(d+start,radio->u1.iid);
-
-	cw_dbg(DBG_X, "Radio generic out '%s' fro rid %d",a->item_id,radio->u1.iid);
-		len += cw_put_mbag_item(d + start+1, item);
-
-		if (a->vendor_id)
-			l+= len + cw_put_elem_vendor_hdr(d, a->vendor_id, a->elem_id, len);
-		else
-			l += len + cw_put_elem_hdr(d, a->elem_id, len);
-
-
-
-	}
-	return l;
-
-}
-*/

src/cw/unused/cw_out_radio_info.c

@@ -1,42 +0,0 @@
-
-#include "cw.h"
-
-
-#include "radio.h"
-
-#include "dbg.h"
-#include "log.h"
-
-
-
-/*
-int cw_put_elem_radio_info(uint8_t*dst,int radio_id,mbag_t radio)
-{
-	cw_put_byte(dst+4,radio_id);
-	cw_put_dword(dst+5,mbag_get_dword(radio,CW_RADIOITEM80211_WTP_RADIO_INFORMATION,0));
-	return 5 + cw_put_elem_hdr(dst,CW_ELEM80211_WTP_RADIO_INFORMATION,5);
-
-}
-
-
-int cw_out_radio_infos(struct conn *conn, struct cw_action_out *a, uint8_t * dst)
-{
-
-	int l=0;
-	MAVLITER_DEFINE(it,conn->radios);
-	mavliter_foreach(&it){
-		struct mbag_item *i = mavliter_get(&it);
-		if ( i->type != MBAG_MBAG ) {
-			continue;
-		}
-		l+=cw_put_elem_radio_info(dst+l,i->u1.iid,i->u2.data);
-
-	}
-	return l;
-	 
-}
-
-*/
-
-
-

src/cw/unused/cw_out_wtp_descriptor.c

@@ -1,80 +0,0 @@
-#include "log.h"
-#include "capwap.h"
-#include "conn.h"
-#include "cw.h"
-
-#define CW_MODE_CISCO 1
-
-static int cw_put_encryption_subelems(uint8_t *dst,int capwap_mode)
-{
-	if (capwap_mode==CW_MODE_CISCO){
-		cw_put_word(dst,0x01);
-		return 2;
-	}
-
-	int n=2;
-	
-	dst+=cw_put_byte(dst,n);	
-
-	int i;
-	for (i=0; i<n; i++){
-		dst+=cw_put_byte(dst,0);
-		dst+=cw_put_byte(dst,0);
-		dst+=cw_put_byte(dst,0);
-	}
-
-	return 3*n+1;
-}
-
-
-/*
-int cw_out_wtp_descriptor(struct conn *conn, struct cw_action_out *a, uint8_t * dst)
-{
-
-	mbag_t mbag = conn->config;
-
-	// XXX Dummy WTP Descriptor Header
-	uint8_t *d = dst+4;
-
-	d+=cw_put_byte(d,conn->radios->count);	//max radios
-	d+=cw_put_byte(d,2);	//radios in use
-
-	d+=cw_put_encryption_subelems(d,conn->capwap_mode);
-
-	mbag_item_t * i;
-	i = mbag_get(mbag,CW_ITEM_WTP_HARDWARE_VERSION);
-/*	if ( i ) {	
-	 	d += cw_put_version(d,CW_SUBELEM_WTP_HARDWARE_VERSION,i->u2.data);
-	}
-	else {
-		cw_log(LOG_ERR, "Can't send Hardware Version in WTP Descriptor, not set.");
-	}
-
-	i = mbag_get(mbag,CW_ITEM_WTP_SOFTWARE_VERSION);
-	if ( i ) {	
-	 	d += cw_put_version(d,CW_SUBELEM_WTP_SOFTWARE_VERSION,i->u2.data);
-	}
-	else {
-		cw_log(LOG_ERR, "Can't send Software Version in WTP descriptor, not set.");
-	}
-
-        i = mbag_get(mbag,CW_ITEM_WTP_BOOT_VERSION);
-        if ( i ) {
-                d += cw_put_version(d,CW_SUBELEM_WTP_BOOTLOADER_VERSION,i->u2.data);
-        }
-        else {
-                cw_log(LOG_INFO, "Can't send Boot Version in WTP descriptor, not set.");
-        }
-
-        i = mbag_get(mbag,CW_ITEM_WTP_OTHER_VERSION);
-        if ( i ) {
-                d += cw_put_version(d,CW_SUBELEM_WTP_OTHERSOFTWARE_VERSION,i->u2.data);
-        }
-        else {
-                cw_log(LOG_INFO, "Can't send Other Version in WTP descriptor, not set.");
-        }
-*
-//	int len = d-dst-4;
-//	return len + cw_put_elem_hdr(dst,a->elem_id,len);
-}	
-*/

src/cw/unused/cw_out_wtp_ip_address.c

@@ -1,56 +0,0 @@
-/*
-    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/>.
-
-*/
-
-/**
- * @file 
- * @brief Implementation output handler of capwap cw_out_local_ip_address
- */
-
-#include <errno.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <string.h>
-#include "cw.h"
-
-
-#include "dbg.h"
-#include "log.h"
-#include "conn.h"
-
-
-/**
- * Output handler for Capwap Local IP Address message element.
- *
- * @param conn Connection object
- * @param action Pointer to action which called this handler
- * @param dst Destination buffer
- *
- * This handler determines the IP address from #conn->sock.
- * It can deal both with IPv4 and IPv6 sockets.
- *
- */
- 
- /*
-int cw_out_wtp_ip_address(struct conn *conn, struct cw_action_out *action,
-				   uint8_t * dst)
-{
-	return cw_put_local_ip_address(conn->sock,dst,CAPWAP_ELEM_WTP_IPV4_IP_ADDRESS,CAPWAP_ELEM_WTP_IPV6_IP_ADDRESS);
-}
-*/

src/cw/unused/cw_out_wtp_reboot_statistics.c

@@ -1,65 +0,0 @@
-/*
-    This file is part of actube.
-
-    actube 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/>.
-
-*/
-
-#include "log.h"
-
-
-
-
-
-#include "cw.h"
-
-/*
-int cw_out_wtp_reboot_statistics(struct conn *conn, struct cw_action_out *a,
-				 uint8_t * dst)
-{
-
-	if (!a->get) {
-		cw_log(LOG_ERROR, "Can't set WTP resboot stats. No get method");
-		return 0;
-	}
-
-
-	struct mbag_item *i = a->get(conn, a);
-
-
-	if (!i) {
-		if (a->mand) {
-			cw_log(LOG_ERR,
-			       "Can't put mandatory element WTP_REBOOT_STATISTICS");
-			return 0;
-		}
-		return 0;
-	}
-
-	mbag_t rs = (mbag_t) i->u2.data;
-
-	uint8_t *d = dst + 4;
-	d += cw_put_word(d, mbag_get_word(rs, CW_ITEM_REBOOT_COUNT, 0));
-	d += cw_put_word(d, mbag_get_word(rs, CW_ITEM_REBOOT_AC_INITIATED_COUNT, 0));
-	d += cw_put_word(d, mbag_get_word(rs, CW_ITEM_REBOOT_LINK_FAILURE_COUNT, 0));
-	d += cw_put_word(d, mbag_get_word(rs, CW_ITEM_REBOOT_SW_FAILURE_COUNT, 0));
-	d += cw_put_word(d, mbag_get_word(rs, CW_ITEM_REBOOT_HW_FAILURE_COUNT, 0));
-	d += cw_put_word(d, mbag_get_word(rs, CW_ITEM_REBOOT_OTHER_FAILURE_COUNT, 0));
-	d += cw_put_word(d, mbag_get_word(rs, CW_ITEM_REBOOT_UNKNOWN_FAILURE_COUNT, 0));
-	d += cw_put_byte(d, mbag_get_byte(rs, CW_ITEM_REBOOT_LAST_FAILURE_TYPE, 255));
-
-	int l = d - dst - 4;
-	return l + cw_put_elem_hdr(dst, a->elem_id, l);
-}
-*/

src/cw/unused/cw_put_ac_status.c

@@ -1,31 +0,0 @@
-#include "cw.h"
-
-/**
- * Put an cw_ac_stauts structure to a buffer
- * @param dst destination buffer
- * @param s #cw_ac_status to put
- * @return number of bytes put
- * This function is only useful (used) in conjunction with 
- * putting AC Descriptor message elements.
- */
-int cw_put_ac_status(uint8_t * dst, struct cw_ac_status *s, struct conn * conn)
-{
-	uint8_t *d;
-
-	d = dst;
-
-	d += cw_put_dword(d, (s->stations << 16) | (s->limit));
-	d += cw_put_dword(d, (s->active_wtps << 16) | (s->max_wtps));
-
-
-	int security = 0;
-	security |= conn->dtls_cert_file ? CAPWAP_FLAG_AC_SECURITY_X : 0;
-	security |= conn->dtls_psk ? CAPWAP_FLAG_AC_SECURITY_S : 0;
-
-
-	d += cw_put_dword(d,
-			  (security << 24) | (s->rmac_field << 16) | (s->dtls_policy));
-	return d - dst;
-}
-
-

src/cw/unused/cw_put_radio_operational_states.c

@@ -1,96 +0,0 @@
-/*
-    This file is part of actube.
-
-    actube 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/>.
-
-*/
-
-/**
- * @file
- * @brief Implementation of cw_put_radio_operational_states
- */
-
-#include "cw.h"
-
-#include "radio.h"
-
-
-/**
- * Put all radio operational states 
- */
-//int xxcw_put_radio_operational_states(struct xaaa * radios, uint8_t * dst, int *nerror, int d7mode)
-//{/
-	//uint8_t *d=dst;
-
-	/* Iterate through all radios and send the CW_RADIO_OPER_STATE item if found.
-	   We assume, that any other processes, dealing with setting the 
-	   the Radio Admin state, adds a CW_RADIO_OPER_STATE item to the radio, 
-	   depending on results. */
-
-//	int nerror=0;
-	
-//	*nerror=0;
-
-//	MAVLITER_DEFINE(it,radios);
-//	mavliter_foreach(&it){
-
-//		mbag_item_t * radioitem = mavliter_get(&it);
-//		mbag_item_t *ositem = mbag_get(radioitem->u2.data,CW_RADIOITEM_OPER_STATE);
-		//if (!ositem){
-	//		(*nerror)++;
-//			continue;//
-//		}//
-
-
-		/* Put the radio ID */
-//		cw_put_byte(d+4,radioitem->u1.iid);
-		
-		/* Get the operational state and cause */
-//		uint16_t os = ositem->u2.word;
-
-//		if ( d7mode ){//
-			// Isolate Oper Sate from cause 
-//			uint8_t o=os>>8; 
-
-//			/* Invert oper state for Cisco, if oper state is 2 or 1 */
-//			if (o!=0 && o<=2) {
-//				/*  2 becomes 1 and 1 becomes 2 */
-//				os = (os & 0x00ff ) | ((3-o)<<8);
-//			}
-//		}
-
-//		/* Put oper state */
-//		cw_put_word(d+5,os);
-//		d+=3+cw_put_elem_hdr(d,CW_ELEM_RADIO_OPERATIONAL_STATE,3);
-
-		/* delete the operational state item, so it won't be 
-		   sent again, until it is set by a change through
-		   Set Radio Admin State */
-//		mbag_del(radioitem->u2.data,CW_RADIOITEM_OPER_STATE);
-
-//	}
-
-
-/*	if (nerror) {
-		if (a->mand) {
-			cw_log(LOG_ERROR,"Could not send Radio Operational State for all radios. Sent %d out of %d.",
-				conn->radios->count-nerror,conn->radios->count);
-
-		}
-	}
-*/
-//	return d-dst;
-//}
-
-

src/cw/unused/cw_read_80211_mac_operation.c

@@ -1,16 +0,0 @@
-#include "cw.h"
-
-#include "dbg.h"
-
-/*
-int cw_read_80211_mac_operation(uint8_t *data,mbag_t r)
-{
-	mbag_set_word( r, CW_RADIOITEM80211_RTS_THRESHOLD,cw_get_word(data) );
-	mbag_set_byte( r, CW_RADIOITEM80211_SHORT_RETRY,cw_get_byte(data+2) );
-	mbag_set_byte( r, CW_RADIOITEM80211_LONG_RETRY,cw_get_byte(data+3) );
-	mbag_set_word( r, CW_RADIOITEM80211_FRAGMENTATION_THRESHOLD,cw_get_word(data+4) );
-	mbag_set_dword( r, CW_RADIOITEM80211_TX_MSDU_LIFETIME,cw_get_dword(data+6) );
-	mbag_set_dword( r, CW_RADIOITEM80211_RX_MSDU_LIFETIME,cw_get_dword(data+10) );
-	return 1;
-}
-*/

src/cw/unused/cw_readelem_cisco_wtp_radio_cfg.c

@@ -1,25 +0,0 @@
-/*
-
-#include "capwap_cisco.h"
-#include "cw_log.h"
-
-int cw_readelem_cisco_wtp_radio_cfg(int elem_id,uint8_t *elem, int len,struct radioinfo *ri)
-{
-	if (elem_id != CW_CISCO_WTP_RADIO_CFG)
-		return 0;
-
-	if (len!=24){
-		cw_dbg(DBG_ELEM,"LWAPP Radio Cfg element too short, %d < 21",len);
-		return -1;
-	}
-	
-	ri->rid = lw_get_byte(elem);
-	ri->occupancy_limit = lw_get_word(elem+2);
-	bstr_replace(&ri->bssid,bstr_create(elem+7,6));
-	ri->beacon_period = lw_get_word(elem+13);
-
-	return 1;
-}
-
-
-*/	

src/cw/unused/cw_send_echo_response.c

@@ -1,40 +0,0 @@
-/*
-    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/>.
-
-*/
-/**
- * @file
- * @brief Implnts send echo response
- */
-
-#include "capwap.h"
-
-/**
- * Send an echo response message
- * @param conn connection, see #conn
- * @param seqnum sequence number to use
- * @param radioinfo radioinfo to use, should me NULL
- * @return 1=Success\nOtherwise Error.
- */
-
-int cw_send_echo_response(struct conn * conn,int seqnum,struct radioinfo * radioinfo)
-{
-	struct cwmsg * cwmsg = &conn->resp_msg;	
-//	cwmsg_init(cwmsg,conn->resp_buffer,CW_MSG_ECHO_RESPONSE,seqnum,radioinfo);
-
-//	conn_send_response(conn,cwmsg,seqnum);
-	return 1;
-}

src/cw/unused/cwmsg_addelem_mtu_discovery_padding.c

@@ -1,44 +0,0 @@
-/*
-    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/>.
-
-*/
-
-#include <string.h>
-
-
-#include "capwap.h"
-#include "conn.h"
-#include "cwmsg.h"
-
-#include <stdio.h> 
-
-void cwmsg_addelem_mtu_discovery_padding(struct cwmsg * msg, struct conn* conn)
-{
-	int len = conn->mtu - (msg->msgelems-msg->buffer+msg->pos)-4;
-
-printf("MTU discovery len %d %d and pos %d:\n",conn->mtu,len,msg->pos);
-
-	if (len < 0 )
-		return;
-	
-	uint32_t val = CAPWAP_ELEM_MTU_DISCOVERY_PADDING<<16|len;
-	*((uint32_t*)(msg->msgelems+msg->pos))=htonl(val);
-	memset(msg->msgelems+4+msg->pos,0xff,len);	
-	msg->pos+=4+len;
-
-printf("Nenpos = %d\n",msg->pos);
-}
-

src/cw/unused/lw_cisco_id_to_str.c

@@ -1,63 +0,0 @@
-
-#include "lwapp_cisco.h"
-
-const char * lw_cisco_id_to_str(int elem_id)
-{
-	switch (elem_id){
-		case LW_CISCO_AP_LOGHOST_CONFIG:
-			return "AP Loghost Config and Last Joined Controller";
-		case LW_CISCO_PATH_MTU:
-			return "Path MTU";
-		case LW_CISCO_MWAR_HASH_VALUE:
-			return "MWAR Hash Value";
-		case LW_CISCO_MWAR_HASH_VALUE_1:
-			return "MWAR Hah Value 1";			
-		case LW_CISCO_AP_USERNAME_PASSWORD:
-			return "AP Username and Password";
-		case LW_CISCO_AC_IP_ADDR_WITH_INDEX:
-			return "AC IP Addr with Index";
-		case LW_CISCO_AP_SUBMODE:
-			return "AP Submode";
-		case LW_CISCO_SSC_HASH_VALIDATION:
-			return "SSC Hash Validation";
-
-		case LW_CISCO_DOT11R_WLC_MAC_AND_IP:
-			return "802.11r WLC MAC and IP";
-		case LW_CISCO_AP_JOIN_IP_PREF_MODE:
-			return "AP Join IP Pref Mode";
-			
-		case LW_CISCO_MCAST_MGID_INFO:
-			return "MCAST MGID Info";
-		case LW_CISCO_RADIO_MODULE_INFO:
-			return "Radio Module Info";
-		case LW_CISCO_TELNET_SSH:
-			return "Telnet SSH";
-		case LW_CISCO_AP_DTLS_DATA_CFG:
-			return "AP DTLS Data Config";
-
-		case LW_CISCO_PRIMED_JOIN_TIMEOUT:
-			return "Primed Join Timeout";			
-
-		case LW_CISCO_PRIMED_DISCOVERY_TIMEOUT:
-			return "Primed Discovery Timeout";
-
-		case LW_CISCO_RAD_EXTENDED_CONFIG:
-			return "RAD Extended Config";
-
-		case LW_CISCO_MANAGER_IP_ADDR:
-			return "Manager IP Address";
-
-		case LW_CISCO_ADD_WLAN:
-			return "Add WLAN?";
-
-		case LW_CISCO_DELETE_WLAN:
-			return "Delete WLAN?";
-
-		default: 
-			return "Unknown";
-
-	}
-
-	return "Unknown";
-}
-

src/cw/unused/lw_in_vendor_specific.c

@@ -1,53 +0,0 @@
-
-#include "cw.h"
-#include "dbg.h"
-#include "log.h"
-/*#include "stravltree.h"*/
-
-/** 
- * @file 
- * @brief Implementation of LWAPP Vendor Specific Payload
- */
-
-/**
- * Default handler for LWAPP Vendor Specific Payload message elements.
- */
- 
- /*
-int lw_in_vendor_specific(struct conn *conn, struct cw_action_in *a,
-				  uint8_t * data, int len, struct sockaddr *from)
-{
-
-	cw_action_in_t as, *af;
-	as = *a;
-
-	as.vendor_id = cw_get_dword(data);
-	as.elem_id = cw_get_word(data + 4);
-	as.proto = CW_ACTION_PROTO_LWAPP;
-
-// TODO XXXX
-	//af = cw_actionlist_in_get(conn->actions->in, &as);
-//	
-	af = 0;
-
-	if (!af) {
-		cw_dbg(DBG_WARN,
-		       "Can't handle Vendor Specific LWAPP Payload %s/%d, in msg %d (%s) in %s state.",
-		       cw_strvendor(as.vendor_id), as.elem_id, as.msg_id,
-		       cw_strmsg(as.msg_id), cw_strstate(as.capwap_state));
-		return 0;
-	}
-
-	if (af->start) {
-		int afrc = af->start(conn, af, data + 6, len - 6, from);
-		if (af->mand && afrc) {
-			// add found mandatory message element 
-			   //to mand list 
-// XXXX			stravltree_add(conn->mand, af->item_id); 
-		}
-		return afrc;
-	}
-
-	return 1;
-}
-*/

src/cw/unused/lw_put_cisco_path_mtu.c

@@ -1,44 +0,0 @@
-/*
-    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/>.
-
-*/
-
-/**
- * @file
- * @brief Implementation of lw_put_cisco_path_mtu
- */
-
-#include "lwapp_cisco.h"
-#include "lw.h"
-#include "vendors.h"
-
-/** 
- * Put message element data for Cisco vendor specific LWAPP message
- * Csico Path MTU.
- * @param dst destination buffer
- * @param max maximum MTU
- * @param padding number of bytes to append
- * @return number of bytes put to buffer 
- */
-int lw_put_cisco_path_mtu(uint8_t *dst, uint16_t max, uint16_t padding)
-{
-	lw_set_dword(dst,LW_VENDOR_ID_CISCO);
-	lw_set_word(dst+4,LW_CISCO_PATH_MTU);
-	lw_set_word(dst+6,max);
-	lw_set_word(dst+8,padding+4);
-	memset(dst+10,0,padding);
-	return padding+10;
-}

src/cw/unused/mbag_get_upd.c

@@ -1,32 +0,0 @@
-
-
-
-
-#include "log.h"
-
-/*
-int mbag_get_upd(mbag_t b, mbag_t b_upd, const char *id, uint8_t *dst, int *found)
-{
-	struct mbag_item *i = mbag_get(b_upd, id);
-	if (i) {
-		if (!i->type->put ){
-			cw_log(LOG_ERROR,"No put method for %s",i->type->name);
-			return -1;
-		}
-		(*found)++;
-		return i->type->put(i, dst);
-	}
-	i = mbag_get(b,id);
-	if (i) {
-		if (!i->type->put){
-			cw_log(LOG_ERROR,"No put method for %s",i->type->name);
-			return -1;
-		}
-
-		return i->type->put(i, dst);
-	}
-
-	return -1;
-
-}
-*/

src/cw/unused/radio.c

@@ -1,54 +0,0 @@
-
-/*
-#include "radio.h"
-#include "dbg.h"
-
-const char CW_RADIO_TYPE[]="radio_type";
-const char CW_RADIO_REG_DOMAIN[]="reg_domain";
-const char CW_RADIO_BSSID[]="bssid";
-const char CW_RADIO_SHORT_PREAMBLE[]="short_preamble";
-const char CW_RADIO_COUNTRY_STRING[]="country_string";
-const char CW_RADIO_DECRYPTION_ERROR_REPORT_PERIOD[]="decryption_error_report_period";
-
-
-const char CW_RADIO_SUPPORTED_RATES[]="supported_rates";
-
-
-
-// Cisco 
-
-const char CW_RADIO_OCCUPANCY_LIMIT[]="occupancy_limit";
-const char CW_RADIO_CFP_PERIOD[]="cfp_period";
-const char CW_RADIO_CFP_MAX_DURATION[]="cfp_max_duration";
-	
-
-struct cw_itemdef xxxcapwap_radioitemdefs[] = {
-//{CW_RADIO_ADMIN_STATE,CW_ITEM_NONE,MBAG_BYTE},
-{CW_RADIO_TYPE,CW_ITEM_NONE,MTYPE_DWORD},
-{CW_RADIO_DECRYPTION_ERROR_REPORT_PERIOD,CW_ITEM_NONE,MBAG_WORD},
-
-{CW_RADIO_BSSID,CW_ITEM_NONE,MBAG_BSTR16},
-{CW_RADIO_SUPPORTED_RATES,CW_ITEM_NONE,MBAG_DATA},
-
-{CW_ITEM_NONE}
-};
-
-
-
-
-
-
-int cw_radio_set_all_admin_states(mbag_t radios,int state, int cause)
-{
-	MAVLITER_DEFINE(it,radios);
-	mavliter_foreach(&it){
-		mbag_item_t *i = mavliter_get(&it);
-		cw_radio_set_admin_state(radios,i->u1.iid,state,cause);
-
-	}
-	return 1;	
-}
-
-
-
-*/

src/cw/unused/radio.h

@@ -1,62 +0,0 @@
-#ifndef __CW_RADIO_H
-#define __CW_RADIO_H
-
-
-
-#include "conn.h"
-
-
-
-/*
-//extern const char CW_RADIO_ADMIN_STATE[];
-//extern const char CW_RADIO_OPER_STATE[];
-*/
-
-extern const char CW_RADIO_SUPPORTED_RATES[];
-
-
-extern const char CW_RADIO_TYPE[];
-extern const char CW_RADIO_REG_DOMAIN[];
-extern const char CW_RADIO_BSSID[];
-extern const char CW_RADIO_SHORT_PREAMBLE[];
-extern const char CW_RADIO_COUNTRY_STRING[];
-extern const char CW_RADIO_DECRYPTION_ERROR_REPORT_PERIOD[];
-
-/* Cisco */
-
-extern const char CW_RADIO_OCCUPANCY_LIMIT[];
-extern const char CW_RADIO_CFP_PERIOD[];
-extern const char CW_RADIO_CFP_MAX_DURATION[];
-	
-
-/*
-enum radiodata{
-	CW_RADIO_ADMIN_STATE=10000,
-	CW_RADIO_OPER_STATE,
-	CW_RADIO_TYPE,
-	CW_RADIO_REG_DOMAIN,
-	CW_RADIO_BSSID,
-	CW_RADIO_SHORT_PREAMBLE,
-	CW_RADIO_COUNTRY_STRING,
-
-
-	CW_RADIO_OCCUPANCY_LIMIT,
-	CW_RADIO_CFP_PERIOD,
-	CW_RADIO_CFP_MAX_DURATION
-	
-
-
-}[];
-*/
-
-
-/*
-int cw_radio_update_oper_states(mbag_t radios,int cause);
-extern struct cw_itemdef capwap_radioitemdefs[];
-extern int cw_radio_set_all_admin_states(mbag_t radios,int state, int cause);
-
-int cw_out_80211_supported_rates(struct conn *conn, struct cw_action_out *a, uint8_t * dst);
-*/
-
-
-#endif

src/cw/val.h

@@ -157,6 +157,7 @@ extern const struct cw_Type cw_type_ipaddress;
 extern const struct cw_Type cw_type_sysptr;
 extern const struct cw_Type cw_type_bool;
 extern const struct cw_Type cw_type_struct;
+extern const struct cw_Type cw_type_array;
 
 #define CW_TYPE_BYTE (&cw_type_byte)
 #define CW_TYPE_WORD (&cw_type_word)
@@ -168,6 +169,15 @@ extern const struct cw_Type cw_type_struct;
 #define CW_TYPE_STR (&cw_type_str)
 #define CW_TYPE_BOOL (&cw_type_bool)
 #define CW_TYPE_STRUCT (&cw_type_struct)
+#define CW_TYPE_ARRAY (&cw_type_array)
+
+struct cw_ValArrayDef{
+	void * get_count;
+	void * put_count;
+	const struct cw_Type * type;
+	void *param;
+};
+
 
 /*
 void cw_kvstore_mavl_delete(const void *data);

src/mod/capwap/capwap_actions.c

@@ -429,10 +429,13 @@ static struct cw_ElemHandler handlers[] = {
 		CAPWAP_ELEM_RADIO_OPERATIONAL_STATE,		/* Element ID */
 		0, 0,						/* Vendor / Proto */
 		3, 3,						/* min/max length */
-		radio_operational_state,			/* type */
+		CW_TYPE_STRUCT,					/* type */
 		"capwap/operational-state",			/* Key */
-		cw_in_radio_generic_struct,			/* get */
+		cw_in_radio_generic,				/* get */
-		cw_out_radio_generic_struct			/* put */
+		cw_out_radio_generic,				/* put */
+		NULL,
+		NULL,
+		radio_operational_state
 	}
 	,
 

src/mod/capwap/capwap_in_capwap_control_ip_address.c

@@ -34,7 +34,7 @@ int capwap_in_capwap_control_ip_address(struct cw_ElemHandler *eh,
 	int idx;
 	
 	sprintf(key,"%s/address",eh->key);
-	idx = cw_cfg_get_next_index(params->cfg,key);
+	idx = cw_cfg_get_new_index(params->cfg,key);
 	
 /*	printf("SKEY is %s , idx: %d\n",key,idx);*/
 

src/mod/capwap/mod_capwap_ac.c

@@ -9,7 +9,7 @@
 
 #include "mod_capwap.h"
 
-static int init(struct cw_Mod * mod, mavl_t global_cfg, int role)
+static int init(struct cw_Mod * mod, cw_Cfg_t * global_cfg, int role)
 {
 	cw_dbg(DBG_INFO,"CAPWAP: Inititalizing mod_capwap.");
 	
@@ -30,7 +30,7 @@ static int init(struct cw_Mod * mod, mavl_t global_cfg, int role)
 	}
 	
 
-	return 0;
+	return 1;
 }
 
 
@@ -51,7 +51,7 @@ int static setup_cfg(struct cw_Conn  * conn)
 
 
 //	stop();
-//	cw_ktv_set_byte(conn->local_cfg,"ac-descriptor/security",security);
+	cw_cfg_set_int(conn->local_cfg,"ac-descriptor/security",security);
 
 	return 0;
 }

src/mod/capwap80211/capwap80211_messages.c

@@ -28,7 +28,36 @@ static cw_ValStruct_t capwap80211_antenna_stru[]={
 };
 
 
+static cw_ValStruct_t capwap80211_wtp_radio_cfg_stru[]={
+	{CW_TYPE_BYTE,"short-preamble",1,-1},
+	{CW_TYPE_BYTE,"num-of-bssids",1,-1},
+	{CW_TYPE_BYTE,"dtim-period",1,-1},
+	{CW_TYPE_BSTR16,"bssid",6,-1},
+	{CW_TYPE_WORD,"beacon-period",2,-1},
+	{CW_TYPE_STR,"country-string",2,-1,},
+	{CW_TYPE_BSTR16,"country-string-attr",1,-1,},
+	{CW_TYPE_BYTE,"country-string-reserved",1,-1,},
+	{NULL,NULL,0,0}
+};
+	
+
+
 static struct cw_ElemHandler handlers[] = {
+	{
+		"IEEE 802.11 Add WLAN",				/* name */
+		CAPWAP80211_ELEM_ADD_WLAN,			/* Element ID */
+		0, 0,						/* Vendor / Proto */
+		3, 0,						/* min/max length */
+		CW_TYPE_STRUCT,					/* type */
+		"capwap80211",					/* Key */
+		cw_in_radio_generic,				/* get */
+		cw_out_radio_generic,				/* put */
+		NULL,
+		NULL,
+		capwap80211_antenna_stru
+
+	}
+	,
 	{
 		"IEEE 802.11 WTP Radio Information",		/* name */
 		CAPWAP80211_ELEM_WTP_RADIO_INFORMATION,		/* Element ID */
@@ -66,6 +95,22 @@ static struct cw_ElemHandler handlers[] = {
 
 	}
 	,
+
+	{
+		"IEEE 802.11 WTP Radio Configuration",		/* name */
+		CAPWAP80211_ELEM_WTP_RADIO_CONFIGURATION,	/* Element ID */
+		0, 0,						/* Vendor / Proto */
+		16, 16,						/* min/max length */
+		CW_TYPE_STRUCT,					/* type */
+		"capwap80211/wtp-radio-config",				/* Key */
+		cw_in_radio_generic,				/* get */
+		cw_out_radio_generic,				/* put */
+		NULL,
+		NULL,
+		capwap80211_wtp_radio_cfg_stru
+
+	},
+		
 	{NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL}
 
 };

src/mod/capwap80211/mod_capwap80211.c

@@ -14,11 +14,11 @@
 static int init()
 {
 	cw_dbg(DBG_INFO, "Initialiazing mod_capwap80211 ...");
-	return 0;
+	return 1;
 }
 
 
-static int detect(struct conn *conn, const uint8_t * rawmsg, int rawlen, int elems_len,
+static int detect(struct cw_Conn *conn, const uint8_t * rawmsg, int rawlen, int elems_len,
 		  struct sockaddr *from, int mode)
 {
 	int wbid;

src/mod/cisco/capwap_cisco.h

@@ -47,14 +47,16 @@
 #define CISCO_ELEM_TX_POWER			LW_ELEM_80211_TX_POWER			/* 12 */
 #define CISCO_ELEM_TX_POWER_LEVELS		LW_ELEM_80211_TX_POWER_LEVELS		/* 13 */
 #define CISCO_ELEM_DIRECT_SEQUENCE_CONTROL	LW_ELEM_DIRECT_SEQUENCE_CONTROL		/* 14 */
-#define CW_CISCO_SUPPORTED_RATES		LW_ELEM_80211_RATE_SET			/* 16 */
+#define CISCO_ELEM_SUPPORTED_RATES		LW_ELEM_80211_RATE_SET			/* 16 */
 
 #define CISCO_ELEM_15				15					/* 15 */
-#define CISCO_ELEM_16				16					/* 16 */
 #define CISCO_ELEM_19				19					/* 19 */
 #define CISCO_ELEM_22				22					/* 22 */
 #define CISCO_ELEM_24				24					/* 24 */
 
+#define CISCO_ELEM_RRM_LOAD			25					/* 25 */
+
+
 #define CW_CISCO_80211_DELETE_WLAN		LW_ELEM_80211_DELETE_WLAN		/* 28 */
 
 #define CW_CISCO_MWAR_NAME			LW_ELEM_AC_NAME				/* 31 */
@@ -69,18 +71,19 @@
 
 #define CW_CISCO_CERTIFICATE			LW_ELEM_CERTIFICATE			/* 44 */
 
-#define CISCO_ELEM_47				47					/* 47 */
+#define CISCO_ELEM_PERFORMANCE_PROFILE		47					/* 47 */
-#define CISCO_ELEM_48				48					/* 47 */
+#define CISCO_ELEM_SPAM_CFP_STATUS		48					/* 48 */
 
 
 #define CISCO_ELEM_WTP_BOARD_DATA		LW_ELEM_WTP_BOARD_DATA			/* 50 */
-#define CW_CISCO_BCAST_SSID_MODE		LW_BCAST_SSID_MODE
+#define CISCO_ELEM_BCAST_SSID_MODE		LWAPP_ELEM_BCAST_SSID_MODE		/* 51 */
 #define CISCO_ELEM_AP_MODE_AND_TYPE		LW_ELEM_80211_WTP_MODE_AND_TYPE		/* 54 */
 #define CISCO_ELEM_AP_QOS			LW_ELEM_QOS				/* 57 */
 
 #define CW_CISCO_AC_IPV4_LIST			LW_ELEM_AC_IPV4_LIST			/* 59 */
 
 #define CISCO_ELEM_CAPWAP_TIMERS		LW_ELEM_LWAPP_TIMERS			/* 68 */
+#define CISCO_ELEM_CLIENT_AUTO_HANDOFF		72					/* 72 */
 #define CISCO_ELEM_81				81					/* 81 */
 
 #define CISCO_ELEM_AP_STATIC_IP_ADDR		83
@@ -102,7 +105,7 @@
 #define CISCO_ELEM_RESET_BUTTON_STATE		128
 
 
-#define CISCO_ELEM_132				132					/* 132 */
+#define CISCO_ELEM_AP_DOT11H			132					/* 132 */
 
 #define CISCO_ELEM_CHANNEL_POWER		134
 #define CISCO_ELEM_AP_CORE_DUMP			135

src/mod/cisco/cisco_actions.c

@@ -258,6 +258,15 @@ static cw_ValStruct_t cisco_ap_power_injector_config[]={
 	{NULL,NULL,0,0}
 };
 
+static cw_ValStruct_t cisco_ap_dot11h[]={
+	{CW_TYPE_BYTE,"enable",1,-1},
+	{CW_TYPE_BYTE,"count",1,-1},
+	{CW_TYPE_BYTE,"mode",1,-1},
+	{CW_TYPE_BYTE,"power",1,-1},
+	{NULL,NULL,0,0}
+};
+
+
 
 int cisco_in_ap_regulatory_domain(struct cw_ElemHandler *eh, 
 		struct cw_ElemHandlerParams *params, 
@@ -267,7 +276,7 @@ int cisco_in_ap_regulatory_domain(struct cw_ElemHandler *eh,
 	int idx;
 	void * type;
 
-	idx = cw_cfg_get_next_index(params->cfg,eh->key);
+	idx = cw_cfg_get_new_index(params->cfg,eh->key);
 
 	sprintf(key,"%s.%d",eh->key,idx);
 	
@@ -306,8 +315,10 @@ int cisco_out_ap_regulatory_domain(struct cw_ElemHandler * eh,
 		if(result->type->len(result)==4){
 			uint32_t rv;
 			rv = cw_get_dword(result->type->data(result));
-//cw_dbg(DBG_X,"Version is %08X",rv);			
+cw_dbg(DBG_X,"Version is %08X",rv);			
-			if (rv >= 0x07056600){
+//stop();
+//			if (rv >= 0x07056600){
+			if (rv > 0x07036500){
 				type = cisco_ap_regulatory_domain5;
 			}
 			else{
@@ -371,7 +382,47 @@ static cw_ValStruct_t cisco_direct_sequence_control70[]={
 	{NULL,NULL,0,0}
 };
 
+
+static int get_num_antennas70(cw_Cfg_t *cfg, 
+		const char * key, const uint8_t *src, int len, const void *param, int *l)
+{
+	*l=0;
+	return cw_get_byte(src-4);
+};
+
+static int put_num_antennas70(cw_Cfg_t *cfg, 
+		const char * key, uint8_t *dst, const void *param, int l)
+{
+	return cw_put_byte((dst-4),l);
+};
+
+static cw_ValValRange_t antenna_type[]={
+	{1,1,"1 - Internal Antenna"},
+	{2,2,"2 - External Antenna"},
+	{0,0,NULL}
+};
+
+
+struct cw_ValArrayDef ant_array = {
+	get_num_antennas70,
+	put_num_antennas70,
+	CW_TYPE_BYTE,
+	&antenna_type
+};
+
 static cw_ValStruct_t cisco_antenna_payload70[]={
+	{CW_TYPE_BYTE,"diversity-selection",1,-1},
+	{CW_TYPE_BYTE,"antenna-mode",1,-1},
+	{CW_TYPE_BYTE,"antenna-cnt",1,-1},
+	{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_ARRAY,"antenna",-1,-1,&ant_array},
+	{NULL,NULL,0,0}
+};
+
+/*
+static cw_ValStruct_t cisco_antenna_payload73[]={
 	{CW_TYPE_BYTE,"diversity-selection",1,-1},
 	{CW_TYPE_BYTE,"antenna-mode",1,-1},
 	{CW_TYPE_BYTE,"number-of-antennas",1,-1},
@@ -383,6 +434,11 @@ static cw_ValStruct_t cisco_antenna_payload70[]={
 	{CW_TYPE_BYTE,"antenna-2",1,-1},
 	{NULL,NULL,0,0}
 };
+*/
+
+
+
+
 
 
 static cw_ValStruct_t cisco_wtp_radio_config70[]={
@@ -390,7 +446,7 @@ static cw_ValStruct_t cisco_wtp_radio_config70[]={
 	{CW_TYPE_WORD,"occupancy-limit",2,-1},
 	{CW_TYPE_BYTE,"cfg-period",1,-1},
 	{CW_TYPE_WORD,"cfp-maximum-duration",2,-1},
-	{CW_TYPE_BSTR16,"bss-id",6,-1},
+	{CW_TYPE_BSTR16,"bssid",6,-1},
 	{CW_TYPE_WORD,"beacon-period",2,-1},
 	{CW_TYPE_STR,"country-str1",3,-1},
 	{CW_TYPE_STR,"country-str2",3,-1},
@@ -403,17 +459,18 @@ static cw_ValStruct_t cisco_wtp_radio_config70[]={
 
 
 static cw_ValStruct_t cisco_wtp_radio_config73[]={
-	{CW_TYPE_BYTE,"cfg-type",1,-1},
+	{CW_TYPE_BYTE,"@cisco/cfg-type",1,-1,cfg_type},
-	{CW_TYPE_WORD,"occupancy-limit",2,-1},
+	{CW_TYPE_WORD,"@cisco/occupancy-limit",2,-1},
-	{CW_TYPE_BYTE,"cfg-period",1,-1},
+	{CW_TYPE_BYTE,"@cisco/cfg-period",1,-1},
-	{CW_TYPE_WORD,"cfp-maximum-duration",2,-1},
+	{CW_TYPE_WORD,"@cisco/cfp-maximum-duration",2,-1},
-	{CW_TYPE_BSTR16,"bss-id",6,-1},
+	{CW_TYPE_BSTR16,"bssid",6,-1},
 	{CW_TYPE_WORD,"beacon-period",2,-1},
-	{CW_TYPE_STR,"country-str1",3,-1},
+	{CW_TYPE_STR,"@cisco/country-string",3,-1},
-	{CW_TYPE_STR,"country-str2",3,-1},
+	{CW_TYPE_STR,"country-string",2,-1},
-	{CW_TYPE_BYTE,"gpr-period",1,-1},
+	{CW_TYPE_BSTR16,"country-string-attr",1,-1},
-	{CW_TYPE_DWORD,"reg",4,-1},
+	{CW_TYPE_BYTE,"@cisco/gpr-period",1,-1},
-	{CW_TYPE_BYTE,"max-stations",1,-1},
+	{CW_TYPE_DWORD,"@cisco/reg",4,-1},
+	{CW_TYPE_BYTE,"@cisco/max-stations",1,-1},
 	{NULL,NULL,0,0}
 };
 
@@ -447,7 +504,61 @@ static cw_ValStruct_t cisco_lw_radio_module_info_stru[]={
 	{CW_TYPE_STR,"name",21,-1},
 	{CW_TYPE_STR,"serial",11,-1},
 	{CW_TYPE_STR,"type",25,-1},
-	{CW_TYPE_STR,"descr",126,-1},
+	{CW_TYPE_STR,"descr",125,-1},
+	{NULL,NULL,0,0}
+};
+
+static cw_ValStruct_t cisco_rrm_load_stru[]={
+	{CW_TYPE_BYTE,"rx-load",1,-1},
+	{CW_TYPE_BYTE,"tx-load",1,-1},
+	{CW_TYPE_BYTE,"cca-load",1,-1},
+	{NULL,NULL,0,0}
+};
+
+static cw_ValStruct_t cisco_performance_profile_stru[]={
+	{CW_TYPE_BYTE,"cfg-type",1,-1,cfg_type},
+	{CW_TYPE_WORD,"rf-busy-threshold",2,-1},
+	{CW_TYPE_WORD,"num-clients-threshold",2,-1},
+	{CW_TYPE_WORD,"bytes-per-sec",2,-1},
+	{CW_TYPE_WORD,"foreigh-threshold",2,-1},
+	{CW_TYPE_WORD,"rssi-threshold",2,-1},
+	{CW_TYPE_WORD,"min-perf-snr",2,-1},
+	{CW_TYPE_WORD,"excpection-level",2,-1},
+	{CW_TYPE_WORD,"min-num-clients",2,-1},
+	{NULL,NULL,0,0}
+};
+
+static cw_ValStruct_t cisco_phy_ht_cap_stru[]={
+	{CW_TYPE_WORD,"ht-cap-info",2,-1},
+/*	{CW_TYPE_WORD,"extendend-ht-cap-info",2,-1},*/
+	{CW_TYPE_BSTR16,"mcsrates-1",4,-1},
+	{CW_TYPE_BSTR16,"mcsrates-2",4,-1},
+	{CW_TYPE_BSTR16,"mcsrates-3",4,-1},
+	{CW_TYPE_BSTR16,"mcsrates-4",4,-1},
+	{CW_TYPE_BSTR16,"extended-ht-cap-info",2,-1},
+	{CW_TYPE_BSTR16,"tx-bf-cap",4,-1},
+	{CW_TYPE_BYTE,"asel-cap",1,-1},
+	{NULL,NULL,0,0}
+};
+
+static cw_ValStruct_t cisco_phy_ht_control_stru[]={
+	{CW_TYPE_BYTE,"enable-ht",1,-1},
+	{CW_TYPE_BYTE,"cfg-type",1,-1,cfg_type},
+	{CW_TYPE_BYTE,"current-freq",1,-1},
+	{CW_TYPE_BSTR16,"rest",4,-1},
+	{CW_TYPE_BYTE,"frequency-bands-support",1,-1},
+	{CW_TYPE_BYTE,"ti-threshold",1,-1},
+	{CW_TYPE_BYTE,"flash-commit",1,-1},	//byte2
+	{CW_TYPE_BYTE,"cur-freq-is-dfs-channel",1,-1},
+	{CW_TYPE_BYTE,"channel-width",1,-1},
+	{CW_TYPE_BYTE,"ext-channel",1,-1},
+	{NULL,NULL,0,0}
+};
+
+static cw_ValStruct_t cisco_station_cfg_stru[]={
+	{CW_TYPE_BYTE,"cfg-type",1,-1,cfg_type},
+	{CW_TYPE_BYTE,"current-freq",1,-1},
+	{CW_TYPE_BSTR16,"rest",-1,-1},
 	{NULL,NULL,0,0}
 };
 
@@ -580,25 +691,25 @@ static cw_ValStruct_t cisco_add_wlan[]={
 
 static cw_ValStruct_t cisco_add_wlan70[]={
 	{CW_TYPE_BYTE,"radio-id",1,-1},
-	{CW_TYPE_WORD,"wlan-capability",2,-1},
+	{CW_TYPE_WORD,"capwap80211/capability",2,-1},
 	{CW_TYPE_BYTE,"wlan-id",1,4},
-	{CW_TYPE_DWORD,"encryption-policy",4,5},
+	{CW_TYPE_DWORD,"cisco/encryption-policy",4,5},
 
-	{CW_TYPE_BSTR16,"wep-key",13,9},
+	{CW_TYPE_BSTR16,"cisco/wep-key",13,9},
-	{CW_TYPE_BYTE,"wep-key-index",1,41},
+	{CW_TYPE_BYTE,"cisco/wep-key-index",1,41},
-	{CW_TYPE_BOOL,"wep-encryption",1,42},
+	{CW_TYPE_BOOL,"cisco/wep-encryption",1,42},
 
-	{CW_TYPE_BYTE,"qos",1,324},
+	{CW_TYPE_BYTE,"capwap80211/qos",1,324},
-	{CW_TYPE_WORD,"scan-defer-period",1,328},
+	{CW_TYPE_WORD,"cisco/scan-defer-period",1,328},
-	{CW_TYPE_WORD,"scan-defer-time",1,330},
+	{CW_TYPE_WORD,"cisco/scan-defer-time",1,330},
-	{CW_TYPE_BOOL,"broadcast-ssid",1,332},
+	{CW_TYPE_BOOL,"cisco/broadcast-ssid",1,332},
-	{CW_TYPE_BOOL,"aironet-ie",1,333},
+	{CW_TYPE_BOOL,"cisco/aironet-ie",1,333},
-	{CW_TYPE_BYTE,"hreap-local-switch",1,378},
+	{CW_TYPE_BYTE,"cisco/hreap-local-switch",1,378},
-	{CW_TYPE_WORD,"session-timout",2,381},
+	{CW_TYPE_WORD,"cisco/session-timout",2,381},
 
-	{CW_TYPE_BYTE, "dtim-period",1,440},
+	{CW_TYPE_BYTE, "cisco/dtim-period",1,440},
-	{CW_TYPE_STR,"profile-name",30,441},
+	{CW_TYPE_STR,"cisco/profile-name",30,441},
-	{CW_TYPE_STR, "ssid",33,474},
+	{CW_TYPE_STR, "capwap80211/ssid",33,474},
 
 	
 	{NULL,NULL,0,0}
@@ -653,10 +764,18 @@ static int cisco_add_wlan_mkkey70(const char *pkey, uint8_t*data, int len, char
         int wlan_id,radio_id;
         radio_id = cw_get_byte(data);
         wlan_id = cw_get_byte(data+4);
-        sprintf(dst,"radio.%d/wlan.%d/add-wlan",radio_id,wlan_id);
+        sprintf(dst,"radio.%d/wlan.%d",radio_id,wlan_id);
         return 1;
 }
 
+static int mkkey_sig_payload(const char *pkey, uint8_t*data, int len, char *dst)
+{
+        int id;
+        id = cw_get_byte(data+4);
+        sprintf(dst,"%s.%d",pkey,id);
+        return 0;
+}
+
 
 /*
 static int cisco_patch_add_wlan70(uint8_t * data, void * st)
@@ -1284,7 +1403,7 @@ static struct cw_ElemHandler handlers70[] = {
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
 		25,25,					/* min/max length */
 		CW_TYPE_STRUCT,				/* type */
-		"cisco/wtp-radio-config",		/* Key */
+		"capwap80211/wtp-radio-config",		/* Key */
 		cw_in_radio_generic,			/* get */
 		cw_out_radio_generic,			/* put */
 		NULL,
@@ -1316,7 +1435,7 @@ static struct cw_ElemHandler handlers70[] = {
 		"Antenna Payload (v7.0)",		/* name */
 		CW_CISCO_ANTENNA_PAYLOAD,		/* Element ID */
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
-		9,9,					/* min/max length */
+		9,100,					/* min/max length */
 		CW_TYPE_STRUCT,				/* type */
 		"cisco/antenna-payload",		/* Key */
 		cw_in_radio_generic,			/* get */
@@ -1411,16 +1530,31 @@ static struct cw_ElemHandler handlers70[] = {
 
 
 	{ 
-		"Cisco Elem 132",			/* name */
+		"Cisco AP 802.11h",				/* name */
-		CISCO_ELEM_132,				/* Element ID */
+		CISCO_ELEM_AP_DOT11H,				/* Element ID */
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
-		1,1024,					/* min/max length */
+		5,5,					/* min/max length */
-		CW_TYPE_BSTR16,				/* type */
+		CW_TYPE_STRUCT,				/* type */
-		"cisco/elem132",				/* Key */
+		"cisco/80211h",				/* Key */
+		cw_in_radio_generic,				/* get */
+		cw_out_radio_generic,				/* put */
+		NULL,
+		NULL,
+		cisco_ap_dot11h
+
+	},
+	{ 
+		"Cisco Boradcast SSID Mode",		/* name */
+		CISCO_ELEM_BCAST_SSID_MODE,		/* Element ID */
+		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
+		1,1,					/* min/max length */
+		CW_TYPE_BYTE,				/* type */
+		"cisco/bcast-ssid-mode",		/* Key */
 		cw_in_generic,				/* get */
 		cw_out_generic				/* put */
 	},
 
+
 	{ 
 		"Cisco Elem 33",			/* name */
 		CISCO_ELEM_33,				/* Element ID */
@@ -1431,6 +1565,17 @@ static struct cw_ElemHandler handlers70[] = {
 		cw_in_generic,				/* get */
 		cw_out_generic				/* put */
 	},
+	{ 
+		"Cisco - Client Auto Hand-Off",		/* name */
+		CISCO_ELEM_CLIENT_AUTO_HANDOFF,			/* Element ID */
+		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
+		1,1,					/* min/max length */
+		CW_TYPE_BYTE,				/* type */
+		"cisco/client-auto-handoff",			/* Key */
+		cw_in_generic,				/* get */
+		cw_out_generic				/* put */
+	},
+
 
 	{ 
 		"Cisco Elem 15 - Channel Setting (?)",	/* name */
@@ -1438,7 +1583,7 @@ static struct cw_ElemHandler handlers70[] = {
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
 		1,1024,					/* min/max length */
 		CW_TYPE_STRUCT,				/* type */
-		"cisco/elem15",				/* Key */
+		"cisco/channel-setting",				/* Key */
 		cw_in_radio_generic,			/* get */
 		cw_out_radio_generic,			/* put */
 		NULL,
@@ -1448,8 +1593,8 @@ static struct cw_ElemHandler handlers70[] = {
 	},
 
 	{ 
-		"Cisco Elem 16 ",		/* name */
+		"Cisco - Supported Rates",		/* name */
-		CISCO_ELEM_16,				/* Element ID */
+		CISCO_ELEM_SUPPORTED_RATES,				/* Element ID */
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
 		1,1024,					/* min/max length */
 		CW_TYPE_BSTR16,				/* type */
@@ -1462,6 +1607,22 @@ static struct cw_ElemHandler handlers70[] = {
 
 	},
 
+	{ 
+		"Cisco Elem 25 ",		/* name */
+		CISCO_ELEM_RRM_LOAD,				/* Element ID */
+		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
+		4,4,					/* min/max length */
+		CW_TYPE_STRUCT,				/* type */
+		"cisco/rrm",				/* Key */
+		cw_in_radio_generic,			/* get */
+		cw_out_radio_generic,			/* put */
+		NULL,
+		NULL,
+		cisco_rrm_load_stru,
+
+	},
+
+
 
 
 	{ 
@@ -1520,12 +1681,12 @@ static struct cw_ElemHandler handlers70[] = {
 	},
 
 	{ 
-		"Cisco Elem 48",			/* name */
+		"Cisco - Spam CFP Status",		/* name */
-		CISCO_ELEM_48,				/* Element ID */
+		CISCO_ELEM_SPAM_CFP_STATUS,				/* Element ID */
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
-		1,1024,					/* min/max length */
+		2,2,					/* min/max length */
-		CW_TYPE_BSTR16,				/* type */
+		CW_TYPE_BOOL,				/* type */
-		"cisco/elem48",				/* Key */
+		"cisco/spam-cfp-status",				/* Key */
 		cw_in_radio_generic,			/* get */
 		cw_out_radio_generic			/* put */
 	},
@@ -1547,21 +1708,21 @@ static struct cw_ElemHandler handlers70[] = {
 	},
 
 	{ 
-		"Cisco LWAPP Elem 11",			/* name */
+		"Cisco LWAPP AP MFP Cap. Sub-type",	/* name */
 
-		CISCO_LWELEM_11,				/* Element ID */
+		CISCO_LWELEM_AP_MFP_CAP_SUBTYPE,				/* Element ID */
 		CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP,	/* Vendor / Proto */
 		
-		1,1024,					/* min/max length */
+		5,5,					/* min/max length */
-		CW_TYPE_BSTR16,				/* type */
+		CW_TYPE_DWORD,				/* type */
-		"cisco/lwelem11",			/* Key */
+		"cisco/ap-mfp-cap-subtype",			/* Key */
 		cw_in_radio_generic,			/* get */
 		cw_out_radio_generic			/* put */
 	},
 
 	{ 
-		"Cisco LWAP Elem 14",			/* name */
+		"Cisco AP MFP Config Subt.",			/* name */
-		CISCO_LWELEM_14,				/* Element ID */
+		CISCO_LWELEM_AP_MFP_CONFIG_SUBTYPE,				/* Element ID */
 		CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP,	/* Vendor / Proto */
 		
 		1,1024,					/* min/max length */
@@ -1574,43 +1735,52 @@ static struct cw_ElemHandler handlers70[] = {
 
 
 	{ 
-		"Cisco LWAP Elem 27",			/* name */
+		"Cisco LWAPP PHY HT Cap.",			/* name */
 
-		CISCO_LWELEM_27,				/* Element ID */
+		CISCO_LWELEM_PHY_HT_CAP,				/* Element ID */
 		CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP,	/* Vendor / Proto */
 		
-		1,1024,					/* min/max length */
+		26,26,					/* min/max length */
-		CW_TYPE_BSTR16,				/* type */
+		CW_TYPE_STRUCT,				/* type */
-		"cisco/lwelem27",			/* Key */
+		"cisco/phy-ht-cap",			/* Key */
 		cw_in_radio_generic,			/* get */
-		cw_out_radio_generic			/* put */
+		cw_out_radio_generic,		/* put */
+		NULL,
+		NULL,
+		cisco_phy_ht_cap_stru,
 	},
 
 
 	{ 
-		"Cisco LWAP Elem 28",			/* name */
+		"Cisco LWAPP Station Cfg 28 ???",			/* name */
 
 		CISCO_LWELEM_28,				/* Element ID */
 		CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP,	/* Vendor / Proto */
 		
 		1,1024,					/* min/max length */
-		CW_TYPE_BSTR16,				/* type */
+		CW_TYPE_STRUCT,				/* type */
-		"cisco/lwelem28",			/* Key */
+		"cisco/station-cfg",			/* Key */
 		cw_in_radio_generic,			/* get */
-		cw_out_radio_generic			/* put */
+		cw_out_radio_generic,			 /* put */
+		NULL,
+		NULL,
+		cisco_station_cfg_stru,
 	},
 
 	{ 
-		"Cisco LWAPP Elem 29",			/* name */
+		"Cisco LWAPP PHY HT Control",		/* name */
 
-		CISCO_LWELEM_29,				/* Element ID */
+		CISCO_LWELEM_PHY_HT_CONTROL,				/* Element ID */
 		CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP,	/* Vendor / Proto */
 		
 		1,1024,					/* min/max length */
-		CW_TYPE_BSTR16,				/* type */
+		CW_TYPE_STRUCT,				/* type */
-		"cisco/lwelem29",			/* Key */
+		"cisco/phy-ht-control",			/* Key */
 		cw_in_radio_generic,			/* get */
-		cw_out_radio_generic			/* put */
+		cw_out_radio_generic,			/* put */
+		NULL,
+		NULL,
+		cisco_phy_ht_control_stru
 	},
 
 
@@ -1728,14 +1898,17 @@ static struct cw_ElemHandler handlers70[] = {
 	},
 
 	{ 
-		"Cisco Elem 47",			/* name */
+		"Cisco - Performance Profile",		/* name */
-		CISCO_ELEM_47,				/* Element ID */
+		CISCO_ELEM_PERFORMANCE_PROFILE,				/* Element ID */
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
-		1,1024,					/* min/max length */
+		18,18,					/* min/max length */
-		CW_TYPE_BSTR16,				/* type */
+		CW_TYPE_STRUCT,				/* type */
-		"cisco/elem47",				/* Key */
+		"cisco/proformance-profile",		/* Key */
 		cw_in_radio_generic,			/* get */
-		cw_out_radio_generic			/* put */
+		cw_out_radio_generic,			/* put */
+		NULL,
+		NULL,
+		cisco_performance_profile_stru
 	},
 
 
@@ -1763,10 +1936,13 @@ static struct cw_ElemHandler handlers70[] = {
 		CISCO_ELEM_AP_QOS,			/* Element ID */
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
 		52,52,					/* min/max length */
-		cisco_ap_qos,				/* type */
+		CW_TYPE_STRUCT,				/* type */
 		"cisco/ap-qos",				/* Key */
-		cw_in_radio_generic_struct,		/* get */
+		cw_in_radio_generic,		/* get */
-		cw_out_radio_generic_struct		/* put */
+		cw_out_radio_generic, /* put */
+		NULL,
+		NULL,
+		cisco_ap_qos,
 	},
 
 	{ 
@@ -1906,9 +2082,9 @@ static struct cw_ElemHandler handlers70[] = {
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
 		7,1117,					/* min/max length */
 		CW_TYPE_STRUCT,				/* type */
-		"radio/wlan/add-wlan",			/* Key */
+		"radio/wlan/",				/* Key */
 		cw_in_generic,				/* get */
-		cw_out_traverse,			/* put */
+		cw_out_generic_walk,			/* put */
 		cisco_add_wlan_mkkey70,
 		NULL, //		cisco_patch_add_wlan70
 		cisco_add_wlan70
@@ -1920,12 +2096,13 @@ 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 */
-		cisco_add_lwwlan,			/* type */
+		CW_TYPE_STRUCT,				/* type */
 		"radio/wlan/add-lw-wlan",		/* Key */
-		cw_in_generic_struct,			/* get */
+		cw_in_generic,				/* get */
 		cw_out_traverse,			/* put */
 		cisoc_add_lwwlan_mkkey,
-		cisco_patch_add_lwwlan
+		cisco_patch_add_lwwlan,
+		cisco_add_lwwlan,
 	}
 	,
 
@@ -2022,10 +2199,13 @@ static struct cw_ElemHandler handlers70[] = {
 		CISCO_LWELEM_RAD_EXTENDED_CONFIG,	/* Element ID */
 		CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP,	/* Vendor / Proto */
 		13,13,					/* min/max length */
-		cisco_rad_extended_config,		/* type */
+		CW_TYPE_STRUCT,				/* type */
 		"cisco/rad-extended-config",		/* Key */
-		cw_in_radio_generic_struct,		/* get */
+		cw_in_radio_generic,		/* get */
-		cw_out_radio_generic_struct		/* put */
+		cw_out_radio_generic,		/* put */
+		NULL,
+		NULL,
+		cisco_rad_extended_config,
 	},
 
 	{
@@ -2069,6 +2249,21 @@ static struct cw_ElemHandler handlers70[] = {
 		cw_out_generic					/* put */
 	}
 	,
+	{
+		"CISCO Sig Payload",				/* name */
+		CISCO_ELEM_SIG_PAYLOAD,				/* Element ID */
+		CW_VENDOR_ID_CISCO, 0,				/* Vendor / Proto */
+		1, 1024,					/* min/max length */
+		CW_TYPE_BSTR16,					/* type */
+		"cisco/sig-payload",				/* Key */
+		cw_in_generic,					/* get */
+		cw_out_generic,					/* put */
+		mkkey_sig_payload,				/* mkkey */
+		NULL,
+
+	}
+	,
+
 
 	{
 		"Dot11r WLC Mac And IP (Cisco)",		/* name */
@@ -2190,26 +2385,29 @@ static struct cw_ElemDef configuration_status_request_elements[] ={
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SPAM_VENDOR_SPECIFIC,0, CW_IGNORE},
 
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_15,				0, 0},	
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_16,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SUPPORTED_RATES,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_19,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_22,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_24,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_RRM_LOAD,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_33,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_39,				0, 0},	
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_47,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_BCAST_SSID_MODE,				0, 0},	
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_48,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_PERFORMANCE_PROFILE,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SPAM_CFP_STATUS,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_CLIENT_AUTO_HANDOFF,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_81,				0, 0},	
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_132,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_DOT11H,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_145,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_146,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_153,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_156,				0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_9,		0, 0},	
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_11,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_AP_MFP_CAP_SUBTYPE,	0, 0},	
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_14,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_AP_MFP_CONFIG_SUBTYPE,	0, 0},	
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_27,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_PHY_HT_CAP,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_28,	0, 0},	
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_29,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_PHY_HT_CONTROL,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_33,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_48,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_55,	0, 0},	
@@ -2237,21 +2435,21 @@ static struct cw_ElemDef configuration_status_request_elements[] ={
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_REGULATORY_DOMAIN,	1, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_MODEL,			1, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_RESET_BUTTON_STATE,		1, 0},
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_WTP_RADIO_CONFIGURATION,	1, 0},
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_WTP_RADIO_CONFIGURATION,	0, 0},
 
-	{0, CW_VENDOR_ID_CISCO,	CW_CISCO_ANTENNA_PAYLOAD,		1, 0},
+	{0, CW_VENDOR_ID_CISCO,	CW_CISCO_ANTENNA_PAYLOAD,		0, 0},
 
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AC_NAME_WITH_INDEX,		0, CW_IGNORE},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_CORE_DUMP,		0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_VENUE_SETTINGS,		0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_MAC_OPERATION,		0, 0},
 
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_TX_POWER,			1, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_TX_POWER,			0, 0},	
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_TX_POWER_LEVELS,		1, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_TX_POWER_LEVELS,		0, 0},	
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_CHANNEL_POWER,		1, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_CHANNEL_POWER,		0, 0},	
 
 	
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_AP_USERNAME_PASSWORD,	1, 0},
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_AP_USERNAME_PASSWORD,	0, 0},
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_AP_LOGHOST_CONFIG,		1, 0},
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_AP_TELNET_SSH,		1, 0},
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_AP_SUBMODE,		1, 0},
@@ -2273,28 +2471,31 @@ static struct cw_ElemDef configuration_status_request_elements[] ={
 static struct cw_ElemDef configuration_status_response_elements[] ={
 
 
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_BCAST_SSID_MODE,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_15,				0, 0},	
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_16,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SUPPORTED_RATES,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_19,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_22,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_24,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_RRM_LOAD,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_33,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_39,				0, 0},	
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_47,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_PERFORMANCE_PROFILE,				0, 0},	
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_48,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SPAM_CFP_STATUS,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_CLIENT_AUTO_HANDOFF,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_81,				0, 0},	
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_132,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_DOT11H,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_145,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_146,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_153,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_156,				0, 0},	
 
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_9,		0, 0},	
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_11,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_AP_MFP_CAP_SUBTYPE,	0, 0},	
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_14,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_AP_MFP_CONFIG_SUBTYPE,	0, 0},	
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_27,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_PHY_HT_CAP,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_28,	0, 0},	
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_29,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_PHY_HT_CONTROL,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_33,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_48,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_55,	0, 0},	
@@ -2312,7 +2513,7 @@ static struct cw_ElemDef configuration_status_response_elements[] ={
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_MULTI_DOMAIN_CAPABILITY,	0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_WTP_RADIO_CONFIGURATION,	1, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_DIRECT_SEQUENCE_CONTROL,	0, 0},
-	{0, CW_VENDOR_ID_CISCO,	CW_CISCO_ANTENNA_PAYLOAD,		1, 0},
+	{0, CW_VENDOR_ID_CISCO,	CW_CISCO_ANTENNA_PAYLOAD,		0, 0},
 	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_LED_STATE_CONFIG,		0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_LOG_FACILITY,		0, 0},
@@ -2332,31 +2533,41 @@ static struct cw_ElemDef configuration_status_response_elements[] ={
 };
 
 
-/*static uint16_t configuration_update_request_states[] = {CAPWAP_STATE_RUN,0};*/
 static struct cw_ElemDef configuration_update_request_elements[] ={
+
+	{0, 0,			CAPWAP_ELEM_RADIO_ADMINISTRATIVE_STATE,	0, 0},
+	{0, 0,			CAPWAP_ELEM_RADIO_OPERATIONAL_STATE,	0, 0},
+
+	{0,CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_GROUP_NAME,	0, 0},
+
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_BCAST_SSID_MODE,				0, 0},	
+
+
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SPAM_VENDOR_SPECIFIC,0, CW_IGNORE},
 
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_15,				0, 0},	
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_16,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SUPPORTED_RATES,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_19,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_22,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_24,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_RRM_LOAD,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_33,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_39,				0, 0},	
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_47,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_PERFORMANCE_PROFILE,				0, 0},	
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_48,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SPAM_CFP_STATUS,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_CLIENT_AUTO_HANDOFF,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_81,				0, 0},	
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_132,				0, 0},	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_DOT11H,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_145,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_146,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_153,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_156,				0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_9,		0, 0},	
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_11,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_AP_MFP_CAP_SUBTYPE,	0, 0},	
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_14,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_AP_MFP_CONFIG_SUBTYPE,	0, 0},	
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_27,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_PHY_HT_CAP,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_28,	0, 0},	
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_29,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_PHY_HT_CONTROL,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_33,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_48,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_55,	0, 0},	
@@ -2388,7 +2599,7 @@ static struct cw_ElemDef configuration_update_request_elements[] ={
 	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_MIN_IOS_VERSION,		0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_BACKUP_SOFTWARE_VERSION,	0, 0},
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_REGULATORY_DOMAIN,	0, 0},
+/*	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_REGULATORY_DOMAIN,	0, 0},*/
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_MODEL,			0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_RESET_BUTTON_STATE,		0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_WTP_RADIO_CONFIGURATION,	0, 0},
@@ -2400,10 +2611,12 @@ static struct cw_ElemDef configuration_update_request_elements[] ={
 //	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_VENUE_SETTINGS,		0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_80211_ASSOC_LIMIT,		0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SIG_TOGGLE,			0, 0},
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SIG_PAYLOAD,			0, 0},
+
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_MAC_OPERATION,		0, 0},
 
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_TX_POWER,			0, 0},	
-/*	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_TX_POWER_LEVELS,		1, 0},	*/
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_TX_POWER_LEVELS,		0, 0},	
 /*	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_CHANNEL_POWER,		1, 0},	*/
 
 
@@ -2438,10 +2651,13 @@ static struct cw_ElemDef configuration_update_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_ADD_WLAN,			0, CW_IGNORE},
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_RRM_LOAD,				0, 0},	
+
 	{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_RADIO_MODULE_INFO,	0, 0},
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_29,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_PHY_HT_CONTROL,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_55,	0, 0},	
 
 	{0,0,0,0,0}
 };
@@ -2465,7 +2681,7 @@ static struct cw_ElemDef change_state_event_request_elements[] ={
 	{0, 0,			CAPWAP_ELEM_RADIO_ADMINISTRATIVE_STATE,	1, 0},
 
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_HARDWARE_INFO,	1, 0},
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_RADIO_MODULE_INFO,	1, 0},
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_RADIO_MODULE_INFO,	0, 0},
 
 
 	{0,0,0,0,0}
@@ -2656,10 +2872,13 @@ static struct cw_ElemHandler handlers73[] = {
 		CISCO_ELEM_WTP_RADIO_CONFIGURATION,	/* Element ID */
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
 		27,27,					/* min/max length */
-		cisco_wtp_radio_config73,		/* type */
+		CW_TYPE_STRUCT,				/* type */
-		"cisco/wtp-radio-config",		/* Key */
+		"capwap80211/wtp-radio-config",		/* Key */
-		cw_in_radio_generic_struct,		/* get */
+		cw_in_radio_generic,			/* get */
-		cw_out_radio_generic_struct		/* put */
+		cw_out_radio_generic,			/* put */
+		NULL,
+		NULL,
+		cisco_wtp_radio_config73,
 	}
 	,
 
@@ -2689,10 +2908,13 @@ static struct cw_ElemHandler handlers75[] = {
 		CISCO_ELEM_WTP_RADIO_CONFIGURATION,	/* Element ID */
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
 		28,28,					/* min/max length */
-		cisco_wtp_radio_config75,		/* type */
+		CW_TYPE_STRUCT,				/* type */
-		"cisco/wtp-radio-config",		/* Key */
+		"capwap80211/wtp-radio-config",		/* Key */
-		cw_in_radio_generic_struct,		/* get */
+		cw_in_radio_generic,			/* get */
-		cw_out_radio_generic_struct		/* put */
+		cw_out_radio_generic,			/* put */
+		NULL,
+		NULL,
+		cisco_wtp_radio_config75,
 	}
 	,
 	{ 
@@ -2700,10 +2922,13 @@ static struct cw_ElemHandler handlers75[] = {
 		CISCO_ELEM_MAC_OPERATION,		/* Element ID */
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
 		17,17,					/* min/max length */
-		cisco_mac_operation75,			/* type */
+		CW_TYPE_STRUCT,				/* type */
 		"cisco/mac-operation",			/* Key */
-		cw_in_radio_generic_struct,		/* get */
+		cw_in_radio_generic,			/* get */
-		cw_out_radio_generic_struct		/* put */
+		cw_out_radio_generic,			/* put */
+		NULL,
+		NULL,
+		cisco_mac_operation75,
 	},
 
 	{0,0,0,0,0,0,0,0}
@@ -2756,6 +2981,24 @@ struct cw_MsgSet * cisco_register_msg_set(struct cw_MsgSet * set, int mode){
         return set;
 }
 
+static void update_msgset(struct cw_MsgSet *msgset, bstr_t version)
+{
+	if(bstr16_len(version)==4){
+		uint32_t rv;
+		rv = cw_get_dword(bstr16_data(version));
+		
+		if (rv >= 0x07030000){
+			cw_dbg(DBG_MOD, "CISCO - Loading messages for 0x%08X >= 0x07030000", rv);
+			cw_msgset_add(msgset,messages73, handlers73);
+		}
+		if (rv >= 0x07056600){
+			cw_dbg(DBG_MOD, "CISCO - Loading messages for 0x.x%08X >= 0x07056600", rv);
+			cw_msgset_add(msgset,messages75, handlers75);
+		}
+	}
+
+
+}
 
 
 static void set_ac_version(struct cw_ElemHandlerParams * params)
@@ -2772,23 +3015,11 @@ static void set_ac_version(struct cw_ElemHandlerParams * params)
 	cw_cfg_set_bstr16(params->conn->local_cfg,"capwap/ac-descriptor/software/version",wtpver);
 	cw_cfg_set_int(params->conn->local_cfg,"capwap/ac-descriptor/software/vendor",CW_VENDOR_ID_CISCO);
 
-	if(bstr16_len(wtpver)==4){
+	update_msgset(params->msgset,wtpver);
-		uint32_t rv;
-		rv = cw_get_dword(bstr16_data(wtpver));
-		
-		if (rv >= 0x07030000){
-			cw_msgset_add(params->msgset,messages73, handlers73);
-		}
-		if (rv >= 0x07056600){
-			cw_msgset_add(params->msgset,messages75, handlers75);
-		}
-	}
-
 	free(wtpver);
 }
 
 static int postprocess_discovery(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
-//static int postprocess_discovery(struct cw_Conn *conn)
 {
 	if (params->conn->role == CW_ROLE_AC ){
 		set_ac_version(params);
@@ -2798,7 +3029,6 @@ static int postprocess_discovery(struct cw_ElemHandlerParams * params, uint8_t *
 }
 
 static int postprocess_join_request(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
-//static int postprocess_join_request(struct cw_Conn *conn)
 {
 	if (postprocess_join_request_parent!=NULL){
 		postprocess_join_request_parent(params,elems_ptr,elems_len);
@@ -2816,13 +3046,14 @@ static int preprocess_join_request(struct cw_Conn *conn)
 	if (conn->role != CW_ROLE_WTP)
 		return 0;
 
-	use_ac_version = cw_cfg_get_bool(conn->global_cfg,"cisco/wtp-use-ac-version",0);
+	use_ac_version = cw_cfg_get_bool(conn->global_cfg,"mod/cisco/wtp-use-ac-version",0);
 	if (use_ac_version){
 		ver = cw_cfg_get_bstr16(conn->remote_cfg,"capwap/ac-descriptor/software/version",NULL );
 		if (ver != NULL){
 			cw_cfg_set_bstr16(conn->local_cfg,"capwap/wtp-descriptor/software/version",ver);
 			cw_format_version(verstr,bstr16_data(ver),bstr16_len(ver));
-			cw_dbg(DBG_INFO, "Cisco WTP - Using AC's software version: %s", verstr);
+			cw_dbg(DBG_MOD, "CISCO WTP - Using AC's software version: %s", verstr);
+			update_msgset(conn->msgset,ver);
 			free(ver);
 		}
 		else{
@@ -2830,33 +3061,5 @@ static int preprocess_join_request(struct cw_Conn *conn)
 		}
 
 	}
-
-//	stop();
-
-/*		
-
-	if (use_ac_version){
-		ver = cw_ktv_get(conn->remote_cfg,"ac-descriptor/software/version", CW_TYPE_BSTR16);
-		cw_ktv_replace(conn->local_cfg,"wtp-descriptor/software/version",CW_TYPE_BSTR16, NULL,
-			ver->type->data(ver),ver->type->len(ver));
-			
-		cw_format_version(verstr,ver->type->data(ver),ver->type->len(ver));
-		cw_dbg(DBG_INFO, "Cisco WTP - Using AC's software version: %s", verstr);
-		
-	}
-	else{
-		ver = cw_ktv_get(conn->local_cfg,"wtp-descriptor/software/version", CW_TYPE_BSTR16);
-		cw_format_version(verstr,ver->type->data(ver),ver->type->len(ver));
-		cw_dbg(DBG_INFO, "Cisco - WTP Using own software version: %s", verstr);
-	}
-	
-	if(ver->type->len(ver)==4){
-		uint32_t rv;
-		rv = cw_get_dword(ver->type->data(ver));
-		if (rv >= 0x07056600){
-			cw_msgset_add(conn->msgset,messages75, handlers75);
-		}
-	}
-*/	
 	return 1;
 }

src/mod/cisco/cisco_out_radio_generic.c

@@ -32,8 +32,8 @@ int cisco_out_radio_info(struct cw_ElemHandler * handler, struct cw_ElemHandlerP
 {
 	if (! (params->msgdata->type & 1) ){
 		int start = params->msgset->header_len(handler);
-		cw_put_byte(dst+start,0);
+		cw_set_byte(dst+start,0);
-		cw_put_dword(dst+start+1,7);
+		cw_set_dword(dst+start+1,7);
 		return params->msgset->write_header(handler,dst,5);
 	}
 	return cw_out_radio_generic(handler,params,dst);	

src/mod/cisco/lwapp_cisco.h

@@ -29,15 +29,16 @@
  */
 
 #define CISCO_LWELEM_9				9
-#define CISCO_LWELEM_11				11
+#define CISCO_LWELEM_AP_MFP_CAP_SUBTYPE		11
-#define CISCO_LWELEM_14				14
+#define CISCO_LWELEM_AP_MFP_CONFIG_SUBTYPE	14
 #define CISCO_LWELEM_AP_USERNAME_PASSWORD	18
 #define LW_CISCO_MANAGER_IP_ADDR		19
 #define CISCO_LWELEM_DISCOVERY_PROTOCOL		20
 #define CISCO_LWELEM_RADIO_MODULE_INFO		21
-#define CISCO_LWELEM_27				27
+#define CISCO_LWELEM_PHY_HT_CAP			27
+//#define CISCO_LWELEM_STATION_CFG		28
 #define CISCO_LWELEM_28				28
-#define CISCO_LWELEM_29				29
+#define CISCO_LWELEM_PHY_HT_CONTROL		29
 #define CISCO_LWELEM_AC_IP_ADDR_WITH_INDEX	32
 #define CISCO_LWELEM_33				33
 #define CISCO_LWELEM_AP_ETHERNET_PORT_SUBTYPE	34

src/mod/cisco/mod_cisco_ac.c

@@ -100,8 +100,8 @@ static void errfunc(cfg_t *cfg, const char *fmt, va_list ap){
 static int init(struct cw_Mod *mod, cw_Cfg_t * global_cfg, int role)
 {
 /*	uint8_t * str;*/
-	static char * hardware_version; /*strdup(".x01000001");*/
+//	static char * hardware_version; /*strdup(".x01000001");* /
-	static char * software_version; /* = NULL; */
+//	static char * software_version; /* = NULL; * /
 /*	cfg_t *cfg;*/
 	
 	int rc = 1;
@@ -117,13 +117,18 @@ static int init(struct cw_Mod *mod, cw_Cfg_t * global_cfg, int role)
 	capwap_mod = cw_mod_load("capwap",global_cfg,role);
 	if (capwap_mod == NULL){
 		cw_log(LOG_ERR, "CISCO: failed to load base module 'capwap");
+		return 0;
 	}
 
+	cw_dbg(DBG_MOD, "CISCO: Loading base module: capwap80211");
 	capwap80211_mod = cw_mod_load("capwap80211", global_cfg,role);
 	if (capwap_mod == NULL){
 		cw_log(LOG_ERR, "CISCO: failed to load base module 'capwap80211");
+		return 0;
 	}
 
+	cw_dbg(DBG_MOD, "CISCO: All base modules are sucessfully loaded.");
+
 	/*cisco_config = mbag_create();*/
 
 
@@ -162,10 +167,10 @@ static int init(struct cw_Mod *mod, cw_Cfg_t * global_cfg, int role)
 	}
 */
 /*errX:*/
-	if (hardware_version)
+/*	if (hardware_version)
 		free (hardware_version);
 	if (software_version)
-		free(software_version);
+		free(software_version);*/
 	return rc;
 }
 

src/wtp/1142-factroy-70.ckv

@@ -1,201 +0,0 @@
-#
-# Join Request
-#
-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.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
-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: 
-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-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: 84
-cisco/ap-uptime/last-uptime: 1
-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$ZFkU$zIX6UG1NozXk2.V1lZNIV.
-cisco/ap-username-and-password/login-credentials/username: Cisco
-cisco/cisco-discovery-protocol/data: 513
-cisco/cisco-discovery-protocol/enabled: false
-cisco/loghost-config/last-joined-ap: None
-cisco/loghost-config/loghost: 255.255.255.255
-cisco/lwelem105: .x0000
-cisco/lwelem14: .x000100000000000000000000000000000000
-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/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
-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
-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/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
-radio.0/cisco/mac-operation/rts-threshold: 2347
-radio.0/cisco/mac-operation/rx-msdu-lifetime: 1000
-radio.0/cisco/mac-operation/short-retry: 0
-radio.0/cisco/mac-operation/tx-msdu-lifetime: 5000
-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/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
-radio.0/cisco/wtp-radio-config/cfg-type: 1
-radio.0/cisco/wtp-radio-config/cfp-maximum-duration: 0
-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/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
-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/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
-radio.1/cisco/mac-operation/rts-threshold: 2347
-radio.1/cisco/mac-operation/rx-msdu-lifetime: 1000
-radio.1/cisco/mac-operation/short-retry: 0
-radio.1/cisco/mac-operation/tx-msdu-lifetime: 5000
-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/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
-radio.1/cisco/wtp-radio-config/cfg-type: 1
-radio.1/cisco/wtp-radio-config/cfp-maximum-duration: 0
-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/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
-wtp-board-data/mac-address: .x0800276edf58
-
-

src/wtp/cisco.ckv

@@ -1,320 +0,0 @@
-#
-# 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

src/wtp/configure.c

@@ -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.cfgfilename, params->conn->global_cfg,
+	cw_cfg_save(bootcfg.config_file, 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 ***");
 

src/wtp/discovery.c

@@ -81,12 +81,6 @@ static struct cw_DiscoveryResults * run_discovery(struct cw_Conn *conn)
 	while (!cw_timer_timeout(timer)
 	       && conn->capwap_state == CAPWAP_STATE_DISCOVERY) {
 		int rc;
-//		conn->remote_cfg = cw_ktv_create();
-//		if (conn->remote_cfg == NULL) {
-//			cw_log_errno("Can't allocate memory for remote_cfg");
-//			break;
-//		}
-
 		rc = cw_read_from(conn, &from);
 		if (rc < 0) {
 			if (errno == EAGAIN)

src/wtp/run.c

@@ -6,7 +6,6 @@
 #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"
@@ -36,7 +35,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.cfgfilename, params->conn->global_cfg,
+	cw_cfg_save(bootcfg.config_file, 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;

src/wtp/wtp.h

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

src/wtp/wtp_main.c

@@ -32,9 +32,11 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
 	int c;
 	opterr = 1;
 	
-	bootcfg->cfgfilename = "config.ckv";
+	bootcfg->config_file = "config.ckv";
+	bootcfg->startup_file = "startup.ckv";
+	bootcfg->local_startup_file ="startup-local.ckv";
 	
-	while ( (c = getopt (argc, argv, "p:d:vc:m:h")) != -1) {
+	while ( (c = getopt (argc, argv, "l:s:p:d:vc:m:h")) != -1) {
 		
 		switch (c) {
 			case 'v':
@@ -59,7 +61,13 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
 				cw_mod_set_path(optarg);
 				break;
 			case 'c':
-				bootcfg->cfgfilename = optarg;
+				bootcfg->config_file = optarg;
+				break;
+			case 's':
+				bootcfg->startup_file = optarg;
+				break;
+			case 'l':
+				bootcfg->local_startup_file = optarg;
 				break;
 			case '?':
 				exit(EXIT_FAILURE);
@@ -76,6 +84,7 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
 #include "cw/rand.h"
 
 
+
 struct bootcfg bootcfg;
 
 
@@ -86,7 +95,7 @@ int main (int argc, char **argv)
 	struct cw_Conn * conn=NULL;
 	//FILE * file;
 	cw_Cfg_t * global_cfg =NULL;
-	//const cw_Type_t ** ti;
+	cw_Cfg_t * cfg=NULL;
 	int i;
 	int rc=EXIT_FAILURE;	
 	struct cw_DiscoveryResults * results;
@@ -104,7 +113,10 @@ int main (int argc, char **argv)
 		bootcfg.nmods=2;
 	}
 
-	cw_dbg_set_level(DBG_X,0);
+	/* 
+	 * set ths for production
+	 * cw_dbg_set_level(DBG_X,0); 
+	 * */
 	
 
 	/* create an empty message set */
@@ -120,14 +132,43 @@ 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 initial config file */
+
-	rc = cw_cfg_load(bootcfg.cfgfilename,global_cfg);	
+	/* read the startup config file */
+	rc = cw_cfg_load(bootcfg.startup_file,global_cfg);	
 	if (rc){
-		cw_log(LOG_ERR,"Can't open file '%s':%s",bootcfg.cfgfilename, strerror(errno));
+		cw_log(LOG_ERR,"Can't open file '%s':%s",bootcfg.startup_file, strerror(errno));
+		goto errX;
+	}
+	cw_dbg(DBG_INFO,"Startup '%s' loaded.",bootcfg.startup_file);
+
+	if (access(bootcfg.local_startup_file,F_OK)==0){
+		rc = cw_cfg_load(bootcfg.local_startup_file,global_cfg);
+		if (rc){
+			cw_log(LOG_ERR,"Can't open file '%s':%s",bootcfg.local_startup_file, strerror(errno));
+			goto errX;
+		}
+		cw_dbg(DBG_INFO,"Local startup '%s' loaded.",bootcfg.local_startup_file);
+	}
+
+	cw_cfg_dump(global_cfg);
+
+	/* 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);
@@ -137,6 +178,7 @@ int main (int argc, char **argv)
 		goto errX;
 	}
 
+	cw_cfg_destroy(cfg);
 
 /*	conn->mod=mod;*/
 	conn->detected = 1;

ssl/mkciscoimport.sh

@@ -7,7 +7,7 @@ then
 fi
 
 
-#echo clock set $(date "+%H:%M:%S %d %b %Y")
+echo clock set $(date "+%H:%M:%S %d %b %Y")
 echo debug capwap console cli
 echo configure terminal
 echo crypto ca profile enrollment ACTube