Removed libwifi dependencies

So there is an unlimited number of debug options, instead of 32 as
before.

INSTALL

@@ -1,38 +1,34 @@
 pre-requisites to build actube
 ==============================
 
+Compile 
+=======
 
-
-
-
-On FreeBSD 10.2
+FreeBSD 
 ----------------
 
-pkg install libconfuse
 pkg install wget
-pkg install libnettle
+pkg install nettle
+cd src/contrib
+sh install_libmavl
+cd ..
+make
 
 
-Ubuntu 14.04
-------------
+Ubuntu
+------
 
 apt-get install build-essential clang
 apt-get install nettle-dev
-apt-get install libgnutls28-dev
 apt-get install libssl-dev
-
-
-
-pre-requisites to build wtp
-===========================
-
-Ubuntu 14.04
-------------
-
-apt-get install cmake
-apt-get install libnl-genl-3-dev
+apt install libedit-dev
+apt install bmake
 cd src/contrib
-sudo ./install_libuci.sh
+sh install_libmavl
+cd ..
+bmake
+
+
 
 
 

README.md

@@ -2,6 +2,62 @@ AC-Tube
 =======
 Open Source CAPWAP WLC + WTP
 
-Current status: early development.
+Current status: development.
 
 See also http://7u83.cauwersin.com/?cat=28
+
+What you can do so far ...
+
+Read INSTALL and compile actube.
+
+Then ...
+
+Create certificates:
+    
+     cd ssl
+     sh all.sh
+     cd ..
+
+Edit src/actube/config.ckv and set your IP in
+capwap/control-ip-address/address.0
+
+Start actube with some debug options:
+    
+     cd src/ac
+     ./actube -d std -d mod -d elem\_detail -d elem\_dmp
+
+If you have an AP with IOS 7.3x it should connect. Others
+might connect, too.
+
+Make sure on the AP you heve made
+clear capwap private-config.
+
+In another terminal window connect to the RPC interface:
+    
+     cd src/ac
+     ./act -s 127.0.0.1:5000
+
+Send some commands to bring up a WLAN:
+    
+     list                # list all connected APs
+     select <apname>     # set <apname> to the name of AP you want to select
+     status 		# show status of selected AP
+
+     # the following sequence activates a WLAN called actube on AP
+
+     load wlan1
+     send
+     clear
+     load activate
+     send
+
+     status		# This should display now oper status for 
+			    # interface 0 enabled
+
+
+CWAPWAP data layer is still not finished, so you can't use the WLAN
+
+
+
+
+

actube.workspace

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CodeLite_Workspace Name="actube" Database="">
-  <Project Name="ac" Path="ac.project" Active="No"/>
-  <Project Name="wtp" Path="wtp.project" Active="No"/>
-  <Project Name="mod_cipwap" Path="mod_cipwap.project" Active="No"/>
-  <Project Name="mod_capwap" Path="mod_capwap.project" Active="No"/>
-  <Project Name="mod_cisco" Path="mod_cisco.project" Active="Yes"/>
-  <Project Name="libcw" Path="libcw.project" Active="No"/>
-  <Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="No"/>
-  <Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/>
-  <BuildMatrix>
-    <WorkspaceConfiguration Name="Debug" Selected="yes">
-      <Environment/>
-      <Project Name="ac" ConfigName="Debug"/>
-      <Project Name="wtp" ConfigName="Debug"/>
-      <Project Name="mod_cipwap" ConfigName="Debug"/>
-      <Project Name="mod_capwap" ConfigName="Debug"/>
-      <Project Name="mod_cisco" ConfigName="Debug"/>
-      <Project Name="libcw" ConfigName="Debug"/>
-      <Project Name="mod_capwap80211" ConfigName="Debug"/>
-      <Project Name="mod_fortinet" ConfigName="Debug"/>
-    </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Release" Selected="yes">
-      <Environment/>
-      <Project Name="ac" ConfigName="Release"/>
-      <Project Name="wtp" ConfigName="Release"/>
-      <Project Name="mod_cipwap" ConfigName="Release"/>
-      <Project Name="mod_capwap" ConfigName="Release"/>
-      <Project Name="mod_cisco" ConfigName="Release"/>
-      <Project Name="libcw" ConfigName="Release"/>
-      <Project Name="mod_capwap80211" ConfigName="Release"/>
-      <Project Name="mod_fortinet" ConfigName="Release"/>
-    </WorkspaceConfiguration>
-  </BuildMatrix>
-</CodeLite_Workspace>

src/ac/Makefile

@@ -5,13 +5,16 @@ include ../Defs.mak
 OBJS = \
 	wtplist.o wtpman.o conf.o ac_main.o \
 	dataman.o \
-	ac_interface.o \
 	socklist.o \
 	discovery_cache.o\
-	shell.o\
+	rpc.o\
 	statemachine.o\
+	#hapd.o
 
+ACTOBJS = \
+	act.o 
 
+ACTPRG=act
 PRG=actube
 LIBPATH=-L../../lib/$(KERNEL)/$(ARCH)/ -L/usr/local/lib -L/usr/lib 
 
@@ -23,22 +26,39 @@ LIBS+=-lc
 LIBS+=-lnettle
 LIBS+=-lssl
 LIBS+=-lcrypto
+LIBS+=-ledit
+#LIBS+=-l:libhapd.a
 
-INCL_DIRS=-I../ -I/usr/local/include -I./ -I../../include
+INCL_DIRS=-I../ -I/usr/local/include -I./ -I../../include -I../../include/hostapd -I../../include/hostapd/utils
 #FLAGS=-DWITH_IPV6 -DWITH_OPENSSL -DSYS_ARCH="$(ARCH)" -DSYS_ARCH="XXX"
-FLAGS=-DWITH_IPV6 -DUSE_OPENSSL -DSYS_ARCH='"$(ARCH)"'
+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
+
+	
 
 .c.o:
 	@echo "  $(CC) "$<
 	$(CC) $(FLAGS) $(INCL_DIRS) -c $(CFLAGS) $< -o $@
 
+all: $(PRG) $(ACTPRG)
 
 $(PRG): $(OBJS) 
-#	$(CC) $(AC_OBJS) ../mod/modload_ac.o -o $(AC_NAME) $(LDFLAGS) $(LIBS)
 	$(CC) $(OBJS) -o $(PRG) $(LIBPATH) $(LDFLAGS) $(LIBS) 
 
+#$(ACTPRG): $(ACTOBJS)
+#	$(CC) $(ACTOBJS) -o $(ACTPRG) $(LIBPATH) $(LIBS) -ledit  
+	#$(CC) $(ACTOBJS) $(ACTPRG) $(LIBPATH) $(LDFLAGS) $(LIBS) -ledit  
+
+
+
+
 
 clean: 
 	rm -f $(PRG) $(OBJS)
+	rm -f $(ACTPRG) $(ACTOBJS)
 
 

src/ac/ac.h

@@ -1,9 +1,7 @@
 #ifndef __ACTUBE_AC_H
 #define __ACTUBE_AC_H
 
-#include "mavl.h"
-#include "cw/mavltypes.h"
-
+#include "cw/cfg.h"
 
 extern struct ac_status ac_global_status;
 
@@ -19,8 +17,10 @@ enum {
 	AC_PROTO_UNKNOWN
 };
 
-void start_shell();
+int start_rpc(cw_Cfg_t *global_cfg);
+int test_shell();
 
+void hapd_run();
 
 #endif
 

src/ac/ac_interface.c

@@ -1,103 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include "cw/sock.h"
-
-#include "socklist.h"
-#include "conf.h"
-
-#include "cw/capwap.h"
-/*//#include "cw/capwap_80211.h"*/
-/*#include "cw/aciplist.h"*/
-
-
-/*
-int pr(void *x,void *y){
-}
-*/
-
-/*
-struct radioinfo * get_radioinfo()
-{
-	
-}
-*/
-
-
-/*
-struct ac_info * get_acinfo()
-{
-	
-	struct ac_info * acinfo;
-	acinfo = malloc(sizeof(struct ac_info));
-	if(!acinfo)
-		return 0;
-
-	memset(acinfo,0,sizeof(struct ac_info));
-	acinfo->ac_name=conf_acname;
-
-	acinfo->stations=10;
-	acinfo->limit=10000;
-	acinfo->active_wtps=10;
-	acinfo->max_wtps=conf_max_wtps;
-	acinfo->rmac=1; 	
-
-	acinfo->vendor_id=conf_vendor_id;
-
-	acinfo->hardware_version=(uint8_t*)conf_hardware_version;
-	acinfo->software_version=(uint8_t*)conf_software_version;
-	acinfo->cisco_hardware_version=(uint8_t*)conf_cisco_hardware_version;
-	acinfo->cisco_software_version=(uint8_t*)conf_cisco_software_version;
-
-
-	if (conf_dtls_psk)
-		acinfo->security|=AC_SECURITY_S;
-	if (conf_sslkeyfilename && conf_sslcertfilename)
-		acinfo->security|=AC_SECURITY_X;
-
-
-//	acinfo->dtls_policy = AC_DTLS_POLICY_C | AC_DTLS_POLICY_D ;
-//	acinfo->ac_ips = conf_ac_ips;
-//	acinfo->ac_ips_len=conf_ac_ips_len;
-
-//	acinfo->salist=conf_salist;
-//	acinfo->salist_len=conf_salist_len;
-
-//	acinfo->salist = conf_ac_ips;
-//	acinfo->salist_len = conf_ac_ips_len;
-
-	//acinfo->aciplist=get_aciplist();
-
-
-	aciplist_foreach(acinfo->aciplist,pr,NULL);
-*/
-
-/*
-	int i;
-	for (i=1; i<=4; i++){
-		acinfo->radioinfos[i].type= 
-			CW_80211_RADIO_TYPE_B |
-			CW_80211_RADIO_TYPE_A | 
-			CW_80211_RADIO_TYPE_G | 
-			CW_80211_RADIO_TYPE_N;
-//		acinfo->radioinfos[i].type=0xffffffff; 
-		acinfo->radioinfos[i].rid=i;
-	}
-
-
-	return acinfo;
-
-}
-
-*/
-
-/*
-get_join_result()
-{
-	return 0;
-}
-*/
-

src/ac/ac_main.c

@@ -33,7 +33,6 @@
 
 #include "socklist.h"
 
-#include "db.h"
 
 
 #include "cw/capwap_crypto.h"
@@ -53,8 +52,34 @@ int ac_run(cw_Cfg_t * cfg);
 #include "statemachine.h"
 
 #include <getopt.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+/*
+void tshell_run(int fd)
+{
+	int rc;
+	printf("listening\n");
+	rc = listen(fd,5);
+	printf("listen returned %d\n",rc);
+	clientsock = accept (sockfd, (struct sockaddr*) &client, &client_size);
 	
 
+}
+
+void tshell()
+{
+	printf("tshell start\n");
+	struct sockaddr_un addr;
+
+	int fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	memset(&addr, 0, sizeof(addr));
+	addr.sun_family = AF_UNIX;
+	strncpy(addr.sun_path, "./tsocket", sizeof(addr.sun_path)-1);
+	bind(fd, (struct sockaddr*)&addr, sizeof(addr));
+	while(1);
+}
+*/
 
 struct bootcfg {
 	const char * cfgfilename;
@@ -67,7 +92,7 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
 	
 	bootcfg->cfgfilename = "config.ckv";
 	
-	while ( (c = getopt (argc, argv, "vc:d:p:")) != -1) {
+	while ( (c = getopt (argc, argv, "hvc:d:p:")) != -1) {
 		
 		switch (c) {
 			case 'c':
@@ -78,12 +103,18 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
 				exit(EXIT_SUCCESS);
 				break;
 			case 'd':{
-				int b = cw_strlist_get_id(cw_dbg_strings, optarg);
+                                if (!cw_dbg_set_level_from_str(optarg)){
+                                        fprintf(stderr,"Invalid debug option: %s\n",optarg);
+                                        exit(EXIT_FAILURE);
+                                }
+
+					 
+/*				int b = cw_strlist_get_id(cw_dbg_strings, optarg);
 				if (b==-1){
 					fprintf(stderr,"Invalid debug option: %s\n",optarg);
 					exit(EXIT_FAILURE);
 				}
-				cw_dbg_set_level(b, 1);
+				cw_dbg_set_level(b, 1);*/
 				break;
 			}
 
@@ -94,11 +125,22 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
 				exit(EXIT_FAILURE);
 			default:
 			case 'h': 
-				printf("%s: -vcmh\n",argv[0]);
+			{
+				FILE *out = stdout;
+				fprintf(out, "Usage:");
+				fprintf(out, "%s [ options ] ",argv[0]);
+				fprintf(out, "\nOptions are:\n");
+				fprintf(out, "  -c <file>:  specify a config file\n");
+				fprintf(out, "  -p <path>:  specify a path where to search for modules\n");
+				fprintf(out, "  -v:         print version information\n");
+				fprintf(out, "  -d <level>: set debug level, multiple -d's are possible\n"); 
+				fprintf(out, "    <level> can be one of these:\n");
+				cw_dbg_print_help(out,"    ");
 				exit(EXIT_SUCCESS);
 				break;
 			}
 		}
+	}
 	return 0;
 }
 
@@ -169,6 +211,7 @@ return 0;
 */
 
 static cw_Cfg_t * global_cfg = NULL;
+void process_wtp_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len, int dta);
 
 
 int main (int argc, char *argv[])
@@ -176,13 +219,10 @@ int main (int argc, char *argv[])
 	int rc = 0;
 	struct bootcfg bootcfg;
 
-
-
 	/* parse arguments */
 	parse_args (argc, argv, &bootcfg);
 
 
-
 	global_cfg=cw_cfg_create();
 	if (!global_cfg){
 		fprintf(stderr,"Can't create global_cfg: %s\n",strerror(errno));
@@ -197,6 +237,11 @@ int main (int argc, char *argv[])
 		goto errX;
 	};
 
+//hapd_run(); // init
+//stop();
+//const char *ttt = cw_cfg_get(global_cfg,"cisco/ssl-cipher",NULL);
+//printf("CFG: %s\n",ttt);
+//stop();
 
 	cw_log_name = "AC-Tube";
 
@@ -232,10 +277,6 @@ int main (int argc, char *argv[])
 	
 		
 
-	
-		
-	start_shell();
-
 	/* Init DTLS library */
 	dtls_init();
 		
@@ -250,16 +291,22 @@ int main (int argc, char *argv[])
 	if (!dataman_list_init())
 		goto errX;
 
+
+
 	ac_conf_init(global_cfg);
 
-	cw_cfg_dump(global_cfg);
+	if (!start_rpc(global_cfg))
+		goto errX;
+
+
+//	cw_cfg_dump(global_cfg);
 		
 	cw_log (LOG_INFO, "Starting AC-Tube, Name=%s, ID=%s", cw_cfg_get(global_cfg,"capwap/ac-name",NULL), conf_acid);
 	rc = ac_run(global_cfg);
 
 errX:
 	if (global_cfg)
-		mavl_destroy(global_cfg);
+		cw_cfg_destroy(global_cfg);
 
 	if (discovery_cache)
 		discovery_cache_destroy(discovery_cache);
@@ -302,8 +349,8 @@ int ac_run(cw_Cfg_t * cfg)
 		
 		conf_parse_listen_addr (s, addr, port, &proto);
 		socklist_add_unicast (addr, port, proto,
-				cw_cfg_get_bool(cfg,"actube/ipv4","true"),
-				cw_cfg_get_bool(cfg,"actube/ipv6","true")
+				cw_cfg_get_bool(cfg,"actube/ipv4",1),
+				cw_cfg_get_bool(cfg,"actube/ipv6",1)
 				);
         }
 	if (!i) {
@@ -411,7 +458,7 @@ int ac_run(cw_Cfg_t * cfg)
 				                        (struct sockaddr *) &srcaddr,
 				                        &srcaddrlen);
 				                        
-				process_cw_data_packet (i, (struct sockaddr *) &srcaddr, buffer, len);
+				process_wtp_packet (i, (struct sockaddr *) &srcaddr, buffer, len,1);
 				
 			}
 			
@@ -424,7 +471,7 @@ int ac_run(cw_Cfg_t * cfg)
 				                        (struct sockaddr *) &srcaddr,
 				                        &srcaddrlen);
 				                        
-				process_ctrl_packet (i, (struct sockaddr *) &srcaddr, buffer, len);
+				process_wtp_packet (i, (struct sockaddr *) &srcaddr, buffer, len,0);
 			}
 			
 		}
@@ -438,14 +485,14 @@ int ac_run(cw_Cfg_t * cfg)
 void process_cw_data_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len)
 {
 	char sock_buf[SOCK_ADDR_BUFSIZE];
-	cw_dbg (DBG_X, "There is a data packet now");
+//	cw_dbg (DBG_X, "There is a data packet now");
 	
 	dataman_list_lock();
-	cw_dbg (DBG_X, "Dataman list locked, now getting");
+//	cw_dbg (DBG_X, "Dataman list locked, now getting");
 	struct dataman * dm = dataman_list_get (socklist[index].data_sockfd, addr);
-	cw_dbg (DBG_X, "Dataman list locked, now gotted");
+//	cw_dbg (DBG_X, "Dataman list locked, now gotted");
 	
-	cw_dbg (DBG_INFO, "Packet for dataman %s,%d", sock_addr2str_p (addr, sock_buf), socklist[index].data_sockfd);
+//	cw_dbg (DBG_INFO, "Packet for dataman %s,%d", sock_addr2str_p (addr, sock_buf), socklist[index].data_sockfd);
 	
 	if (!dm) {
 		cw_dbg (DBG_INFO, "No dataman %s,%d", sock_addr2str_p (addr, sock_buf), socklist[index].data_sockfd);
@@ -457,15 +504,12 @@ void process_cw_data_packet (int index, struct sockaddr *addr, uint8_t * buffer,
 		}
 		
 		dataman_list_add (dm);
-		
 		dataman_start (dm);
-		
-		
 	}
 	
 	dataman_list_unlock();
 	
-	//dataman_add_packet (dm, buffer, len);
+	dataman_add_packet (dm, buffer, len);
 	
 	return;
 	
@@ -488,7 +532,7 @@ void process_cw_data_packet (int index, struct sockaddr *addr, uint8_t * buffer,
 }
 
 
-void process_cw_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len)
+void process_wtp_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len, int dta)
 {
 	char sock_buf[SOCK_ADDR_BUFSIZE];
 	
@@ -508,6 +552,10 @@ void process_cw_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer,
 
 
 	if (!wtpman) {
+		if (dta){
+			cw_dbg(DBG_PKT_ERR,"Data packet w/o wtpman received, ignoring");
+			return;
+		}
 	
 		wtpman = wtpman_create (index, addr, preamble & 0xf, global_cfg);
 		
@@ -529,9 +577,12 @@ void process_cw_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer,
 		wtpman_start (wtpman, preamble & 0xf);
 	}
 	
-	//printf("Got Packet with len: %d\n",len);
-
+	if(!dta)
 		wtpman_addpacket (wtpman, buffer, len);
+	else{
+//		cw_dbg(DBG_X,"Data packet received");
+		wtpman_datapacket (wtpman, buffer, len);
+	}
 	wtplist_unlock();
 }
 
@@ -602,7 +653,7 @@ void process_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer, in
 {
 	switch (socklist[index].ac_proto) {
 		case AC_PROTO_CAPWAP:
-			process_cw_ctrl_packet (index, addr, buffer, len);
+//			process_cw_ctrl_packet (index, addr, buffer, len);
 			return;
 			
 		/*case AC_PROTO_LWAPP:

src/ac/act.c

@@ -0,0 +1,401 @@
+/*	$NetBSD: tc1.c,v 1.7 2016/02/17 19:47:49 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Christos Zoulas of Cornell University.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * test.c: A little test program
+ */
+#include <sys/wait.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <locale.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <errno.h>
+
+
+#include "histedit.h"
+
+#include "cw/cfg.h"
+#include "cw/sock.h"
+
+
+static int continuation = 0;
+volatile sig_atomic_t gotsig = 0;
+
+static	unsigned char	complete(EditLine *, int);
+static	char   *prompt(EditLine *);
+static	void	sig(int);
+
+
+FILE * act_f;
+
+static int 
+get_result(FILE *f, char *str,int len)
+{
+	int n = len;
+	char *rc;
+	rc = fgets (str, len, f);
+	if (rc==NULL)
+		return 0;
+
+	n = strlen(str);
+	if (n==1 && str[0]=='\n')
+		return 0;
+
+	return  1;
+}
+
+
+
+static char *
+prompt(EditLine *el )
+{
+	static char str[64];
+	char str2[64];
+	int rc;
+
+	fprintf(act_f,"@prompt\n");
+	rc = get_result(act_f,str,64);
+	while(rc){
+		rc=get_result(act_f,str2,64);
+	}
+
+
+	return (continuation ? "> " : str);
+}
+
+static void
+sig(int i)
+{
+	gotsig = i;
+}
+
+static unsigned char
+complete(EditLine *el, int ch __attribute__((__unused__)))
+{
+	DIR *dd = opendir(".");
+	struct dirent *dp;
+	const char* ptr;
+	const LineInfo *lf = el_line(el);
+	size_t len;
+	int res = CC_ERROR;
+
+	/*
+	 * Find the last word
+	 */
+	for (ptr = lf->cursor - 1;
+	    !isspace((unsigned char)*ptr) && ptr > lf->buffer; ptr--)
+		continue;
+	len = lf->cursor - ++ptr;
+
+	for (dp = readdir(dd); dp != NULL; dp = readdir(dd)) {
+		if (len > strlen(dp->d_name))
+			continue;
+		if (strncmp(dp->d_name, ptr, len) == 0) {
+			if (el_insertstr(el, &dp->d_name[len]) == -1)
+				res = CC_ERROR;
+			else
+				res = CC_REFRESH;
+			break;
+		}
+	}
+
+	closedir(dd);
+	return res;
+}
+
+const char *cfgfilename = "config.ckv";
+const char *srvaddr;
+const char *prgname;
+
+static int 
+parse_args (int argc, char *argv[])
+{
+	int c;
+	opterr = 1;
+	
+	
+	while ( (c = getopt (argc, argv, "hvc:s:")) != -1) {
+		
+		switch (c) {
+			case 'c':
+				cfgfilename = optarg;
+				break;
+			case 'v':
+				printf("ACT shell for ACTube version 0.0.1, %s\n", SYS_ARCH);
+				exit(EXIT_SUCCESS);
+				break;
+			case 's':
+				srvaddr = optarg;
+				break;
+
+/*			case 'd':{
+                                if (!cw_dbg_set_level_from_str(optarg)){
+                                        fprintf(stderr,"Invalid debug option: %s\n",optarg);
+                                        exit(EXIT_FAILURE);
+                                }
+
+				break;
+			} */
+
+			case '?':
+				exit(EXIT_FAILURE);
+			default:
+			case 'h':
+				printf("Usage:\n");
+				printf("%s [-v | -h | -s <dst> | -c <cfg> ]\n",argv[0]);
+				printf(" -c: specify config file\n");
+				printf(" -s: specify adress to connect to \n");
+				printf(" -v: print version info\n");
+
+				exit(EXIT_SUCCESS);
+				break;
+		}
+	}
+	return 0;
+}
+
+int create_tcp_fd(const char *addr)
+{
+	struct sockaddr server;
+	
+	int rc;
+	int sockfd;
+
+	memset(&server,0,sizeof(server));
+	rc = sock_strtoaddr (addr, (struct sockaddr*) &server);
+	
+	if (! rc) {
+		fprintf(stderr, "Can't parse address '%s', %s\n", addr, strerror (errno));
+		return -1;
+	}
+	
+	sockfd = socket ( ( (struct sockaddr*) &server)->sa_family, SOCK_STREAM, 0);
+
+	rc = connect(sockfd, (struct sockaddr*)&server, sizeof(server));
+
+	if (rc ) {
+		fprintf(stderr,"%s: Error, can't connt to %s %s\n",prgname,addr,strerror(errno));
+		return -1;
+	}
+
+	return sockfd;	
+}
+
+static FILE *act_connect(const char *srvaddr)
+{
+	int fd;
+	if (srvaddr==NULL){
+		fprintf(stderr,"%s: Error, no address given.\n",prgname);
+		return NULL;
+	}
+	
+	fd=create_tcp_fd(srvaddr);
+	if (fd==-1)
+		return NULL;
+	return fdopen(fd,"a+");
+
+//	return NULL;
+}
+
+
+
+
+int
+main(int argc , char *argv[])
+{
+	prgname = argv[0];	
+	parse_args(argc,argv);
+
+	act_f = act_connect(srvaddr);
+	if (act_f==NULL){
+		return (EXIT_FAILURE);
+	}
+
+
+	EditLine *el = NULL;
+	int num;
+	const char *buf;
+	Tokenizer *tok;
+#if 0
+	int lastevent = 0;
+#endif
+	int ncontinuation;
+	History *hist;
+	HistEvent ev;
+
+	(void) setlocale(LC_CTYPE, "");
+	(void) signal(SIGINT, sig);
+	(void) signal(SIGQUIT, sig);
+	(void) signal(SIGHUP, sig);
+	(void) signal(SIGTERM, sig);
+
+	hist = history_init();		/* Init the builtin history	*/
+					/* Remember 100 events		*/
+	history(hist, &ev, H_SETSIZE, 100);
+
+	tok  = tok_init(NULL);		/* Initialize the tokenizer	*/
+
+					/* Initialize editline		*/
+	el = el_init(*argv, stdin, stdout, stderr);
+
+	el_set(el, EL_EDITOR, "emacs");	/* Default editor is vi		*/
+	el_set(el, EL_SIGNAL, 0);	/* Handle signals gracefully	*/
+
+	el_set(el, EL_PROMPT_ESC, prompt, '\1');/* Set the prompt function */
+
+			/* Tell editline to use this history interface	*/
+	el_set(el, EL_HIST, history, hist);
+
+					/* Add a user-defined function	*/
+	el_set(el, EL_ADDFN, "ed-complete", "Complete argument", complete);
+
+					/* Bind tab to it		*/
+	el_set(el, EL_BIND, "^I", "ed-complete", NULL);
+
+	/*
+	 * Bind j, k in vi command mode to previous and next line, instead
+	 * of previous and next history.
+	 */
+	el_set(el, EL_BIND, "-a", "k", "ed-prev-line", NULL);
+	el_set(el, EL_BIND, "-a", "j", "ed-next-line", NULL);
+
+	/*
+	 * Source the user's defaults file.
+	 */
+	el_source(el, NULL);
+
+	while ((buf = el_gets(el, &num)) != NULL && num != 0)  {
+		int ac, cc, co;
+		const char **av;
+		const LineInfo *li;
+		li = el_line(el);
+		if (gotsig) {
+			(void) fprintf(stderr, "Got signal %d.\n", (int)gotsig);
+			gotsig = 0;
+			el_reset(el);
+		}
+
+		if (!continuation && num == 1)
+			continue;
+
+		ac = cc = co = 0;
+		ncontinuation = tok_line(tok, li, &ac, &av, &cc, &co);
+		if (ncontinuation < 0) {
+			(void) fprintf(stderr, "Internal error\n");
+			continuation = 0;
+			continue;
+		}
+
+		/* Simpler */
+		history(hist, &ev, continuation ? H_APPEND : H_ENTER, buf);
+
+		continuation = ncontinuation;
+		ncontinuation = 0;
+		if (continuation)
+			continue;
+
+		if (strcmp(av[0], "history") == 0) {
+			int rv;
+
+			switch (ac) {
+			case 1:
+				for (rv = history(hist, &ev, H_LAST); rv != -1;
+				    rv = history(hist, &ev, H_PREV))
+					(void) fprintf(stdout, "%4d %s",
+					    ev.num, ev.str);
+				break;
+
+			case 2:
+				if (strcmp(av[1], "clear") == 0)
+					 history(hist, &ev, H_CLEAR);
+				else
+					 goto badhist;
+				break;
+
+			case 3:
+				if (strcmp(av[1], "load") == 0)
+					 history(hist, &ev, H_LOAD, av[2]);
+				else if (strcmp(av[1], "save") == 0)
+					 history(hist, &ev, H_SAVE, av[2]);
+				break;
+
+			badhist:
+			default:
+				(void) fprintf(stderr,
+				    "Bad history arguments\n");
+				break;
+			}
+		} else if (el_parse(el, ac, av) == -1) {
+			char str[2000];
+			int i;
+			char * sp ="";
+			str[0]=0;
+
+			for (i=0; i<ac; i++){
+				fprintf(act_f,"%s%s",sp,av[i]);
+				sp=" ";
+			}
+			fprintf(act_f,"\n");
+
+			fflush(act_f);
+			do {
+				int n;
+				fgets (str, 2000, act_f);
+				n = strlen(str);
+//				printf("LEN: %d\n",n);
+				if (n==1 && str[0]=='\n')
+					break;
+				fprintf(stdout,"%s",str);
+			}while(!feof(act_f));
+
+			fflush(stdout);
+
+		}
+
+		tok_reset(tok);
+	}
+
+	el_end(el);
+	tok_end(tok);
+	history_end(hist);
+
+	return (0);
+}

src/ac/conf.c

@@ -15,37 +15,20 @@
     along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/utsname.h>
-
-
-#include "cw/capwap.h"
-#include "cw/sock.h"
-
-#include "cw/log.h"
-#include "cw/dbg.h"
 #include "cw/cw_util.h"
-#include "cw/dtls.h"
-
-     #include <sys/param.h>
-     #include <sys/time.h>
-     #include <sys/socket.h>
-     #include <net/if.h>
-
+#include "cw/dbg.h"
+#include "cw/cw.h"
+#include "cw/cfg.h"
 #include "conf.h"
 #include "ac.h"
-#include "cw/cfg.h"
 
-#include "cw/mavltypes.h"
 
-/*uint8_t conf_macaddress[12];
+uint8_t conf_macaddress[12];
 uint8_t conf_macaddress_len = 0;
-*/
+
 
 long conf_strict_capwap = 1;
 long conf_strict_headers = 0;
-/*int conf_capwap_mode = CW_MODE_CAPWAP;*/
 
 
 
@@ -53,28 +36,23 @@ char *conf_acid = NULL;
 
 char *conf_primary_if = NULL;
 
-long conf_max_wtps = CONF_DEFAULT_MAXWTPS;
-char *conf_logfilename = CONF_DEFAULT_LOGFILENAME;
-struct sockaddr_storage *conf_salist = NULL;
-
-
 
 char **conf_mcast_groups = 0;
 int conf_mcast_groups_len = 0;
 
 
-struct sockaddr_storage *conf_bsalist = NULL;
+//struct sockaddr_storage *conf_bsalist = NULL;
 
-int conf_salist_len = 0;
-int conf_bsalist_len = 0;
+//int conf_salist_len = 0;
+//int conf_bsalist_len = 0;
 
-struct sockaddr *conf_ac_ips;
-int conf_ac_ips_len;
+//struct sockaddr *conf_ac_ips;
+//int conf_ac_ips_len;
 
-char *conf_sslcertfilename = NULL;
-char *conf_sslkeyfilename = NULL;
-char *conf_sslkeypass = NULL;
-char *conf_dtls_psk = NULL;
+//char *conf_sslcertfilename = NULL;
+//char *conf_sslkeyfilename = NULL;
+//char *conf_sslkeypass = NULL;
+//char *conf_dtls_psk = NULL;
 
 int conf_security = 0;
 long conf_vendor_id = CONF_DEFAULT_VENDOR_ID;
@@ -123,11 +101,10 @@ static int init_ac_name(cw_Cfg_t * cfg)
 	int i;
 
 
-	s= cw_cfg_get(cfg,"capwap/ac-name",NULL);
+	s= (char*)cw_cfg_get(cfg,"capwap/ac-name",NULL);
 	if (s!=NULL)
 		return 1;
 
-//	primary_if = sock_get_primary_if(AF_INET6);
 	if (!primary_if)
 		primary_if = sock_get_primary_if(AF_INET);
 
@@ -158,41 +135,6 @@ static int init_ac_name(cw_Cfg_t * cfg)
 
 
 
-
-static int init_dtls()
-{
-	if (conf_dtls_psk != NULL) {
-/*
-		//              conf_security=CW_SECURITY_FLAGS_S;
-*/
-	}
-
-	return 1;
-}
-
-
-static int init_vendor_id()
-{
-	return 1;
-}
-
-static int init_control_port()
-{
-	char str[30];
-	sprintf(str, "%d", CONF_DEFAULT_CONTROL_PORT);
-	conf_control_port =
-	    (char *) cw_setstr((uint8_t **) & conf_control_port, (uint8_t *) str,
-			       strlen(str));
-
-
-#ifdef WITH_LWAPP
-	sprintf(str, "%d", CONF_DEFAULT_LW_CONTROL_PORT);
-	conf_lw_control_port = strdup(str);
-#endif
-
-	return 1;
-}
-
 #include <ifaddrs.h>
 
 static int init_listen_addrs(cw_Cfg_t * cfg)
@@ -247,7 +189,7 @@ static int init_listen_addrs(cw_Cfg_t * cfg)
 		}
 	}
 	rc = 1;
-      errX:
+      /*errX:*/
 	freeifaddrs(ifap);
 	return rc;
 }
@@ -304,13 +246,12 @@ int init_bcast_addrs(cw_Cfg_t *cfg)
 	struct cw_Cfg_iter cfi;
 	int i;
 
-//printf("BCAST INIT\n");
         cw_cfg_iter_init(cfg, &cfi, "actube/bcast");
 	if (cw_cfg_iter_next(&cfi,NULL) != NULL)
 		return 0;
 
 	
-	if (!cw_cfg_get_bool(cfg,"actube/ipv4", "true"))
+	if (!cw_cfg_get_bool(cfg,"actube/ipv4", 1))
 		return 1;
 
 	/*t = mavl_create_ptr(); */
@@ -348,16 +289,16 @@ int init_bcast_addrs(cw_Cfg_t *cfg)
 
 
 		if (ifa->ifa_broadaddr) {
-			char *s,*sr;
+			char *s; //,*sr;
 			sock_addrtostr(ifa->ifa_broadaddr, str, 100,1);
 			*strchr(str, ':') = 0;
 
 
 			s = cw_strdup(str);
-			sr = mavl_add_str(t, s);
+			mavl_add_str(t, s);
 
 
-			printf("BCAST = %p --- %p: %s\n",str,s,str);
+//			printf("BCAST = %p --- %p: %s\n",str,s,str);
 		}
 
 	}
@@ -497,7 +438,7 @@ char *conf_mods_dir = NULL;
  */ 
 static int init_mods(cw_Cfg_t *cfg){
 
-	int n, i;
+	int  i;
 	struct cw_Cfg_entry *e;
 	const char * modname;
 
@@ -604,28 +545,10 @@ int conf_parse_listen_addr(const char *addrstr, char *saddr, char *port, int *pr
 	return 0;
 }
 
-static void errfunc(cfg_t *cfg, const char *fmt, va_list ap){
-
-	if (cfg && cfg->filename && cfg->line)
-		fprintf(stderr, "ERROR in %s:%d: ", 
-			cfg->filename, cfg->line);
-	else if (cfg && cfg->filename)
-		fprintf(stderr, "ERROR in %s:", cfg->filename);
-	vfprintf(stderr, fmt, ap);
-	fprintf(stderr,"\n");
-}
-
-void free_config()
-{
-
-}
-
-
 
 
 void ac_conf_init(cw_Cfg_t *cfg)
 {
-	printf("ac conf\n");
 	init_listen_addrs(cfg);
 	init_bcast_addrs(cfg);
 	init_ac_name(cfg);

src/ac/conf.h

@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <confuse.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
 

src/ac/config.ckv

@@ -6,17 +6,27 @@
 #
 #capwap/ac-name
 #
-capwap/ac-name: actube
+capwap/ac-name: actube_X
 
 capwap/ssl-cipher: DHE-RSA:RSA:AES-256-CBC:AES-128-CBC:SHA1:PSK
 capwap/ssl-psk-enable: false
 capwap/ssl-psk: 123456
 capwap/ssl-dhbits: 1024
+capwap/ssl-keyfile:  "../../ssl/intermediate-ca/int-ca.key"
+capwap/ssl-certfile: "../../ssl/intermediate-ca/int-ca.crt"
+
+#mod/cisco/ssl-keyfile:  "../../ssl/intermediate-ca/int-ca.key"
+#mod/cisco/ssl-certfile: "../../ssl/intermediate-ca/int-ca.crt"
+#
+mod/cisco/ssl-keyfile:  "../../ssl/certs/ac-cisco.key"
+mod/cisco/ssl-certfile: "../../ssl/certs/ac-cisco.pem"
+
+#cisco/ssl-cipher: DEFAULT
+mod/cisco/ssl-cipher: RSA
+mod/cisco/ssl-dhbits: 2048
+
+
 
-cisco/ssl-keyfile:  "../../ssl/intermediate-ca/int-ca.key"
-cisco/ssl-certfile: "../../ssl/intermediate-ca/int-ca.crt"
-cisco/ssl-cipher: DEFAULT
-cisco/ssl-dhbits: 2048
 
 
 # 
@@ -38,32 +48,127 @@ actube/mod.0: cisco
 actube/mod.1: capwap
 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
 
-ac-descriptor/dtls-policy:  1
-ac-descriptor/hardware/vendor: 4232704
-ac-descriptor/hardware/version: .x01000001
-ac-descriptor/max-wtps : 200
-ac-descriptor/active-wtps:  2
-ac-descriptor/r-mac-field: 1
-ac-descriptor/reserved1 : 0
-ac-descriptor/security : 2
-ac-descriptor/software/vendor : 0
-ac-descriptor/software/version: v0.0.1
-ac-descriptor/station-limit: 1000
-ac-descriptor/stations: 0
+#
+# This catches the initial config af a connecting WTP
+# From Discovery to CFG Update
+# The config is saved to a file named
+# wtp-<wtpname-or-ip>.cfg
+#
+actube/save-initial-wtp-config: true
+
+capwap/ac-descriptor/dtls-policy:  1
+capwap/ac-descriptor/hardware/vendor: 4232704
+capwap/ac-descriptor/hardware/version: .x01000001
+capwap/ac-descriptor/max-wtps : 200
+capwap/ac-descriptor/active-wtps:  2
+capwap/ac-descriptor/r-mac-field: 1
+cawpap/ac-descriptor/reserved1 : 0
+capwap/ac-descriptor/security : 2
+capwap/ac-descriptor/software/vendor : 0
+capwap/ac-descriptor/software/version: v0.0.1
+capwap/ac-descriptor/station-limit: 1000
+capwap/ac-descriptor/stations: 0
 
 
-capwap-control-ip-address/address.0: 192.168.0.14
+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/data-check-timer: Word: 10
-capwap-timers/echo-interval :Byte: 30
-capwap-timers/max-discovery-interval :Byte: 10
+capwap/timers/change-state-pending-timer: 3
+capwap/timers/data-check-timer: 10
+capwap/timers/echo-interval: 30
+capwap/timers/max-discovery-interval: 10
+capwap/decryption-error-report-period: 120
+capwap/idle-timeout: 300
+
+
+
+
+radio-cfg-a/capwap80211/wtp-radio-config/beacon-period: 100
+radio-cfg-a/capwap80211/wtp-radio-config/bssid: .x003a9902fac0
+radio-cfg-a/capwap80211/wtp-radio-config/cfg-period: 4
+radio-cfg-a/capwap80211/wtp-radio-config/beacon-period: 100
+radio-cfg-a/capwap80211/wtp-radio-config/bssid: .x003a9902fac0
+radio-cfg-a/capwap80211/wtp-radio-config/cfg-period: 4
+radio-cfg-a/capwap80211/wtp-radio-config/cfg-type: 1
+radio-cfg-a/capwap80211/wtp-radio-config/cfp-maximum-duration: 60
+radio-cfg-a/capwap80211/wtp-radio-config/country-str1: "DE "
+radio-cfg-a/capwap80211/wtp-radio-config/country-str2: "DE "
+radio-cfg-a/capwap80211/wtp-radio-config/occupancy-limit: 100
+radio-cfg-a/capwap80211/wtp-radio-config/reg: 167772416
+
+radio-cfg-a/cisco/direct-sequence-control/cfg-type: 1 - global
+radio-cfg-a/cisco/direct-sequence-control/current-cca-mode: 0
+radio-cfg-a/cisco/direct-sequence-control/current-channel: 1
+radio-cfg-a/cisco/direct-sequence-control/energy-detect-threshold: -50
+
+#mode-802.11g support
+#radio-cfg-a/cisco/direct-sequence-control/unknown: 1     
+
+
+radio-cfg-a/cisco/mac-operation/fragmentation-threshold: 2346
+radio-cfg-a/cisco/mac-operation/long-retry: 4
+radio-cfg-a/cisco/mac-operation/reserved: 1
+radio-cfg-a/cisco/mac-operation/rts-threshold: 2347
+radio-cfg-a/cisco/mac-operation/rx-msdu-lifetime: 512
+radio-cfg-a/cisco/mac-operation/short-retry: 7
+radio-cfg-a/cisco/mac-operation/tx-msdu-lifetime: 512
+
+
+radio-cfg-a/cisco/multi-domain-capability/first-channel: 1
+radio-cfg-a/cisco/multi-domain-capability/max-tx-power-level: 65535
+radio-cfg-a/cisco/multi-domain-capability/number-of-channels: 13
+radio-cfg-a/cisco/multi-domain-capability/reserved: 1
+
+radio-cfg-a/capwap80211/rate-set: .x82848b960c1218243048606c
+
+radio-cfg-a/cisco/antenna-payload/802-11n-rx-antennas: 3
+radio-cfg-a/cisco/antenna-payload/802-11n-tx-antennas: 7
+radio-cfg-a/cisco/antenna-payload/antenna-cnt: 2
+radio-cfg-a/cisco/antenna-payload/antenna-mode: 3
+radio-cfg-a/cisco/antenna-payload/antenna.0: 1 - Internal Antenna
+radio-cfg-a/cisco/antenna-payload/antenna.1: 1 - Internal Antenna
+radio-cfg-a/cisco/antenna-payload/diversity-selection: 255
+radio-cfg-a/cisco/antenna-payload/unknown: 0
+
+
+
+radio-cfg-b/capwap80211/wtp-radio-config/beacon-period: 100
+radio-cfg-b/capwap80211/wtp-radio-config/bssid: .x003a9902fac0
+radio-cfg-b/capwap80211/wtp-radio-config/cfg-period: 4
+radio-cfg-b/capwap80211/wtp-radio-config/beacon-period: 100
+radio-cfg-b/capwap80211/wtp-radio-config/bssid: .x003a9902fac0
+radio-cfg-b/capwap80211/wtp-radio-config/cfg-period: 4
+radio-cfg-b/capwap80211/wtp-radio-config/cfg-type: 1
+radio-cfg-b/capwap80211/wtp-radio-config/cfp-maximum-duration: 60
+radio-cfg-b/capwap80211/wtp-radio-config/country-str1: "DE "
+radio-cfg-b/capwap80211/wtp-radio-config/country-str2: "DE "
+radio-cfg-b/capwap80211/wtp-radio-config/occupancy-limit: 100
+radio-cfg-b/capwap80211/wtp-radio-config/reg: 167772416
+
+
+
+
 
 
 

src/ac/dataman.c

@@ -5,10 +5,12 @@
 #include "cw/timer.h"
 #include "cw/cw.h"
 #include "cw/format.h"
-#include "cw/netconn.h"
+#include "cw/conn.h"
 
 #include "cw/log.h"
 #include "cw/dbg.h"
+#include "cw/file.h"
+#include "cw/dot11.h"
 
 #include "wtplist.h"
 #include "dataman.h"
@@ -19,8 +21,8 @@ pthread_mutex_t dataman_list_mutex;
 
 static int cmp(const void *d1, const void *d2)
 {
-	struct netconn *nc1 = ((struct dataman *) d1)->nc;
-	struct netconn *nc2 = ((struct dataman *) d1)->nc;
+	struct cw_Conn *nc1 = ((struct dataman *) d1)->nc;
+	struct cw_Conn *nc2 = ((struct dataman *) d1)->nc;
 
 	int r = nc1->sock - nc2->sock;
 	if (r != 0)
@@ -52,7 +54,7 @@ void dataman_destroy(struct dataman *dm)
 {
 	if (!dm)
 		return;
-	netconn_destroy(dm->nc);
+	conn_destroy(dm->nc);
 }
 
 struct dataman *dataman_create(int sock, struct sockaddr *addr)
@@ -60,15 +62,15 @@ struct dataman *dataman_create(int sock, struct sockaddr *addr)
 	struct dataman *dm = malloc(sizeof(struct dataman));
 	if (!dm)
 		return NULL;
-
-	dm->nc = netconn_create(sock, addr, 100);
+	memset(dm,0,sizeof(struct dataman));
+	dm->nc = cw_conn_create(sock, addr, 100);
 	return dm;
 }
 
 
 struct dataman *dataman_list_get(int sock, struct sockaddr *addr)
 {
-	struct netconn search_nc;
+	struct cw_Conn search_nc;
 	struct dataman search_dm;
 
 	search_nc.sock = sock;
@@ -78,7 +80,7 @@ struct dataman *dataman_list_get(int sock, struct sockaddr *addr)
 
 	struct dataman *dm = mavl_get(dataman_list, &search_dm);
 
-	cw_dbg(DBG_X,"Getting dataman %p",dm); 
+//	cw_dbg(DBG_X,"Getting dataman %p",dm); 
 	return dm;
 }
 
@@ -91,7 +93,7 @@ struct dataman *dataman_list_add(struct dataman *dm)
 
 
 
-int dataman_process_keep_alive(struct netconn *nc, uint8_t *rawmsg, int len)
+int dataman_process_keep_alive(struct cw_Conn *nc, uint8_t *rawmsg, int len)
 {
 	struct dataman * dm = (struct dataman *)(nc->data);
 
@@ -115,7 +117,9 @@ int dataman_process_keep_alive(struct netconn *nc, uint8_t *rawmsg, int len)
 			((uint16_t*)sessid)[0]=sessid_len;
 			memcpy(bstr16_data(sessid),cw_get_elem_data(elem),sessid_len);
 			
-			struct wtpman * wtpman = wtplist_get_by_session_id(sessid);
+			stop();
+			struct wtpman * wtpman =NULL;
+//			struct wtpman * wtpman = wtplist_get_by_session_id(sessid);
 			if (wtpman){
 				if (!dm->wtpman)
 					dm->wtpman=wtpman;
@@ -131,7 +135,7 @@ int dataman_process_keep_alive(struct netconn *nc, uint8_t *rawmsg, int len)
 				printf("len len %d\n",l);
 				printf("Total len = %d\n",total_len);
 
-				netconn_send_capwap_msg(nc,buffer,total_len);
+				cw_send_msg(nc,buffer,total_len);
 				return len;
 					
 
@@ -165,26 +169,87 @@ int dataman_process_keep_alive(struct netconn *nc, uint8_t *rawmsg, int len)
 	return -1;	
 }
 
-int dataman_process_message0(struct netconn *nc, uint8_t * rawmsg, int len,
+
+int dataman_process_message0(struct cw_Conn *nc, uint8_t * rawmsg, int len,
 			struct sockaddr *from)
 {
+
+	static int c=0;
+	char fn[100];
+	sprintf(fn,"wificap-%03d",c++);
+///	cw_save_file(fn,(char*)rawmsg,len);
+///	cw_dbg(DBG_X,"saving %d bytes",len);
+	int offs =  cw_get_hdr_msg_offset(rawmsg);
+	int rc;
+	uint8_t * dot11frame = rawmsg + offs;
+	int dot11len = len-offs;
+
+//	cw_dbg(DBG_X,"802.11 - %s",dot11_get_frame_name(dot11frame));
+//	extern void ppacket(uint8_t * p, int len);
+
+	
+//	ppacket (dot11frame,len-cw_get_hdr_msg_offset(rawmsg));
+
+
+
+//	cw_dbg(DBG_X,"802.11 - %s",dot11_get_frame_name(dot11frame));
+//	cw_dbg(DBG_X,"802.11 - T&S: %d %d",dot11_get_type(dot11frame),dot11_get_subtype(dot11frame));
+
+
+//	cw_dbg(DBG_X,"Frame CTL:%d,%d",frame.frame_control.type, frame.frame_control.subtype);
+
+
+
+//	cw_dbg(DBG_X,"CMP???CTL:%d,%d (%d,%d)",frame.frame_control.type, frame.frame_control.subtype,
+//			TYPE_MANAGEMENT,SUBTYPE_ASSOC_REQ);
+	
+//	char ffr[1024];
+//	cw_format_dot11_hdr(ffr,dot11frame,dot11len);	
+//	cw_dbg(DBG_X,ffr);
+//
+//
+
+
+
+
+
+
+
+
+
+
+
+	
 	/* The very first data message MUST be a keep-alive message */
 	if (!cw_get_hdr_flag_k(rawmsg)){
+
+//		cw_dbg(DBG_X,"No K Flag founde");
 		errno = EAGAIN;
 		return -1;
 	}
 
+//	cw_dbg(DBG_X, "Goto Keep Alive Pack");
 	return dataman_process_keep_alive(nc,rawmsg,len);
 }
 
-int dataman_process_message(struct netconn *nc, uint8_t * rawmsg, int len,
+int dataman_process_message(struct cw_Conn *nc, uint8_t * rawmsg, int len,
 			struct sockaddr *from)
 {
 	if (cw_get_hdr_flag_k(rawmsg)){
 		return dataman_process_keep_alive(nc,rawmsg,len);
 	}
+	static int c=0;
+
+	char fn[100];
+	sprintf(fn,"wificap-%03d",c++);
+	cw_save_file(fn,(char*)rawmsg,len);
+
+	extern void ppacket(uint8_t * p, int len);
+
+//	ppacket (rawmsg,len);
 
 	cw_dbg(DBG_X,"There was someting else than dataman");
+
 	return 1;
 
 }
@@ -193,12 +258,22 @@ void dataman_run(struct dataman *dm)
 {
 	time_t timer = cw_timer_start(2);
 
-	dm->nc->process_packet=netconn_process_packet;
+	dm->nc->process_packet=conn_process_packet;
 	dm->nc->process_message=dataman_process_message0;
 	dm->nc->data = dm;
 
+
+	while (1){
+		time_t timer = cw_timer_start(2);
 		while (!cw_timer_timeout(timer)){
-		netconn_read_messages(dm->nc);
+			cw_read_messages(dm->nc);
+		}
+	}
+
+	
+
+	while (!cw_timer_timeout(timer)){
+		cw_read_messages(dm->nc);
 	}
 
 	if (!dm->wtpman){
@@ -213,7 +288,7 @@ void dataman_run(struct dataman *dm)
 	while (1){
 		time_t timer = cw_timer_start(2);
 		while (!cw_timer_timeout(timer)){
-			netconn_read_messages(dm->nc);
+			cw_read_messages(dm->nc);
 		}
 	}
 

src/ac/dataman.h

@@ -3,12 +3,11 @@
 
 #include <pthread.h>
 
-/*#include "cw/netconn.h"*/
 
 #include "wtpman.h"
 
 struct dataman {
-	struct netconn *nc;
+	struct cw_Conn *nc;
 	pthread_t thread;
 	struct wtpman * wtpman;
 
@@ -28,6 +27,6 @@ extern pthread_mutex_t dataman_list_mutex;
 #define dataman_list_lock() pthread_mutex_lock(&dataman_list_mutex)
 #define dataman_list_unlock() pthread_mutex_unlock(&dataman_list_mutex)
 
-#define dataman_add_packet(dm,data,len) (netconn_q_add_packet(dm->nc,data,len))
+#define dataman_add_packet(dm,data,len) (conn_q_add_packet(dm->nc,data,len))
 
 #endif

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/discovery_cache.c

@@ -114,7 +114,6 @@ void discovery_cache_add(struct cw_DiscoveryCache *cache,
 		cw_dbg(DBG_X,"//////////////////////////   ADDD CAHCE ///////////////////////");
 		char str[128];
 	sock_addrtostr(addr,str,128,1);
-	printf("Add addr: %s\n",str);
 	}
 
 	struct cw_DiscoveryCacheElem * cur = cache->queue+cache->qpos;
@@ -159,7 +158,6 @@ int discovery_cache_get(struct cw_DiscoveryCache * cache,struct sockaddr *addr,
 	cw_dbg(DBG_X,"DISCOVERY CACHE ---------------------------- GET ENTER");
 	char str[128];
 	sock_addrtostr(addr,str,128,1);
-	printf("Add addr: %s\n",str);
 	}
 
 	search_ptr = &search;
@@ -169,7 +167,6 @@ int discovery_cache_get(struct cw_DiscoveryCache * cache,struct sockaddr *addr,
 		cw_dbg(DBG_X,"DISCOVERY CACHE ---------------------------- FOUND 1 with Port");
 		char str[128];
 		sock_addrtostr(addr,str,128,1);
-		printf("Add addr: %s\n",str);
 		}
 
 
@@ -196,7 +193,6 @@ int discovery_cache_get(struct cw_DiscoveryCache * cache,struct sockaddr *addr,
 	cw_dbg(DBG_X,"DISCOVERY CACHE ---------------------------- DOUND BY ADDR");
 	char str[128];
 	sock_addrtostr(addr,str,128,1);
-	printf("Add addr: %s\n",str);
 	}
 
 
@@ -207,7 +203,7 @@ int discovery_cache_get(struct cw_DiscoveryCache * cache,struct sockaddr *addr,
 	{
 	cw_dbg(DBG_X,"DISCOVERY CACHE ---------------------------- DOUND BY ADDR");
 	char str[128];
-	sock_addrtostr(&elem->addr,str,128,1);
+	sock_addrtostr((struct sockaddr*)&elem->addr,str,128,1);
 	printf("ELEM addr: %s\n",str);
 	}
 

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/activate.ckv

@@ -0,0 +1,5 @@
+radio.255/capwap/operational-state/state: enabled
+radio.255/capwap/admin-state: 1
+radio.0/capwap/operational-state/state: enabled
+radio.0/capwap/admin-state: 1
+

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

@@ -0,0 +1,5 @@
+#
+# Managed by acTube
+#
+
+radio.0/capwap/admin-state: 1

src/ac/rpc-macros/all.ckv

@@ -0,0 +1,60 @@
+
+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-cnt: 2
+radio.0/cisco/antenna-payload/antenna-mode: 3
+radio.0/cisco/antenna-payload/antenna.0: 1 - Internal Antenna
+radio.0/cisco/antenna-payload/antenna.1: 1 - Internal Antenna
+radio.0/cisco/antenna-payload/diversity-selection: 255
+radio.0/cisco/antenna-payload/unknown: 0
+
+radio.0/cisco/channel-power: .x08080d0108221c16100a04fefe0208221c16100a04fefe0308221c16100a04fefe0408221c16100a04fefe0508221c16100a04fefe0608221c16100a04fefe0708221c16100a04fefe0808221c16100a04fefe0908221c16100a04fefe0a08221c16100a04fefe0b08221c16100a04fefe0c08221c16100a04fefe0d08221c16100a04fefe
+
+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-config/beacon-period: 100
+radio.0/capwap80211/wtp-radio-config/bssid: .x04fe7f499b90
+radio.0/capwap80211/wtp-radio-config/cfg-period: 4
+radio.0/capwap80211/wtp-radio-config/cfg-type: 1
+radio.0/capwap80211/wtp-radio-config/cfp-maximum-duration: 60
+radio.0/capwap80211/wtp-radio-config/country-str1: "DE "
+radio.0/capwap80211/wtp-radio-config/country-str2: "DE "
+radio.0/capwap80211/wtp-radio-config/occupancy-limit: 100
+radio.0/capwap80211/wtp-radio-config/reg: 167772416
+radio.0/capwap80211/wtp-radio-information: 1
+
+
+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: 65535
+radio.0/cisco/multi-domain-capability/number-of-channels: 13
+radio.0/cisco/multi-domain-capability/reserved: 1
+
+radio.0/cisco/phy-ht-cap/asel-cap: 0
+radio.0/cisco/phy-ht-cap/extended-ht-cap-info: .x0000
+radio.0/cisco/phy-ht-cap/ht-cap-info: 6
+radio.0/cisco/phy-ht-cap/mcsrates-1: .x00000000
+radio.0/cisco/phy-ht-cap/mcsrates-2: .x00000000
+radio.0/cisco/phy-ht-cap/mcsrates-3: .x00000000
+radio.0/cisco/phy-ht-cap/mcsrates-4: .x0000ffff
+radio.0/cisco/phy-ht-cap/tx-bf-cap: .x00000000
+radio.0/cisco/phy-ht-control/cfg-type: 1 - global
+radio.0/cisco/phy-ht-control/channel-width: 20
+radio.0/cisco/phy-ht-control/cur-freq-is-dfs-channel: 0
+radio.0/cisco/phy-ht-control/current-freq: 1
+radio.0/cisco/phy-ht-control/enable-ht: 3
+radio.0/cisco/phy-ht-control/ext-channel: 0
+radio.0/cisco/phy-ht-control/flash-commit: 0
+radio.0/cisco/phy-ht-control/frequency-bands-support: 206
+radio.0/cisco/phy-ht-control/rest: .x00ffffff
+radio.0/cisco/phy-ht-control/ti-threshold: 0
+
+
+

src/ac/rpc-macros/antenna.ckv

@@ -0,0 +1,10 @@
+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-cnt: 2
+radio.0/cisco/antenna-payload/antenna-mode: 3
+radio.0/cisco/antenna-payload/antenna.0: 1 - Internal Antenna
+radio.0/cisco/antenna-payload/antenna.1: 1 - Internal Antenna
+radio.0/cisco/antenna-payload/diversity-selection: 255
+radio.0/cisco/antenna-payload/unknown: 0
+

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/macopts.ckv

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

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

@@ -0,0 +1,5 @@
+#
+# Managed by acTube
+#
+
+radio.0/capwap/operational-state/state: disabled

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

@@ -0,0 +1,5 @@
+#
+# Managed by acTube
+#
+
+radio.0/capwap/operational-state/state: enabled

src/ac/rpc-macros/radio.ckv

@@ -0,0 +1,13 @@
+radio.0/capwap80211/tx-power/@cisco/cfg-type: 1 - global
+radio.0/capwap80211/tx-power/current-tx-power: 1
+radio.0/capwap80211/wtp-radio-config/beacon-period: 100
+radio.0/capwap80211/wtp-radio-config/bssid: .x04fe7f499b90
+radio.0/capwap80211/wtp-radio-config/cfg-period: 4
+radio.0/capwap80211/wtp-radio-config/cfg-type: 1
+radio.0/capwap80211/wtp-radio-config/cfp-maximum-duration: 60
+radio.0/capwap80211/wtp-radio-config/country-str1: "DE "
+radio.0/capwap80211/wtp-radio-config/country-str2: "DE "
+radio.0/capwap80211/wtp-radio-config/occupancy-limit: 100
+radio.0/capwap80211/wtp-radio-config/reg: 167772416
+radio.0/capwap80211/wtp-radio-information: 1
+

src/ac/rpc-macros/sr.ckv

@@ -0,0 +1,89 @@
+capwap/timers/echo-interval: 30
+capwap/timers/max-discovery-interval: 10
+
+radio.255/capwap/admin-state: 1 - enabled
+radio.0/capwap/admin-state: 1 - enabled
+radio.1/capwap/admin-state: 1 - enabled
+
+radio.0/capwap/decryption-error-report-period: 120
+radio.1/capwap/decryption-error-report-period: 120
+
+capwap/idle-timeout: 300
+
+capwap/wtp-fallback: 1
+
+cisco/spam-domain-secret: .xe1ffd18a8f15b3b59c0a47a7f17a96e7cb36174f00
+
+radio.0/capwap80211/wtp-radio-config/beacon-period: 100
+radio.0/capwap80211/wtp-radio-config/bssid: .x003a9902fac0
+radio.0/capwap80211/wtp-radio-config/cfg-period: 4
+radio.0/capwap80211/wtp-radio-config/cfg-type: 1
+radio.0/capwap80211/wtp-radio-config/cfp-maximum-duration: 60
+radio.0/capwap80211/wtp-radio-config/country-str1: "DE "
+radio.0/capwap80211/wtp-radio-config/country-str2: "DE "
+radio.0/capwap80211/wtp-radio-config/occupancy-limit: 100
+radio.0/capwap80211/wtp-radio-config/reg: 167772416
+radio.0/capwap80211/wtp-radio-information: 1
+
+radio.0/capwap80211/rate-set: .x82848b960c1218243048606c
+
+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/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.1/capwap80211/tx-power/@cisco/cfg-type: 1 - global
+radio.1/capwap80211/tx-power/current-tx-power: 1
+
+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/antenna-payload/802-11n-rx-antennas: 3
+radio.0/cisco/antenna-payload/802-11n-tx-antennas: 7
+radio.0/cisco/antenna-payload/antenna-cnt: 2
+radio.0/cisco/antenna-payload/antenna-mode: 3
+radio.0/cisco/antenna-payload/antenna.0: 1 - Internal Antenna
+radio.0/cisco/antenna-payload/antenna.1: 1 - Internal Antenna
+radio.0/cisco/antenna-payload/diversity-selection: 255
+radio.0/cisco/antenna-payload/unknown: 0
+
+radio.0/cisco/air-space-capability: 0
+
+radio.0/capwap/operational-state/cause: Normal
+radio.0/capwap/operational-state/state: enabled
+
+radio.0/cisco/80211h/count: 0
+radio.0/cisco/80211h/enable: 0
+radio.0/cisco/80211h/mode: 0
+radio.0/cisco/80211h/power: 0
+
+radio.0/cisco/elem153: .x00
+radio.0/cisco/elem156: .x020100
+radio.0/cisco/lwelem48: .x01055a0101a6c405b06432b03232
+radio.1/cisco/lwelem33: .x00
+radio.0/cisco/elem146: .x690f
+
+radio.255/capwap/operational-state/cause: Normal
+radio.255/capwap/operational-state/state: enabled
+
+cisco/bcast-ssid-mode: 1
+capwap/timers/max-discovery-interval: 10
+capwap/timers/echo-interval: 30
+
+cisco/client-auto-handoff: 0
+
+cisco/lwelem14: .x000001000000000000000000000000000000
+
+
+

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-macros/txp.ckv

@@ -0,0 +1,3 @@
+radio.0/capwap80211/tx-power/@cisco/cfg-type: 1 - global
+radio.0/capwap80211/tx-power/current-tx-power: 1
+

src/ac/rpc-macros/wlan.ckv

@@ -0,0 +1,17 @@
+radio.0/wlan.1/capwap80211/capability: 1073
+radio.0/wlan.1/capwap80211/qos: 0
+radio.0/wlan.1/capwap80211/ssid: tubeC
+radio.0/wlan.1/cisco/aironet-ie: true
+radio.0/wlan.1/cisco/broadcast-ssid: true
+radio.0/wlan.1/cisco/dtim-period: 1
+radio.0/wlan.1/cisco/encryption-policy: 4
+radio.0/wlan.1/cisco/hreap-local-switch: 0
+radio.0/wlan.1/cisco/profile-name: tubeC
+radio.0/wlan.1/cisco/scan-defer-period: 28784
+radio.0/wlan.1/cisco/scan-defer-time: 100
+radio.0/wlan.1/cisco/session-timout: 1800
+radio.0/wlan.1/cisco/wep-encryption: false
+radio.0/wlan.1/cisco/wep-key: .xc3e9d4b1360d7cf5bcfc759753
+radio.0/wlan.1/cisco/wep-key-index: 1
+radio.0/wlan.1/radio-id: 0
+radio.0/wlan.1/wlan-id: 1

src/ac/rpc-macros/wlan1.ckv

@@ -0,0 +1,14 @@
+radio.0/wlan.1/capwap80211/capability: 1057
+radio.0/wlan.1/capwap80211/ssid: actube
+radio.0/wlan.1/cisco/allow-aaa-override: 0
+radio.0/wlan.1/cisco/broadcast-ssid: true
+radio.0/wlan.1/cisco/dtim-period: 1
+radio.0/wlan.1/cisco/encryption-policy: 16777216
+radio.0/wlan.1/cisco/max-stations: 200
+radio.0/wlan.1/cisco/profile-name: ACTUBE
+radio.0/wlan.1/cisco/session-timout: 1800
+radio.0/wlan.1/cisco/wep-encryption: 0
+radio.0/wlan.1/cisco/wep-key: .x00000000000000000000000000
+radio.0/wlan.1/radio-id: 0
+radio.0/wlan.1/wlan-id: 1
+

src/ac/rpc-macros/wlan13.ckv

@@ -0,0 +1,18 @@
+radio.0/wlan.13/capwap80211/capability: 1057
+radio.0/wlan.13/capwap80211/qos: 0
+radio.0/wlan.13/capwap80211/ssid: SuperSSID
+radio.0/wlan.13/cisco/aironet-ie: true
+radio.0/wlan.13/cisco/broadcast-ssid: true
+radio.0/wlan.13/cisco/dtim-period: 19
+radio.0/wlan.13/cisco/encryption-policy: 1
+radio.0/wlan.13/cisco/hreap-local-switch: 16
+radio.0/wlan.13/cisco/profile-name: SuerWLAN
+radio.0/wlan.13/cisco/scan-defer-period: 15420
+radio.0/wlan.13/cisco/scan-defer-time: 100
+radio.0/wlan.13/cisco/session-timout: 1800
+radio.0/wlan.13/cisco/wep-encryption: false
+radio.0/wlan.13/cisco/wep-key: .x55d80f0e2bf5223dd10f82407b
+radio.0/wlan.13/cisco/wep-key-index: 1
+radio.0/wlan.13/radio-id: 0
+radio.0/wlan.13/wlan-id: 13
+

src/ac/rpc.c

@@ -0,0 +1,722 @@
+
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/wait.h>
+
+#include <arpa/telnet.h>
+#include <histedit.h>
+
+
+#include "cw/sock.h"
+#include "cw/log.h"
+#include "cw/dbg.h"
+
+#include "wtpman.h"
+
+#include "cw/connlist.h"
+
+
+#include "wtplist.h"
+
+#include "ac.h"
+
+
+struct rpcdata{
+
+	FILE *in;
+	FILE *out;
+
+	char prompt[1024];
+	cw_Cfg_t * update_cfg;
+	cw_Cfg_t * global_cfg;
+	char *history[2000];
+	char line[4096];
+	int pos;
+	char esc[8];
+	int escpos;
+	int quit;
+
+	History *hist;
+	HistEvent ev;
+	Tokenizer *tok;
+	EditLine *el;
+
+};
+
+struct sockdata{
+	const char *name;
+	int fd;
+	cw_Cfg_t * global_cfg;
+};
+
+int select_cmd(struct rpcdata *sd, const char *cmd);
+int list_cmd(struct rpcdata *sd, const char * cmd);
+int cfg_cmd(struct rpcdata *sd, const char * cmd);
+int ucfg_cmd(struct rpcdata *sd, const char * cmd);
+int set_cmd(struct rpcdata *sd, const char * cmd);
+int del_cmd(struct rpcdata *sd, const char * cmd);
+int send_cmd(struct rpcdata *sd, const char * cmd);
+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);
+
+struct cw_Conn * find_ap(const char *name);
+
+struct command{
+	char * cmd;
+	int (*fun)(struct rpcdata *sd, const char *cmd);
+	
+};
+
+static struct command cmdlist[]={
+	{"exit",exit_cmd},
+	{"bumm",exit_cmd},
+	{"cfg", cfg_cmd },
+	{"del", del_cmd },
+	{"ucfg", ucfg_cmd},
+	{"list", list_cmd },
+	{"select", select_cmd },
+	{"send", send_cmd},
+	{"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},
+
+	
+	{NULL,NULL}
+};
+
+
+static void finish_cmd(FILE *f)
+{
+	fprintf(f,"\n");
+	fflush(f);
+}
+
+int prompt_cmd(struct rpcdata *sd, const char *cmd)
+{
+	const char *acname = cw_cfg_get(sd->global_cfg,"capwap/ac-name","actube");
+
+	fprintf(sd->out,"%s[%s]:>\n",acname,sd->prompt);
+	finish_cmd(sd->out);
+	return 0;
+}
+
+
+int global_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;
+
+
+	cw_cfg_fdump(sd->out,sd->global_cfg,str);
+	finish_cmd(sd->out);
+	return 0;
+}
+
+
+int select_cmd(struct rpcdata *sd, const char *cmd)
+{
+	char ap [CAPWAP_MAX_WTP_NAME_LEN];
+	sscanf(cmd,"%s",ap);
+	strcpy(sd->prompt,ap);
+	finish_cmd(sd->out);
+	return 0;
+}
+
+int list_cmd(struct rpcdata *sd, const char *cmd)
+{
+	show_aps(sd->out);
+	finish_cmd(sd->out);
+	return 0;
+}
+
+int exit_cmd(struct rpcdata *sd, const char *cmd)
+{
+	finish_cmd(sd->out);
+	fflush(sd->out);
+	return 1;
+}
+
+
+
+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);
+	if (conn==NULL){
+		fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
+	}
+	else {
+		cw_cfg_fdump(sd->out,conn->remote_cfg,str);
+	}
+	finish_cmd(sd->out);
+	wtplist_unlock();
+	return 0;
+}
+
+
+int status_cmd(struct rpcdata *sd, const char *cmd)
+{
+	struct cw_Conn * conn;
+	int i;
+	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;
+}
+
+
+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 {
+		wtpman=conn->data;
+		cw_cfg_copy(sd->update_cfg,conn->update_cfg,0,NULL);
+		wtpman->update=1;
+
+		fprintf(sd->out, "Sending update cmd\n");
+
+	}
+errX:	
+	wtplist_unlock();
+	finish_cmd(sd->out);
+	return 0;
+}
+
+int
+wlan0_cmd(struct rpcdata * sd, const char *cmd)
+{
+	stop();
+
+	struct cw_Conn * conn;
+	wtplist_lock();
+	conn = find_ap(sd->prompt);
+	if (conn==NULL){
+		fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
+	}
+	else {
+		FILE *f=fopen("wlan0.ktv","r");
+		fclose(f);
+	}
+	wtplist_unlock();
+	return 0;
+}
+
+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,NULL);
+	cw_cfg_copy(cfg,sd->update_cfg,DBG_CFG_UPDATES,"rpc ucfg");
+
+	cw_cfg_destroy(cfg);
+
+	finish_cmd(sd->out);
+	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 *s;
+
+	while( isspace( *str ) )  
+		 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;
+}
+
+
+void print_mw(FILE *f, int w, const char * str)
+{
+	int n,i;
+	fprintf(f, "%.*s",w,str);
+	n=strlen(str);
+
+	if ( n>w ){
+		fprintf(f,"> ");
+		return;
+	}
+	n = w-n;
+
+	for(i=0;i<(n+2);i++){
+		fprintf(f,"%c",' ');
+	}
+}
+
+
+int  show_aps (FILE *out)
+{
+	struct connlist * cl;
+	mavliter_t it;
+	wtplist_lock();
+	
+	cl = wtplist_get_connlist();
+	
+	
+	mavliter_init (&it, cl->by_addr);
+	print_mw (out, 16, "AP Name");
+	print_mw (out, 16, "AP Model");
+	print_mw (out, 14, "Vendor");
+	print_mw (out, 16, "IP ");
+	fprintf(out,"\n");
+
+	mavliter_foreach (&it) {
+		char addr[SOCK_ADDR_BUFSIZE];
+		const char *vendor;
+
+		struct cw_Conn * conn;
+		conn = mavliter_get_ptr (&it);
+
+		print_mw(out,16,cw_cfg_get(conn->remote_cfg, "capwap/wtp-name", "Unknown"));
+		print_mw(out,16,cw_cfg_get(conn->remote_cfg, "capwap/wtp-board-data/model-no", "Unknown"));
+		vendor = cw_cfg_get(conn->remote_cfg, "capwap/wtp-board-data/vendor", "0");
+		print_mw(out,14,vendor);	
+		sock_addr2str_p (&conn->addr, addr);
+		print_mw(out,16,addr);
+		fprintf(out,"\n");
+
+	}
+	wtplist_unlock();
+	return 0;
+}
+
+
+
+struct cw_Conn * find_ap(const char *name)
+{
+	
+	struct connlist * cl;
+	mavliter_t it;
+
+	cl = wtplist_get_connlist();
+	
+	mavliter_init (&it, cl->by_addr);
+	mavliter_foreach (&it) {
+		const char *wtpname;
+		struct cw_Conn * conn;
+		conn = mavliter_get_ptr (&it);
+		
+		wtpname = cw_cfg_get (conn->remote_cfg, "capwap/wtp-name", NULL);
+		
+		if (wtpname == NULL)
+			continue;
+		
+		if(strcmp(wtpname,name)==0){
+			return conn;
+		}
+
+	}
+	return NULL;
+	
+}
+
+
+struct command * find_cmd(const char *cmd)
+{
+	struct command * search,*result;
+	
+	result=NULL;
+	search = cmdlist;
+	while (search->cmd!=NULL){
+		if (strncmp(cmd,search->cmd,strlen(cmd))==0){
+			if (result==NULL)
+				result = search;
+			else 
+				return NULL;
+		}
+		search ++;
+	}
+	return result;
+}
+
+
+int execute_cmd (struct rpcdata * sd, const char *str)
+{
+	char cmd[1024];
+	char args[1024];
+	int n;
+	struct command * searchcmd;
+
+	args[0]=0;
+	
+	n = sscanf (str, "%s", cmd);
+	if (n<=0)
+		return 0;
+	
+	searchcmd = find_cmd(cmd);
+	if (searchcmd!=NULL){
+		if (searchcmd->fun != NULL){
+			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{
+		fprintf(sd->out,"Unknown command: '%s'\n",cmd);
+		finish_cmd(sd->out);
+	}
+
+	return 0;
+	
+}
+
+
+
+void rpc_loop (FILE *file, cw_Cfg_t *global_cfg)
+{
+	struct rpcdata sd;
+	int c;
+	c=0;
+
+	char str[2048];
+	
+	sd.in = file;
+	sd.out = file;	
+	sd.global_cfg=global_cfg;
+	sd.update_cfg=cw_cfg_create();
+
+
+	sprintf(sd.prompt,"%s","*");
+	sd.quit=0;
+
+	do {
+
+		str[0]=0;
+		
+
+		fgets (str, sizeof (str), file);
+
+		if (execute_cmd (&sd, str)) {
+			break;
+		}
+
+	} while (c != EOF);
+	
+}
+
+
+void * run_rpc_server (void * arg)
+{
+	char sockstr[SOCK_ADDR_BUFSIZE];
+	struct sockdata * sockdata;
+	int clientsock;
+        struct sockaddr_storage client;
+	socklen_t client_size;
+
+	sockdata = (struct sockdata *)arg;
+
+	memset(&client,0,sizeof(client));
+	client_size=sizeof(client);
+
+	cw_dbg(DBG_INFO,"Starting RPC Service, listening on: %s (sock fd: %d)",sockdata->name, sockdata->fd);
+
+	while(1){
+		clientsock = accept (sockdata->fd, (struct sockaddr*) &client, &client_size);
+		if (clientsock == -1){
+			cw_log (LOG_ERR, "Accept error  '%s', %s", "addr", strerror (errno));
+			return NULL;
+
+		}
+		
+		if (clientsock > 0) {
+			sock_addr2str_p (&client, sockstr);
+			cw_dbg (DBG_INFO, "Accepting RPC session from %s", sockstr);
+			rpc_loop (fdopen (clientsock, "a+"),sockdata->global_cfg);
+			close (clientsock);
+		}
+		
+	}	
+	
+	return NULL;
+}
+
+int create_tcp_fd(const char *name)
+{
+	struct sockaddr_storage server; //, client;
+	
+	int rc;
+	const char * addr = name;
+	int sockfd;
+	int yes;
+	
+	rc = sock_strtoaddr (addr, (struct sockaddr*) &server);
+	
+	if (! rc) {
+		cw_log (LOG_ERR, "Can't parse address '%s', %s", addr, strerror (errno));
+		return -1;
+	}
+	
+	sockfd = socket ( ( (struct sockaddr*) &server)->sa_family, SOCK_STREAM, 0);
+	yes = 1;
+	/* reuse address */
+	setsockopt (sockfd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof (yes));
+	
+	
+	/* bind address */
+	rc =  bind (sockfd, (struct sockaddr*) &server, sizeof (struct sockaddr));
+	
+	if (rc) {
+		cw_log (LOG_ERR, "Can't bind socket address '%s', %s", addr, strerror (errno));
+		return -1;
+	}
+	
+	return sockfd;	
+}
+static int create_unix_fd(const char *name)
+{
+	struct sockaddr_un addr;
+	int rc,fd;
+
+	unlink(name);
+	fd = socket(PF_UNIX, SOCK_STREAM, 0);
+
+	sock_addrinit((struct sockaddr_storage*)&addr,AF_UNIX);
+	strncpy(addr.sun_path, name, sizeof(addr.sun_path)-1);
+	rc = bind(fd, (struct sockaddr*)&addr, sizeof(addr));
+	if (rc) {
+		cw_log (LOG_ERR, "Can't bind socket 'unix:%s', %s", name, strerror (errno));
+		return -1;
+	}
+
+	return fd;
+}
+
+int start_rpc(cw_Cfg_t *global_cfg)
+{
+	struct sockdata * sockdata;
+	const char *sockname;
+	int rc; 
+	int fd;
+
+	rc = cw_cfg_get_bool(global_cfg,"actube/rpc/enable",1);
+	if (!rc)
+		return 1;
+
+	sockdata = malloc(sizeof(struct sockdata));
+	if (sockdata==NULL)
+		return 0;
+
+	memset(sockdata,0,sizeof(struct sockdata));
+
+	sockdata->global_cfg = global_cfg;
+	sockdata->fd=-1;
+
+	sockname = cw_cfg_get(global_cfg,"actube/rpc/listen",NULL);
+	
+	if (sockname==NULL) {
+		cw_log (LOG_ERR, "Can't get RPC listen address from global_cfg 'actube/rpc/listen");
+		goto errX;
+	}
+
+	if (strncmp("unix:",sockname,strlen("unix:"))==0){
+		fd = create_unix_fd(strchr(sockname,':')+1);
+		if (fd==-1)
+			goto errX;
+		sockdata->name=cw_strdup(sockname);
+		sockdata->fd=fd;
+	}else if (strncmp("tcp:",sockname,strlen("tcp:"))==0){
+		fd = create_tcp_fd(strchr(sockname,':')+1);
+		if (fd==-1)
+			goto errX;
+		sockdata->name=cw_strdup(sockname);
+		sockdata->fd=fd;
+	}else {
+		fd = create_tcp_fd(sockname);
+		if (fd==-1)
+			goto errX;
+		sockdata->name=cw_strdup(sockname);
+		sockdata->fd=fd;
+	}
+
+
+	rc = listen (sockdata->fd, 5);
+	if (rc) {
+		cw_log (LOG_ERR, "Can't listen on address '%s', %s", "addr", strerror (errno));
+		goto errX;
+	}
+	
+	pthread_t thread;
+	pthread_create (&thread, NULL, run_rpc_server,
+	                sockdata);
+	return 1;
+errX:
+	if (sockdata->fd!=-1)
+		close(sockdata->fd);
+	if (sockdata->name)
+		free((void*)sockdata->name);
+
+	free(sockdata);
+	return 0;
+}

src/ac/shell.c

@@ -1,514 +0,0 @@
-
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include "cw/sock.h"
-#include "cw/log.h"
-#include "cw/dbg.h"
-
-
-#include "cw/connlist.h"
-
-
-#include "wtplist.h"
-
-
-
-
-struct shelldata{
-	FILE *out;
-	char prompt[1024];
-	mavl_t update_cfg;
-};
-
-void select_cmd(struct shelldata *sd, const char *cmd);
-void list_cmd(struct shelldata *sd, const char * cmd);
-void cfg_cmd(struct shelldata *sd, const char * cmd);
-void ucfg_cmd(struct shelldata *sd, const char * cmd);
-void set_cmd(struct shelldata *sd, const char * cmd);
-void del_cmd(struct shelldata *sd, const char * cmd);
-void send_cmd(struct shelldata *sd, const char * cmd);
-void wlan0_cmd(struct shelldata *sd, const char * cmd);
-//void show_cfg (FILE *out, mavl_t ktv);
-void show_aps (FILE *out);
-
-struct cw_Conn * find_ap(const char *name);
-
-struct command{
-	char * cmd;
-	void (*fun)();
-};
-
-static struct command cmdlist[]={
-	{"cfg", cfg_cmd },
-	{"del", del_cmd },
-	{"ucfg", ucfg_cmd},
-	{"list", list_cmd },
-	{"select", select_cmd },
-	{"send", send_cmd},
-	{"set", set_cmd },
-	{"wlan0",wlan0_cmd},
-
-	
-	{NULL,NULL}
-};
-
-
-void select_cmd(struct shelldata *sd, const char *cmd)
-{
-	char ap [CAPWAP_MAX_WTP_NAME_LEN];
-	sscanf(cmd,"%s",ap);
-	strcpy(sd->prompt,ap);
-}
-
-void list_cmd(struct shelldata *sd, const char *cmd)
-{
-	show_aps(sd->out);
-}
-
-void cfg_cmd(struct shelldata *sd, const char *cmd)
-{
-	struct cw_Conn * conn;
-	wtplist_lock();
-	conn = find_ap(sd->prompt);
-	if (conn==NULL){
-		fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
-	}
-	else {
-		stop();
-//		show_cfg(sd->out,conn->remote_cfg);
-	}
-	wtplist_unlock();
-}
-
-void ucfg_cmd(struct shelldata *sd, const char *cmd)
-{
-	struct cw_Conn * conn;
-	stop();
-//	show_cfg(sd->out,sd->update_cfg);
-
-}
-
-#include "wtpman.h"
-
-void 
-send_cmd(struct shelldata * sd, const char *cmd)
-{
-	struct cw_Conn * conn;
-	wtplist_lock();
-	conn = find_ap(sd->prompt);
-	if (conn==NULL){
-		fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
-	}
-	else {
-		conn->update_cfg=sd->update_cfg;
-	}
-	wtplist_unlock();
-}
-
-void 
-wlan0_cmd(struct shelldata * sd, const char *cmd)
-{
-	stop();
-
-	struct cw_Conn * conn;
-	wtplist_lock();
-	conn = find_ap(sd->prompt);
-	if (conn==NULL){
-		fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
-	}
-	else {
-		FILE *f=fopen("wlan0.ktv","r");
-//		cw_ktv_read_file(f,sd->update_cfg,conn->msgset->types_tree);
-		//conn->update_cfg=sd->update_cfg;
-		fclose(f);
-	}
-	wtplist_unlock();
-
-}
-
-void set_cmd(struct shelldata *sd, const char *str)
-{
-	struct cw_Conn * conn;
-	struct cw_Val_Reader r;
-	char key[CW_CFG_MAX_KEY_LEN];
-	char type[CW_CFG_MAX_KEY_LEN];
-	char val[2048];
-
-	stop();
-
-//	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: %s\n",key,type,val);
-	cw_ktv_add(sd->update_cfg,key,CW_TYPE_STR,NULL,val,strlen(val));
-}
-
-void del_cmd(struct shelldata *sd, const char *str)
-{
-	char key[CW_CFG_MAX_KEY_LEN];
-	sscanf(str,"%s",key);
-	stop();
-//	cw_ktv_del_sub(sd->update_cfg,key);
-}
-
-
-/*
-void show_cfg (FILE *out, mavl_t ktv)
-{
-	char value[500];
-	struct cw_Val * data;
-	mavliter_t it;
-	const struct cw_Type * type;
-	
-	
-	mavliter_init(&it,ktv);
-
-	mavliter_foreach(&it){
-		
-		data = mavliter_get(&it);
-		type = data->type;
-		type->to_str(data,value,0);
-		
-		fprintf(out,"%s :%s: %s\n",data->key,type->get_type_name(data), value);
-	}
-	
-	
-}
-*/
-
-void show_aps (FILE *out)
-{
-	stop();
-/*	struct connlist * cl;
-	mavliter_t it;
-	wtplist_lock();
-	
-	cl = wtplist_get_connlist();
-	
-	
-	mavliter_init (&it, cl->by_addr);
-	fprintf (out, "IP\t\t\twtp-name\n");
-	mavliter_foreach (&it) {
-		cw_Val_t * result;
-		char addr[SOCK_ADDR_BUFSIZE];
-		char wtp_name[CAPWAP_MAX_WTP_NAME_LEN];
-		struct cw_Conn * conn;
-		conn = mavliter_get_ptr (&it);
-		
-		sock_addr2str_p (&conn->addr, addr);
-
-		stop();		
-//		result = cw_ktv_get (conn->remote_cfg, "wtp-name", NULL);
-		
-		if (result == NULL) {
-			strcpy (wtp_name, "");
-			
-		} else {
-			result->type->to_str (result, wtp_name, CAPWAP_MAX_WTP_NAME_LEN);
-		}
-		
-		
-		fprintf (out, "%s\t\t%s\n", addr, wtp_name);
-	}
-	wtplist_unlock();
-	*/
-}
-
-
-
-struct cw_Conn * find_ap(const char *name)
-{
-stop();
-/*	
-	struct connlist * cl;
-	mavliter_t it;
-
-	cl = wtplist_get_connlist();
-	
-	
-	mavliter_init (&it, cl->by_addr);
-	mavliter_foreach (&it) {
-		cw_Val_t * result;
-		char wtp_name[CAPWAP_MAX_WTP_NAME_LEN];
-		struct cw_Conn * conn;
-		conn = mavliter_get_ptr (&it);
-		
-		result = cw_ktv_get (conn->remote_cfg, "wtp-name", NULL);
-		
-		if (result == NULL) {
-			strcpy (wtp_name, "");
-			
-		} else {
-			result->type->to_str (result, wtp_name, CAPWAP_MAX_WTP_NAME_LEN);
-		}
-	
-		printf("cmp '%s' : '%s'\n",wtp_name,name);
-		
-		if(strcmp(wtp_name,name)==0){
-			return conn;
-		}
-
-	}
-	return NULL;
-	*/
-	/*wtplist_unlock();*/
-}
-
-
-void con (FILE *out)
-{
-	stop();
-
-/*	
-	struct connlist * cl;
-	mavliter_t it;
-	
-	
-	
-	wtplist_lock();
-	
-	cl = wtplist_get_connlist();
-	
-	
-	mavliter_init (&it, cl->by_addr);
-	fprintf (out, "IP\t\t\twtp-name\n");
-	mavliter_foreach (&it) {
-		cw_Val_t * result;
-		char addr[SOCK_ADDR_BUFSIZE];
-		char wtp_name[CAPWAP_MAX_WTP_NAME_LEN];
-		struct cw_Conn * conn;
-		conn = mavliter_get_ptr (&it);
-		
-		sock_addr2str_p (&conn->addr, addr);
-		
-		result = cw_ktv_get (conn->remote_cfg, "wtp-name", NULL);
-		
-		if (result == NULL) {
-			strcpy (wtp_name, "");
-			
-		} else {
-			result->type->to_str (result, wtp_name, CAPWAP_MAX_WTP_NAME_LEN);
-		}
-		
-		
-		fprintf (out, "Con!! %s\t\t%s\n", addr, wtp_name);
-		
-		{
-			stop();
-
-			mavl_t update;
-//			update = cw_ktv_create();
-//			cw_ktv_set_byte(update,"radio.255/admin-state",1);
-//			conn->update_cfg=update;
-		}
-
-
-		fprintf(out,"\n");
-
-	}
-	wtplist_unlock();
-	*/
-}
-
-
-struct command * find_cmd(const char *cmd)
-{
-	struct command * search;
-	
-	search = cmdlist;
-	while (search->cmd!=NULL){
-		if (strncmp(cmd,search->cmd,strlen(cmd))==0){
-			return search;
-		}
-		search ++;
-	}
-	return NULL;
-}
-
-
-void execute_cmd (struct shelldata * sd, const char *str)
-{
-	char cmd[1024];
-	char args[1024];
-	int n;
-	struct cw_Val_Reader reader;
-	struct command * searchcmd;
-
-	args[0]=0;
-	
-	n = sscanf (str, "%s", cmd);
-	if (n<=0)
-		return;
-	
-	searchcmd = find_cmd(cmd);
-	
-	if (searchcmd!=NULL){
-		if (searchcmd->fun != NULL){
-			fprintf(sd->out,"%s %s\n", searchcmd->cmd,str+strlen(cmd));
-			searchcmd->fun(sd, str+strlen(cmd));
-		}
-	}
-	else{
-		fprintf(sd->out,"Unknown command: '%s'\n",cmd);
-	}
-
-	return;
-	
-	
-	char key[CW_CFG_MAX_KEY_LEN];
-	char type[128];
-	char val[2048];
-
-	key[0]=0;
-	type[0]=0;
-	val[0]=0;
-
-	stop();
-//	cw_ktv_init_str_reader(&reader,str, strlen(str));
-//	n = cw_ktv_parse_string(&reader, key,type,val);
-	
-	if (n==-1){
-		int i;
-		fprintf(sd->out,"Error on pos %d\n",reader.pos);
-		fprintf(sd->out,"%s",str);
-		for(i=0;i<reader.pos;i++){
-			fprintf(sd->out," ");
-		}
-		fprintf(sd->out,"^\n");
-		fprintf(sd->out,"%s\n",reader.error);
-	}
-	else{
-		fprintf(sd->out,"%s :%s: %s\n", key,type,val);
-	}
-	return;
-	
-	
-	n = sscanf (str, "%s%s", cmd, args);
-
-	if (n<=0)
-		return;
-	/*printf("CMD: %s, ARGS:\n",cmd);*/
-	
-	if (strcmp (cmd, "s") == 0) {
-		show_aps (sd->out);
-		return;
-	}
-	
-	if (strcmp (cmd, "con")==0){
-		con(sd->out);
-		return;
-	}
-
-}
-
-
-void shell_loop (FILE *file)
-{
-	struct shelldata sd;
-	int c;
-	c=0;
-	/*	setvbuf(file,NULL,_IONBF,0);
-		fflush(file);
-	*/
-	
-	char str[2048];
-	stop();
-//	sd.update_cfg = cw_ktv_create();
-	
-	
-	
-	sd.out = file;
-	sprintf(sd.prompt,"%s","*");
-	
-	do {
-		fprintf (file, "actube[%s]:>", sd.prompt);
-		fflush (file);
-		str[0]=0;
-		fgets (str, sizeof (str), file);
-		execute_cmd (&sd, str);
-		
-	} while (c != EOF);
-	
-}
-
-
-void * run_shell (void * arg)
-{
-	struct sockaddr_storage server, client;
-	socklen_t client_size;
-	char sockstr[SOCK_ADDR_BUFSIZE];
-	
-	int rc;
-	const char * addr = "127.0.0.1:5000";
-	int sockfd, clientsock;
-	int yes;
-	
-
-	cw_dbg(DBG_INFO,"Staring shelli listening at: %s",addr);
-
-
-	rc = sock_strtoaddr (addr, (struct sockaddr*) &server);
-	
-	if (! rc) {
-		cw_log (LOG_ERR, "Can't parse address '%s', %s", addr, strerror (errno));
-	}
-	
-	sockfd = socket ( ( (struct sockaddr*) &server)->sa_family, SOCK_STREAM, 0);
-	
-	yes = 1;
-	/* reuse address */
-	setsockopt (sockfd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof (yes));
-	
-	
-	/* bind address */
-	rc =  bind (sockfd, (struct sockaddr*) &server, sizeof (server));
-	
-	if (rc) {
-		cw_log (LOG_ERR, "Can't bind socket address '%s', %s", addr, strerror (errno));
-	}
-	
-	rc = listen (sockfd, 5);
-	
-	if (rc) {
-		cw_log (LOG_ERR, "Can't listen on address '%s', %s", addr, strerror (errno));
-	}
-	
-	
-	client_size = sizeof (client);
-while(1){
-	
-	clientsock = accept (sockfd, (struct sockaddr*) &client, &client_size);
-	
-	if (clientsock > 0) {
-		sock_addr2str_p (&client, sockstr);
-		cw_dbg (DBG_INFO, "Acceptiong session from %s", sockstr);
-		cw_dbg (DBG_INFO, "Start shell");
-		shell_loop (fdopen (clientsock, "a+"));
-		cw_dbg (DBG_INFO, "Stop shell");
-		close (clientsock);
-	}
-	
-	
-	
-	cw_dbg (DBG_INFO,"Accepting shell session %i, %s", rc, strerror (errno));
-}	
-	
-	
-	
-	return NULL;
-}
-
-
-void start_shell()
-{
-	pthread_t thread;
-	pthread_create (&thread, NULL, run_shell,
-	                NULL);
-}

src/ac/statemachine.c

@@ -131,7 +131,7 @@ struct mavl * cw_statemachine_load_states (struct mavl * statemachine_states, cw
                         cw_strstate(s->state));
                 s++;
         }
-        return 1;
+        return NULL;
 }
 
 

src/ac/wtplist.c

@@ -78,7 +78,7 @@ struct wtpman * wtplist_get(const struct sockaddr * addr)
 
 }
 
-struct wtpman * wtplist_get_by_session_id(bstr16_t *session_id)
+struct wtpman * wtplist_get_by_session_id(bstr16_t session_id)
 {
 	struct cw_Conn  search;
 	struct cw_Conn * conn;

src/ac/wtplist.h

@@ -13,7 +13,7 @@ extern struct wtpman * wtplist_add(struct wtpman * wtpman);
 extern void wtplist_remove(struct wtpman * wtpman);
 extern void wtplist_lock();
 extern void wtplist_unlock();
-extern struct wtpman * wtplist_get_by_session_id(bstr16_t *session_id);
+extern struct wtpman * wtplist_get_by_session_id(bstr16_t session_id);
 struct connlist * wtplist_get_connlist(void);
 
 #endif

src/ac/wtpman.c

@@ -44,6 +44,8 @@
 
 #include "actube.h"
 
+#include "cw/dot11.h"
+
 
 static void wtpman_remove(struct wtpman *wtpman)
 {
@@ -64,11 +66,13 @@ static void wtpman_run_discovery(void *arg)
 
 	wtpman->conn->capwap_state = CAPWAP_STATE_DISCOVERY;
 
+
 	while (!cw_timer_timeout(timer)
 	       && wtpman->conn->capwap_state == CAPWAP_STATE_DISCOVERY) {
 		int rc;
 		rc = cw_read_messages(wtpman->conn);
 
+
 		if (cw_result_is_ok(rc)) {
 			wtpman->conn->capwap_state = CAPWAP_STATE_JOIN;
 
@@ -85,7 +89,6 @@ static void wtpman_run_discovery(void *arg)
 
 		}
 	}
-
 	return;
 }
 
@@ -165,7 +168,7 @@ static int wtpman_join(void *arg)
 
 
 
-static void wtpman_image_data(struct wtpman *wtpman)
+void wtpman_image_data(struct wtpman *wtpman)
 {
 /*	char sock_buf[SOCK_ADDR_BUFSIZE];
 	struct cw_Conn *conn = wtpman->conn;
@@ -297,14 +300,99 @@ 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 int dataman_process_msg(struct cw_Conn *nc, uint8_t * rawmsg, int len,
+			struct sockaddr *from)
+{
+	char rframe[1000];
+	int offs =  cw_get_hdr_msg_offset(rawmsg);
+	uint8_t * frame = rawmsg + offs;
+	int frame_len = len-offs;
+	cw_dbg_dot11_frame(frame,frame_len);
+
+/*	dot11_init_assoc_resp(frame);
+
+	dot11_copy_mac(dot11_get_sa(dot11frame),dot11_get_da(frame));
+	dot11_copy_mac(dot11_get_bssid(dot11frame),dot11_get_bssid(frame));
+	dot11_copy_mac(dot11_get_da(dot11frame),dot11_get_sa(frame));
+	dot11_set_seq(frame,0);
+*/
+	if ( dot11_get_type_and_subtype(frame) == DOT11_ASSOC_REQ){
+		int l;
+		uint8_t rates[] = {
+			12,0x82,0x84,0x8b,0x96,0x0c,0x12,0x18,0x24,0x30,0x48,0x60,0x6c	
+		}; 
+		cw_dbg(DBG_X, "there is an assoc request!");
+
+		uint8_t  rframe[1000];
+		nc->mtu=800;
+
+
+        	dot11_init_assoc_resp(rframe);
+		dot11_set_duration(rframe,100);
+
+		dot11_copy_mac(dot11_get_sa(frame),dot11_get_da(rframe));
+		dot11_copy_mac(dot11_get_bssid(frame),dot11_get_bssid(rframe));
+		dot11_copy_mac(dot11_get_da(frame),dot11_get_sa(rframe));
+		dot11_set_seq(rframe,dot11_get_seq(frame));
+		dot11_assoc_resp_set_cap(rframe,dot11_assoc_req_get_cap(frame));
+		dot11_assoc_resp_set_status_code(rframe,0);
+		dot11_assoc_resp_set_assoc_id(rframe,17);
+		l=24+6;
+		l+=dot11_put_supported_rates(rframe+l,rates);
+		cw_dbg_dot11_frame(rframe,l);
+
+		uint8_t buf[1024];
+		int hlen;
+		hlen = cw_init_capwap_packet(buf,1,0,NULL,NULL);
+		cw_set_hdr_flags(buf, CAPWAP_FLAG_HDR_T, 1);
+		cw_send_capwap_packet(nc,buf,hlen,rframe,l);
+		
+	}
+	
+
+	return 0;
+}
+
+static void *wtpman_data_main(void *arg)
+{
+	struct wtpman * wtpman = arg;
+	struct cw_Conn * nc = wtpman->dconn;
+	nc->process_packet=conn_process_packet;
+	nc->process_message=dataman_process_msg;
+
+
+	while (1){
+		time_t timer = cw_timer_start(2);
+		while (!cw_timer_timeout(timer)){
+			cw_read_messages(nc);
+		}
+	}
+
+	
+}
+
 static void *wtpman_main(void *arg)
 {
-	mavl_t r;
+	//mavl_t r;
 	int rc;
 	time_t timer;
-	char sock_buf[SOCK_ADDR_BUFSIZE];
+	//char sock_buf[SOCK_ADDR_BUFSIZE];
 	struct cw_Conn *conn;
-	int last_state;
+//	int last_state;
 	struct wtpman *wtpman = (struct wtpman *) arg;
 
 	wtpman->conn->seqnum = 0;
@@ -342,11 +430,12 @@ 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) {
 
-		int wait_join;
-		int wait_change_state;
+		//int wait_join;
+		//int wait_change_state;
 
 
 
@@ -358,230 +447,28 @@ 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);
 
-/*
-//	cw_dbg(DBG_INFO, "Creating data thread");
-//	pthread_t thread;
-//	pthread_create(&thread, NULL, (void *) wtpman_run_data, (void *) wtpman);
-*/
-
-	/* here the WTP has joined, now we assume an image data request  
-	   or a configuration status request. Nothing else. 
-	 */
-
-	rc = 0;
-	while (!cw_timer_timeout(timer)
-	       && wtpman->conn->capwap_state == CAPWAP_STATE_CONFIGURE) {
-		rc = cw_read_messages(wtpman->conn);
-		if (rc < 0) {
-			if (errno != EAGAIN)
-				break;
-		}
-	}
-
-	cw_dbg_ktv_dump(conn->remote_cfg, DBG_INFO,
-			"-------------dump------------", "DMP",
-			"---------end dump --------");
-
-	if (!cw_result_is_ok(rc)) {
-		cw_dbg(DBG_INFO, "WTP Problem: %s", cw_strrc(rc));
-		wtpman_remove(wtpman);
 	return NULL;
-
-	}
-
-
-	if (conn->capwap_state == CW_STATE_IMAGE_DATA) {
-		wtpman_image_data(wtpman);
-		return NULL;
-	}
-
-
-
-	conn->capwap_state = CAPWAP_STATE_RUN;
-/*
-	// XXX testing ...
-//	DBGX("Cofig to sql", "");
-//	props_to_sql(conn,conn->incomming,0);
-//	radios_to_sql(conn);
-*/
-
-	/*conn->msg_end=msg_end_handler; */
-	/* The main run loop */
-	reset_echointerval_timer(wtpman);
-
-	rc = 0;
-	while (wtpman->conn->capwap_state == CAPWAP_STATE_RUN) {
-		rc = cw_read_messages(wtpman->conn);
-		if (rc < 0) {
-			if (errno != EAGAIN)
-				break;
-		}
-
-/*//		cw_dbg(DBG_X, "Time left: %d",
-// */
-		/*cw_timer_timeleft(wtpman->echointerval_timer); */
-
-		if (cw_timer_timeout(wtpman->echointerval_timer)) {
-
-			cw_dbg(DBG_INFO, "Lost connection to WTP:%s",
-			       sock_addr2str_p(&conn->addr, sock_buf));
-			break;
-		}
-/*
-//		mavl_del_all(conn->outgoing);
-//		conn_clear_upd(conn,1);
-
-//	props_to_sql(conn,conn->incomming,0);
-//	radios_to_sql(conn);
-*/
-
-
-
-		r = db_get_update_tasks(conn,
-					sock_addr2str(&conn->addr, sock_buf));
-		if (r) {
-
-			/*              
-			   //                   if (!conn->outgoing->count)
-			   //                           continue;
-			 */
-			cw_dbg(DBG_INFO, "Updating WTP %s",
-			       sock_addr2str(&conn->addr, sock_buf));
-
-			rc = cw_send_request(conn,
-					     CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST);
-
-/*
-//			mavl_merge(conn->config, conn->outgoing);
-//			mavl_destroy(conn->outgoing);
-//			conn->outgoing = mbag_create();
-//			props_to_sql(conn,conn->incomming,0);
-//			radios_to_sql(conn);
-//			mavl_destroy(r);
-*/
-		}
-
-		r = db_get_radio_tasks(conn,
-				       sock_addr2str(&conn->addr, sock_buf));
-		if (r) {
-
-/*
-			//			if (!conn->radios_upd->count)
-//				continue;
-*/
-			cw_dbg(DBG_INFO, "Updating Radios for %s",
-			       sock_addr2str(&conn->addr, sock_buf));
-			rc = cw_send_request(conn,
-					     CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST);
-
-/*
-//			conn_clear_upd(conn,1);
-
-//			mavl_destroy(conn->radios_upd);
-//			conn->radios_upd=mbag_i_create();
-
-
-//			radios_to_sql(conn);
-*/
-			/*
-			   rc = cw_send_request(conn, CW_MSG_CONFIGURATION_UPDATE_REQUEST);
-			   mavl_merge(conn->config, conn->outgoing);
-			   mavl_destroy(conn->outgoing);
-			   conn->outgoing = mbag_create();
-			   config_to_sql(conn);
-			   radios_to_sql(conn);
-			   mavl_destroy(r);
-			 */
-		}
-
-
-
-	}
-
-	db_ping_wtp(sock_addr2str_p(&conn->addr, sock_buf), "");
-	wtpman_remove(wtpman);
-	return NULL;
-}
-
-
-static void wtpman_run_dtls(void *arg)
-{
-	char sock_buf[SOCK_ADDR_BUFSIZE];
-	struct wtpman *wtpman = (struct wtpman *) arg;
-
-
-
-	/* reject connections to our multi- or broadcast sockets */
-	if (socklist[wtpman->socklistindex].type != SOCKLIST_UNICAST_SOCKET) {
-		cw_dbg(DBG_DTLS,
-		       "Dropping connection from %s to non-unicast socket.",
-		       sock_addr2str_p(&wtpman->conn->addr, sock_buf));
-		wtpman_remove(wtpman);
-		return;
-	}
-/*//      time_t timer = cw_timer_start(wtpman->conn->wait_dtls);*/
-
-	/* establish dtls session */
-	if (!wtpman_dtls_setup(wtpman)) {
-		wtpman_remove(wtpman);
-		return;
-	}
-
-	wtpman_main(arg);
 }
 
 
@@ -600,79 +487,155 @@ 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);
-	cw_dbg(DBG_X,"Copying done.");
+        cw_cfg_copy(params->cfg, params->conn->remote_cfg,DBG_CFG_UPDATES,"GlobalCfg");
 }
 
-static int discovery_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
+static void catch_cfg(struct cw_ElemHandlerParams * params, int create, const char *format, ...)
 {
+	const char *wtpname;
+	char filename[200];
+	FILE *f;
+	cw_Cfg_t * cfg_list[3];
+
+	if (!cw_cfg_get_bool(params->conn->global_cfg,"actube/save-initial-wtp-config",0))
+		return;
+
+	cfg_list[0]=params->cfg;
+	cfg_list[1]=params->conn->remote_cfg;
+	cfg_list[2]=NULL;
+
+	wtpname = cw_cfg_get_l(cfg_list,"capwap/wtp-name","default");
+	sprintf(filename,"wtp-initial-%s.ckv",wtpname);
+
+	if (create)		
+		f = fopen(filename,"w");
+	else
+		f = fopen(filename,"a");
+	if (f==NULL)
+		return;
+
+	if (create)
+		fprintf(f,"#\n# Initial config for WTP '%s' - catched by ACTube\n#\n\n",wtpname);
+
+        if (format !=NULL){
+                va_list args;
+                va_start(args,format);
+                vfprintf(f,format,args);
+                va_end(args);
+        }
+	cw_cfg_write_to_file(f, params->cfg);
+	fclose(f);
+
+
+
+}
+
+
+
+static int discovery_cb(struct cw_ElemHandlerParams * params, struct cw_MsgCb_data * d)
+{
+
 	cw_dbg(DBG_X,"DISCOVERY Callback");
 	copy(params);
+	catch_cfg(params,1,"\n#\n# Discovery Request\n#\n");
+
 	cw_cfg_clear(params->cfg);
+	if (d->parent)
+		return d->parent->fun(params,d->parent);
+
 	return 0;
 }
 
-static int join_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
+static int join_cb(struct cw_ElemHandlerParams * params, struct cw_MsgCb_data *d)
 {
-	struct cw_Conn * conn = (struct cw_Conn*)params->conn;
-	char filename[200];
-
-	cw_dbg(DBG_X,"JOIN Callback");
-	copy(params);
-	const char * wtpname = cw_cfg_get(conn->local_cfg,"wtp-name","default");
-	sprintf(filename,"wtp-join-%s.ckv",wtpname);
-	cw_cfg_save(filename,params->cfg,NULL);
-	cw_cfg_clear(params->cfg);
+	catch_cfg(params,0,"\n#\n# Join Request\n#\n");
+	if (d->parent)
+		return d->parent->fun(params,d->parent);
 	return 0;
 }
 
-static int update_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
+
+/*
+static int fill_update_cfg(struct cw_Conn * conn)
 {
-	struct cw_Conn * conn = (struct cw_Conn*)params->conn;
-	char filename[200];
-
-
-	
-	cw_dbg(DBG_X,"UPDATE Callback");
-	copy(params);
-
-	const char * wtpname = cw_cfg_get(conn->local_cfg,"wtp-name","default");
-	sprintf(filename,"wtp-status-%s.ckv",wtpname);
-	cw_cfg_save(filename,params->cfg,NULL);
+	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 cfg_status_cb(struct cw_ElemHandlerParams * params, struct cw_MsgCb_data *d)
+{
+	catch_cfg(params,0,"\n#\n# Configuration Status Request\n#\n");
+	if (d->parent)
+		return d->parent->fun(params,d->parent);
+	return 0;
+}
+
+static int event_cb(struct cw_ElemHandlerParams * params, struct cw_MsgCb_data *d)
+{
+	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-event-%d-%s.ckv",wtpman->ctr++,wtpname);
+	cw_cfg_save(filename,params->cfg,NULL);
+	return 0;
+}
+
+static int change_state_event_cb(struct cw_ElemHandlerParams * params,struct cw_MsgCb_data * d)
+{
+	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;
 }
 
 
 
 
-static setup_complete(struct cw_Conn *conn)
-{
-	struct wtpman * wtpman = (struct wtpman *)conn->data;
-//	wtpman->pjoin = cw_msgset_set_postprocess(conn->msgset,CAPWAP_MSG_JOIN_REQUEST,join_cb);
-//	wtpman->pupdate = cw_msgset_set_postprocess(conn->msgset,CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST,update_cb);
-	cw_dbg(DBG_X,"SETUP COMPLETE");
-
-}
-
-
 
 struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 			     int dtlsmode, cw_Cfg_t * global_cfg)
 {
 	struct sockaddr dbgaddr;
 	socklen_t dbgaddrl;
-	int sockfd, replyfd;
+	int sockfd, replyfd, data_sockfd,data_replyfd;
 	char sock_buf[SOCK_ADDR_BUFSIZE];
 
 	struct wtpman *wtpman;
@@ -680,10 +643,13 @@ 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);
 		replyfd = socklist_find_reply_socket(srcaddr, port);
+		data_replyfd=replyfd;
 
 		if (replyfd == -1) {
 			cw_log(LOG_ERR,
@@ -694,10 +660,11 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 		}
 	} else {
 		replyfd = socklist[socklistindex].sockfd;
+		data_replyfd = socklist[socklistindex].data_sockfd;
 	}
 
 	sockfd = replyfd;	/*//socklist[socklistindex].reply_sockfd; */
-
+	data_sockfd = data_replyfd;
 
 	dbgaddrl = sizeof(dbgaddr);
 	getsockname(sockfd, &dbgaddr, &dbgaddrl);
@@ -710,11 +677,26 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 
 	wtpman->global_cfg = global_cfg;
 
-	wtpman->conn = cw_conn_create(sockfd, srcaddr, 5);
+	wtpman->conn = cw_conn_create(sockfd, srcaddr, 100);
 	if (!wtpman->conn) {
 		wtpman_destroy(wtpman);
 		return NULL;
 	}
+
+	wtpman->dconn = cw_conn_create(data_sockfd, srcaddr, 100);
+	if (!wtpman->dconn) {
+		wtpman_destroy(wtpman);
+		return NULL;
+	}
+
+
+
+
+	cw_conn_register_msg_cb(wtpman->conn,
+		CAPWAP_MSG_DISCOVERY_REQUEST,
+		discovery_cb);
+
+
 	wtpman->conn->global_cfg = global_cfg;
 	wtpman->conn->local_cfg = cw_cfg_create();
 	wtpman->wtp_cfg = cw_cfg_create();
@@ -722,24 +704,19 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 
 	wtpman->conn->role = CW_ROLE_AC;
 	wtpman->conn->data=wtpman;
+	wtpman->dconn->data=wtpman;
+
+	wtpman->conn->cfg_list[0]=wtpman->conn->update_cfg;
+	wtpman->conn->cfg_list[1]=wtpman->conn->remote_cfg;
+	wtpman->conn->cfg_list[2]=wtpman->conn->local_cfg;
+	wtpman->conn->cfg_list[3]=wtpman->conn->global_cfg;
+	wtpman->conn->cfg_list[4]=NULL;
+
 
 	wtpman->conn->data_sock = socklist[socklistindex].data_sockfd;
 	sock_copyaddr(&wtpman->conn->data_addr,
 		      (struct sockaddr *) &wtpman->conn->addr);
 
-	cw_conn_set_msg_cb(wtpman->conn,
-			CAPWAP_MSG_DISCOVERY_REQUEST,
-			discovery_cb);
-
-	cw_conn_set_msg_cb(wtpman->conn,
-			CAPWAP_MSG_JOIN_REQUEST,
-			join_cb);
-
-	cw_conn_set_msg_cb(wtpman->conn,
-			CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST,
-			update_cb);
-
-
 
 
 //	wtpman->conn->mods = conf_mods;
@@ -747,7 +724,7 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 	wtpman->conn->strict_capwap = conf_strict_capwap;
 	wtpman->conn->strict_hdr = conf_strict_headers;
 
-	wtpman->conn->setup_complete = setup_complete;
+//	wtpman->conn->setup_complete = setup_complete;
 /*
 //	wtpman->conn->radios = mbag_i_create();
 //	wtpman->conn->radios_upd = mbag_i_create();
@@ -773,15 +750,37 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 			       cmod->name, bmod->name);
 			wtpman->conn->msgset =
 			    cw_mod_get_msg_set(wtpman->conn, cmod, bmod);
+
+			wtpman->dconn->msgset=wtpman->conn->msgset;
 			wtpman->conn->detected = 1;
 			cmod->setup_cfg(wtpman->conn);
-	               if (wtpman->conn->setup_complete)
-        	                wtpman->conn->setup_complete(wtpman->conn);
+//	               if (wtpman->conn->setup_complete)
+//        	                wtpman->conn->setup_complete(wtpman->conn);
+
+
+			cw_conn_register_msg_cb(wtpman->conn,
+				CAPWAP_MSG_JOIN_REQUEST,
+				join_cb);
+
+		cw_conn_register_msg_cb(wtpman->conn,
+				CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST,
+				cfg_status_cb);
+
+		cw_conn_register_msg_cb(wtpman->conn,
+				CAPWAP_MSG_WTP_EVENT_REQUEST,
+				event_cb);
+
+/*		cw_conn_register_msg_cb(wtpman->conn,
+				CAPWAP_MSG_CHANGE_STATE_EVENT_REQUEST,
+				change_state_event_cb);*/
+
 
 
 		}
 	}
 
+
+
 	cw_dbg(DBG_X,"WTPMAN_CREATED: %p",wtpman);
 
 	return wtpman;
@@ -790,7 +789,6 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 
 void wtpman_addpacket(struct wtpman *wtpman, uint8_t * packet, int len)
 {
-//	cw_dbg(DBG_X,"ADD PACKET DETECTED %d",wtpman->conn->detected);
 	conn_q_add_packet(wtpman->conn, packet, len);
 }
 
@@ -799,5 +797,14 @@ void wtpman_start(struct wtpman *wtpman, int dtlsmode)
 	cw_dbg(DBG_INFO, "Starting wtpman, DTLS mode = %d", dtlsmode);
 	wtpman->dtlsmode = dtlsmode;
 	pthread_create(&wtpman->thread, NULL, wtpman_main, (void *) wtpman);
+	pthread_create(&wtpman->thread, NULL, wtpman_data_main, (void *) wtpman);
 	return;
 }
+
+void wtpman_datapacket(struct wtpman *wtpman, uint8_t * packet, int len)
+{
+	conn_q_add_packet(wtpman->dconn, packet, len);
+}
+
+
+

src/ac/wtpman.h

@@ -17,6 +17,7 @@ struct wtpman {
 	pthread_t thread;
 
 	struct cw_Conn *conn;
+	struct cw_Conn *dconn;
 
 
 	/* wtp data */
@@ -40,8 +41,13 @@ struct wtpman {
 
 	cw_Cfg_t * wtp_cfg;
 
+	cw_Cfg_t * discovery_cfg;
+	cw_Cfg_t * join_cfg;
+	cw_Cfg_t * config_status_cfg;
 
 
+	int update;	
+	int ctr;
 };
 
 /*
@@ -62,6 +68,7 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 extern void wtpman_addpacket(struct wtpman *wtpman, uint8_t * packet, int len);
 extern void wtpman_destroy(struct wtpman *wtpman);
 extern void wtpman_start(struct wtpman *wtpman, int dtlsmode);
+void wtpman_datapacket(struct wtpman *wtpman, uint8_t * packet, int len);
 
 
 

src/contrib/install_hostapd.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+wget https://w1.fi/releases/hostapd-2.10.tar.gz
+tar xzvf hostapd-2.10.tar.gz
+

src/cw/Makefile

@@ -6,9 +6,6 @@ CWSRC=\
 	cw.c\
 	cw_check_missing_mand.c\
 	cw_clock_lap.c\
-	cw_dbg_elem.c\
-	cw_dbg_set_level.c\
-	cw_dbg_set_level_from_str.c\
 	cw_filename.c\
 	cw_format_dump.c\
 	cw_format_pkt_hdr.c\
@@ -18,14 +15,11 @@ CWSRC=\
 	cw_in_capwap_local_ipv4_address.c\
 	cw_in_capwap_local_ipv6_address.c\
 	cw_in_generic_with_index.c\
-	cw_in_generic_struct.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\
@@ -38,7 +32,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\
@@ -63,6 +56,8 @@ CWSRC=\
 	cw_type_ipaddress.c\
 	cw_type_word.c\
 	cw_type_sysptr.c\
+	cw_type_array.c\
+	cw_type_bits.c\
 	cw_write_descriptor_subelem.c\
 	cw_write_radio_element.c\
 	cw_detect_nat.c\
@@ -77,46 +72,16 @@ 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\
+	cw_dbg_elem.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\
@@ -169,7 +134,8 @@ LOGSRC=\
 	log_errno.c\
 	log_syslog.c\
 	dbg.c\
-	dbg_strings.c\
+
+#	dbg_strings.c\
 
 MISCSRC=\
 	bstr16_create.c\
@@ -205,11 +171,11 @@ MISCSRC=\
 	msgset.c\
 	send.c\
 	strheap.c\
-	netconn.c\
 	conn.c \
 	val.c \
 	discovery.c\
 	message.c\
+	cw_out_radio_generic_struct.c\
 
 
 #	intavltree.c\
@@ -221,6 +187,7 @@ MISCSRC=\
 #	cw_put_msg.c\
 #	conn_process_packet.c\
 #	conn_destroy.c\
+	netconn.c\
 
 DTLSSRC+=\
 	dtls_bio.c\
@@ -228,7 +195,6 @@ DTLSSRC+=\
 
 
 RADIOSRC=\
-	cw_out_radio_generic_struct.c\
 	
 #	cw_in_radio_generic.c\
 #	cw_out_radio_generic.c\

src/cw/ansi_colors.h

@@ -25,4 +25,8 @@
 #define ANSI_ITALIC	"\x1b[3m"
 #define ANSI_BOLD	"\x1b[1m"
 
+
+#define ANSI_HOME	"[H"
+
+
 #endif /* __ANSI_COLORS_H */

src/cw/capwap.h

@@ -240,7 +240,7 @@
 #define CAPWAP_ELEM_ECN_SUPPORT				53
 #define CAPWAP_ELEM_IDLE_TIMEOUT			23
 #define CW_ELEM_IMAGE_DATA				24
-#define CW_ELEM_IMAGE_IDENTIFIER			25
+#define CAPWAP_ELEM_IMAGE_IDENTIFIER			25
 #define CW_ELEM_IMAGE_INFORMATION			26
 #define CW_ELEM_INITIATE_DOWNLOAD			27
 #define CAPWAP_ELEM_LOCATION_DATA			28
@@ -467,7 +467,7 @@ enum cw_reboot_failure_types {
  * WTP to the AC when the AC List is missing */
 #define CW_RESULT_MISSING_AC_LIST					1
 #define CAPWAP_RESULT_SUCCESS_NAT					2
-#define CW_RESULT_JOIN_FAILURE					3
+#define CAPWAP_RESULT_JOIN_FAILURE					3
 #define CW_RESULT_JOIN_RESOURCE_DEPLETION			4
 #define CW_RESULT_JOIN_UNKNOWN_SOURCE				5
 #define CW_RESULT_JOIN_INCORRECT_DATA				6
@@ -491,7 +491,7 @@ enum cw_reboot_failure_types {
       13 Configuration Failure (Unable to Apply Requested Configuration
          - Service Not Provided)
 */
-#define CAPWAP_RESULT_CONFIGURATION_FAILURE_SERVICE_NOT PROVIDED	13
+#define CAPWAP_RESULT_CONFIGURATION_FAILURE_SERVICE_NOT_PROVIDED	13
 /** 
  * Image Data Error (Invalid Checksum)
  */

src/cw/capwap80211.h

@@ -83,10 +83,20 @@ enum radioelems {
 	CW_ELEM80211_WTP_RADIO_CONFIGURATION=1046,
 	/** IEEE 802.11 WTP Radio Fail Alarm Indication */
 	CW_ELEM80211_WTP_RADIO_FAIL_ALARM_IDICATION=1047,
-	/** IEEE 802.11 Radio Information Message Element */
-	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/capwap_strings_elem.c

@@ -32,7 +32,7 @@ struct cw_StrListElem capwap_strings_elem[] = {
 	{CAPWAP_ELEM_ECN_SUPPORT, "ECN Support"},
 	{CAPWAP_ELEM_IDLE_TIMEOUT, "Idle Timeout"},
 	{CW_ELEM_IMAGE_DATA, "Image Data"},
-	{CW_ELEM_IMAGE_IDENTIFIER, "Image Identifier"},
+	{CAPWAP_ELEM_IMAGE_IDENTIFIER, "Image Identifier"},
 	{CW_ELEM_IMAGE_INFORMATION, "Image Information"},
 	{CW_ELEM_INITIATE_DOWNLOAD, "Initiate Download"},
 	{CAPWAP_ELEM_LOCATION_DATA, "Location Data"},

src/cw/cfg.c

@@ -80,15 +80,32 @@ 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()
 {
-	return mavl_create(cmp, del, sizeof(struct cw_Cfg_entry));
+	cw_Cfg_t * cfg;
+	cfg = malloc(sizeof(cw_Cfg_t));
+	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);
+		return NULL;
+	}
+	return cfg;
 }
 
 int cw_cfg_set(cw_Cfg_t * cfg, const char *key, const char *val)
 {
-	cw_dbg(DBG_CFG_SET, "%s: %s",key,val);
+	cw_dbg(cfg->dbg_level, "%s%s: %s",cfg->dbg_prefix,key,val);
 
 	struct cw_Cfg_entry e;
 	int replaced;
@@ -101,7 +118,7 @@ int cw_cfg_set(cw_Cfg_t * cfg, const char *key, const char *val)
 		free((void *) e.key);
 		return 0;
 	}
-	void *rc = mavl_replace(cfg, &e, &replaced);
+	void *rc = mavl_replace(cfg->cfg, &e, &replaced);
 	if (!rc) {
 		del(&e);
 		return 0;
@@ -112,11 +129,21 @@ 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;
 	e.key = key;
-	r = mavl_get(cfg, &e);
+	r = mavl_get(cfg->cfg, &e);
 	if (!r)
 		return def;
 	return r->val;
@@ -127,9 +154,8 @@ const char *cw_cfg_get_l(cw_Cfg_t ** cfg, const char * key, const char *def)
 	int i;
 	struct cw_Cfg_entry e, *r;
 	for(i=0; cfg[i]!=NULL; i++){
-//		cw_dbg(DBG_X,"GET_L IN: %p",cfg[i]);
 		e.key = key;
-		r = mavl_get(cfg[i], &e);
+		r = mavl_get(cfg[i]->cfg, &e);
 		if (r!=NULL)
 			return r->val;
 	}
@@ -149,12 +175,30 @@ bstr16_t cw_cfg_get_bstr16(cw_Cfg_t * cfg, const char * key, const char *def)
 	const char *s;
 
 	s = cw_cfg_get(cfg,key,def);
+	if(s==NULL)
+		s=def;
 	if (s==NULL)
 		return NULL;
 
 	return bstr16_create_from_str(s);
 }
 
+bstr16_t cw_cfg_get_bstr16_l(cw_Cfg_t **cfgs, const char * key, const char *def)
+{
+	bstr16_t s;
+	int i;
+
+	for(i=0; cfgs[i]!=NULL; i++){
+		s = cw_cfg_get_bstr16(cfgs[i],key,NULL);
+		if (s!=NULL)
+			return s;
+	}
+	if (def == NULL)
+		return NULL;
+	return bstr16_create_from_str(def);
+
+}
+
 int cw_cfg_set_bstr16(cw_Cfg_t * cfg, const char * key, bstr16_t str)
 {
 	CW_TYPE_BSTR16->read(cfg,key,bstr16_data(str),bstr16_len(str),NULL);
@@ -167,7 +211,7 @@ void cw_cfg_dump(cw_Cfg_t * cfg)
 {
 	mavliter_t it;
 	struct cw_Cfg_entry *e;
-	mavliter_init(&it, cfg);
+	mavliter_init(&it, cfg->cfg);
 	mavliter_foreach(&it) {
 
 		e = mavliter_get(&it);
@@ -176,6 +220,27 @@ void cw_cfg_dump(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;
+	mavliter_init(&it, cfg->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);
+	}
+}
+
+
+
 
 struct parser {
 	int line;
@@ -463,6 +528,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);
 
@@ -471,11 +537,26 @@ int cw_cfg_load(const char *filename, cw_Cfg_t * cfg)
 	return errno;
 }
 
+int cw_cfg_read_from_string(const char *str, cw_Cfg_t *cfg)
+{
+	int errs;
+	FILE * f = fmemopen((void*)str,strlen(str),"rb");
+	if(!f)
+		return errno;
+	errs = cw_cfg_read_from_file(f, cfg);
+	fclose(f);
+
+	if (errs)
+		errno = EINVAL;
+	return errno;
+
+}
+
 int cw_cfg_write_to_file(FILE *f, cw_Cfg_t * cfg)
 {
 	mavliter_t it;
 	struct cw_Cfg_entry *e;
-	mavliter_init(&it, cfg);
+	mavliter_init(&it, cfg->cfg);
 	mavliter_foreach(&it) {
 		int n;
 		e = mavliter_get(&it);
@@ -519,7 +600,12 @@ void cw_cfg_iter_init(cw_Cfg_t * cfg, struct cw_Cfg_iter *cfi, const char *base)
 	struct cw_Cfg_entry search;
 	search.key = base;
 
-	mavliter_init(&(cfi->it), cfg);
+	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;
 }
@@ -529,16 +615,16 @@ 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;
-
+//	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;
 
@@ -551,16 +637,19 @@ struct cw_Cfg_entry *cw_cfg_iter_next(struct cw_Cfg_iter *cfi, const char *nnkey
 		}
 
 	}
-	d = strchr(e->key, '.');
-	if (d == NULL)
+
+	if (e->key[bl]!='.' && e->key[bl]!='/')
 		return NULL;
 
-	if (d - e->key != bl)
+/*	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;
 }
@@ -576,7 +665,13 @@ int cw_cfg_get_bool(cw_Cfg_t * cfg, const char * key, int def)
 	return v.val.boolean;
 }
 
+/*
+int cw_cfg_set_bool(cw_Cfg_t * cfg, const char * key, int val)
+{
+	return cw_cfg_set(cfg,key,val ? "true":"false");
+}
 
+*/
 uint8_t cw_cfg_get_byte(cw_Cfg_t * cfg, char *key, uint8_t def)
 {
 	struct cw_Val v;
@@ -599,9 +694,17 @@ uint8_t cw_cfg_get_byte_l(cw_Cfg_t ** cfgs, char *key, uint8_t def)
 	return v.val.byte;
 }
 
+int cw_cfg_get_int(cw_Cfg_t * cfg, const char *key, int def)
+{
+	const char *s = cw_cfg_get(cfg,key,NULL);
+	if (s==NULL)
+		return def;
+	return atoi(s);
+}
 
 
-uint16_t cw_cfg_get_word(cw_Cfg_t * cfg, char *key, uint16_t def)
+
+uint16_t cw_cfg_get_word(cw_Cfg_t * cfg, const char *key, uint16_t def)
 {
 	struct cw_Val v;
 	const char *s = cw_cfg_get(cfg,key,NULL);
@@ -611,6 +714,18 @@ uint16_t cw_cfg_get_word(cw_Cfg_t * cfg, char *key, uint16_t def)
 	return v.val.word;
 }
 
+uint16_t cw_cfg_get_word_l(cw_Cfg_t ** cfg, const char *key, uint16_t def)
+{
+	struct cw_Val v;
+	const char *s = cw_cfg_get_l(cfg,key,NULL);
+	if (s==NULL)
+		return def;
+	CW_TYPE_WORD->from_str(&v,s);
+	return v.val.word;
+}
+
+
+
 /*
 int cw_cfg_get_word(cw_Cfg_t * cfg, char *key, const char * def)
 {
@@ -630,8 +745,7 @@ void cw_cfg_set_int(cw_Cfg_t * cfg, const char * key, int val)
 }
 
 
-
-int cw_cfg_get_next_index(cw_Cfg_t * cfg, const char *key)
+int cw_cfg_get_new_index(cw_Cfg_t * cfg, const char *key)
 {
 	char ikey[CW_CFG_MAX_KEY_LEN];
 	struct cw_Cfg_entry search, * result;
@@ -642,12 +756,12 @@ int cw_cfg_get_next_index(cw_Cfg_t * cfg, const char *key)
 	search.key=ikey;
 	/*//result = ktvn(ktv,&search);*/
 	
-	result = mavl_get_last(cfg,&search);
+	result = mavl_get_last(cfg->cfg,&search);
 	if (result == NULL){
 		return 0;
 	}
 	
-	d = strchr(result->key,'.');
+	d = strrchr(result->key,'.');
 	if (d==NULL){
 		return 0;
 	}
@@ -658,6 +772,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;
@@ -684,10 +838,10 @@ int cw_cfg_set_val(cw_Cfg_t * cfg, const char *key, const struct cw_Type *type,
 
 
 
-void cw_cfg_copy(cw_Cfg_t *src, cw_Cfg_t *dst)
+void cw_cfg_copy(cw_Cfg_t *src, cw_Cfg_t *dst,int dbg_level,const char *dbg_prefix)
 {
 	mavliter_t it;
-	mavliter_init(&it, src);
+	mavliter_init(&it, src->cfg);
 	mavliter_foreach(&it) {
 		int exists;
 		struct cw_Cfg_entry * old_elem,*e, new_elem;
@@ -705,7 +859,7 @@ void cw_cfg_copy(cw_Cfg_t *src, cw_Cfg_t *dst)
 */
 
 
-		old_elem = mavl_insert(dst,&new_elem,&exists);
+		old_elem = mavl_insert(dst->cfg,&new_elem,&exists);
 
 /*		cw_dbg(DBG_X, "CPY: %s: %s -> %s [%d]",new_elem.key,new_elem.val,old_elem->val,exists);
 		if (exists){
@@ -716,9 +870,7 @@ void cw_cfg_copy(cw_Cfg_t *src, cw_Cfg_t *dst)
 */
 		
 		if (!exists){
-
-
-			cw_dbg(DBG_CFG_SET, "New: %s: %s",new_elem.key,new_elem.val);
+			cw_dbg(dbg_level, "%s: [undef] -> %s",new_elem.key,new_elem.val);
 			continue;
 		}
 
@@ -730,11 +882,12 @@ void cw_cfg_copy(cw_Cfg_t *src, cw_Cfg_t *dst)
 			continue;
 		}
 
-		cw_dbg(DBG_CFG_SET, "Replace: %s: %s (old: %s)",new_elem.key, new_elem.val, old_elem->val);
-		if(dst->del){
-			dst->del(old_elem);
+		cw_dbg(dbg_level, "%s: %s -> %s",new_elem.key,old_elem->val,new_elem.val);
+//		cw_dbg(DBG_X, "Replace: %s: %s (old: %s)",new_elem.key, new_elem.val, old_elem->val);
+		if(dst->cfg->del){
+			dst->cfg->del(old_elem);
 		}
-		memcpy(old_elem,&new_elem,dst->data_size);
+		memcpy(old_elem,&new_elem,dst->cfg->data_size);
 	}
 
 }
@@ -742,35 +895,58 @@ void cw_cfg_copy(cw_Cfg_t *src, cw_Cfg_t *dst)
 
 void cw_cfg_destroy(cw_Cfg_t *cfg)
 {
-	mavl_destroy(cfg);
+	if (cfg->cfg)
+		mavl_destroy(cfg->cfg);
+	free(cfg);
 }
 
 
 void cw_cfg_clear(cw_Cfg_t *cfg)
 {
-	mavl_del_all(cfg);
+	mavl_del_all(cfg->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);
-        e.key=key;
-        result = mavl_get_first(cfg,&e);
-        if (result == NULL)
-                return 0;
-//cw_dbg(DBG_X,"BASEXXX: %s",result->key);
+	int rl,kl;
+	char skey[CW_CFG_MAX_KEY_LEN];
+	char * delimiters = "/.";
+	char * d;
 
-	if (strlen(result->key)<strlen(key))
-		return 0;		
-//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)
+	/* can we find the base exactly ?*/
+	if (cw_cfg_get(cfg,key,NULL)!=NULL)
 		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,9 +5,46 @@
 #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	
 
-typedef struct mavl cw_Cfg_t;
+/** Default name for fresh cfg's created by #cw_cfg_create */ 
+#define CW_CFG_DEFAULT_NAME "[anonymous]"
+
+
+/**
+ * A Cfg object 
+ */
+struct cw_Cfg {
+	struct mavl * cfg;	/**< The AVL-tree containig the keys 
+				     and vals */
+	const char *name;	/**< A name for this config object */
+	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);
@@ -15,11 +52,6 @@ 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;
@@ -32,14 +64,14 @@ struct cw_Cfg_entry *cw_cfg_iter_next(struct cw_Cfg_iter *cfi, const char *key);
 void cw_cfg_iter_init(cw_Cfg_t * cfg, struct cw_Cfg_iter *cfi, const char *base);
 
 int cw_cfg_get_bool(cw_Cfg_t * cfg, const char * key, int def);
-uint16_t cw_cfg_get_word(cw_Cfg_t * cfg, char *key, uint16_t def);
+uint16_t cw_cfg_get_word(cw_Cfg_t * cfg, const char *key, uint16_t def);
 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);
+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);
 void cw_cfg_clear(cw_Cfg_t *cfg);
 int cw_cfg_base_exists(cw_Cfg_t * cfg, const char *key);
@@ -48,12 +80,24 @@ cw_Val_t * cw_cfg_get_val_l(cw_Cfg_t ** cfgs, const char *key, const struct cw_T
 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, const char *filter);
 
+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);
 
+int cw_cfg_get_int(cw_Cfg_t * cfg, const char *key, int def);
+int cw_cfg_write_to_file(FILE *f, cw_Cfg_t * cfg);
+
+#define cw_cfg_set_bool(cfg,key,val) \
+		cw_cfg_set(cfg,key,(val) ? "true":"false")
 
 
 int cw_cfg_set_val(cw_Cfg_t * cfg, const char *key, const struct cw_Type *t, const void * valguard, const uint8_t * data, int len);
+bstr16_t cw_cfg_get_bstr16_l(cw_Cfg_t **cfgs, const char * key, const char *def);
 
 #define cw_cfg_get_word2(cfg1,cfg2,key,def) \
 	cw_cfg_get_word(cfg1,key,cw_cfg_get_word(cfg2,key,def))
@@ -64,3 +108,6 @@ int cw_cfg_set_val(cw_Cfg_t * cfg, const char *key, const struct cw_Type *t, con
 
 #endif
 
+
+/**@}*/
+

src/cw/conn.c

@@ -24,11 +24,12 @@
 
 #include "dtls.h"
 
-
+#define MAX_MSG_CBS 5
 
 struct msg_callback{
 	int type; 			/**< message type */
-	cw_MsgCallbackFun fun;
+	struct cw_MsgCb_data data[MAX_MSG_CBS];
+	int count;
 };
 
 int msg_callback_cmp(const void *v1,const void *v2)
@@ -61,19 +62,56 @@ void cw_conn_init(struct cw_Conn * conn)
 	conn->update_cfg = cw_cfg_create();
 	conn->remote_cfg = cw_cfg_create();
 	conn->local_cfg = cw_cfg_create();
+	conn->cfg_list[0]=NULL;
+
+	conn->remote_addr[0]=0;
 }
 
-int cw_conn_set_msg_cb(struct cw_Conn *conn, int type, cw_MsgCallbackFun fun)
+
+/**
+ * Register a message callback function. 
+ * @param conn the connection the registered cb functions belongs to
+ * @param type The associated msg type. Whenever a message of this type is 
+ *             received, the callback function will be called
+ * @param fun  A pinter to the callback function          
+ *
+ */
+int cw_conn_register_msg_cb(struct cw_Conn *conn, int type, cw_MsgCallbackFun fun)
 {
-	struct msg_callback cb;
+	struct msg_callback cb, *result;
 	int exists;
 
 	cb.type = type;
-	cb.fun = fun;
-	mavl_insert(conn->msg_callbacks,&cb,&exists);
+	cb.data[0].fun = fun;
+	cb.data[0].parent = NULL;
+	cb.count = 0;
+
+
+	result = mavl_insert(conn->msg_callbacks,&cb,&exists);
+
+	cw_dbg(DBG_X, "Registering msg callback: %d %p",type,result);
+
+	if (result==NULL)
+		return 0;
+
+	if (exists){
+		if (result->count>=MAX_MSG_CBS){
+			cw_log(LOG_ERROR,"Too many msg callback registrations for msg id %d",type);
+			return 0;
+		}
+		result->count++;
+		result->data[result->count].fun=fun;
+		result->data[result->count].parent=&(result->data[result->count-1]);
+		cw_dbg(DBG_X,"The result exists: %p %p %d %p",result,&cb,result->count,
+				result->data[result->count].parent
+				);
+		
+	}
+
 	return 1;
 }
 
+/*
 cw_MsgCallbackFun cw_conn_get_msg_cb(struct cw_Conn *conn, int type)
 {
 	struct msg_callback cb,*result;
@@ -82,8 +120,22 @@ cw_MsgCallbackFun cw_conn_get_msg_cb(struct cw_Conn *conn, int type)
 	if (result == NULL)
 		return NULL;
 	return result->fun;
+}*/
+
+
+int cw_conn_run_msg_cbs(struct cw_Conn * conn, int type, struct cw_ElemHandlerParams *params)
+{
+	struct msg_callback cb,*result;
+	cb.type=type;
+	result = mavl_get(conn->msg_callbacks,&cb);
+	if (result == NULL)
+		return -1;
+	return result->data[result->count].fun(params,&(result->data[result->count]));
+
 }
 
+
+
 /**
  * Create a conn object
  * @param sock a socket
@@ -105,8 +157,10 @@ struct cw_Conn * cw_conn_create(int sock, struct sockaddr * addr, int qsize)
 
 	conn->sock=sock;
 
-	if (addr)
+	if (addr){
 		sock_copyaddr(&conn->addr,addr);
+		sock_addr2str_p(addr, conn->remote_addr);	
+	}
 
 
 	conn->fragman = fragman_create();
@@ -139,7 +193,7 @@ struct cw_Conn * cw_conn_create(int sock, struct sockaddr * addr, int qsize)
 /*	conn->send_data_packet = conn_send_data_packet;*/
 
 	conn->last_seqnum_received=-1;
-	conn->mtu=600;
+	conn->mtu=1480;
 
 
 	conn->cur_packet=0;
@@ -149,7 +203,7 @@ struct cw_Conn * cw_conn_create(int sock, struct sockaddr * addr, int qsize)
 	conn->write = conn->send_packet;
 	conn->read = conn->recv_packet;
 
-	conn->dtls_mtu = 600;
+	conn->dtls_mtu = 1480;
 
 
 
@@ -349,7 +403,8 @@ static int process_elements(struct cw_Conn *conn, uint8_t * rawmsg, int len,
 
 	/* pre-check message */
 	if (payloadlen - 8 != elems_len) {
-
+//printf ("The elems_len is %d\n",elems_len);
+//printf ("The len = %d\n",len);
 		if (conn->strict_hdr) {
 			cw_dbg(DBG_MSG_ERR,
 			       "Discarding message from %s, msgelems len=%d, payload len=%d, (Strict CAPWAP) ",
@@ -365,7 +420,7 @@ static int process_elements(struct cw_Conn *conn, uint8_t * rawmsg, int len,
 			       "Packet from from %s has %d bytes of extra data, ignoring.",
 			       sock_addr2str(&conn->addr, sock_buf),
 			       payloadlen - 8 - elems_len);
-			elems_len = len - 8;
+			//elems_len = len - 8;
 		}
 
 		if (elems_len > payloadlen - 8) {
@@ -474,9 +529,10 @@ static int process_elements(struct cw_Conn *conn, uint8_t * rawmsg, int len,
 
 	elems_ptr = cw_get_msg_elems_ptr(msg_ptr);
 
-
-	cw_dbg(DBG_MSG_PARSING, "*** Parsing message of type %d - (%s) ***",
+/*	if (cw_dbg_is_level(DBG_ELEM_IN)){
+		cw_dbg(DBG_MSG_PARSING, "Parsing message of type %d - (%s)",
 		       message->type, message->name);
+	}*/
 
 	memset(&params,0,sizeof(struct cw_ElemHandlerParams));
 	
@@ -484,15 +540,16 @@ static int process_elements(struct cw_Conn *conn, uint8_t * rawmsg, int len,
 	params.unrecognized = mlist_create(NULL, NULL, sizeof(uint8_t *));
 
 	params.cfg = cw_cfg_create();
-	params.cfg_list[0]=params.cfg;
-	params.cfg_list[1]=conn->local_cfg;
-	params.cfg_list[2]=conn->global_cfg;
-	params.cfg_list[3]=NULL;
+	params.cfg->dbg_level = DBG_ELEM_DETAIL_IN;
+	params.cfg->dbg_prefix = "    ";
+
+	params.cfg_list=conn->cfg_list;
 
 	params.from = from;
 	params.msgdata = message;
 	params.msgset=conn->msgset;
 	params.conn = conn;
+	params.dbg_level = DBG_ELEM_IN;
 
 	cw_decode_elements(&params,elems_ptr, elems_len);
 
@@ -502,8 +559,8 @@ static int process_elements(struct cw_Conn *conn, uint8_t * rawmsg, int len,
 	if (params.mand_found)
 		cw_check_missing_mand(message, params.mand_found,conn->msgset->handlers_by_key);
 
-	cw_dbg(DBG_MSG_PARSING, "*** End parsing message of type %d (%s) ***",
-	       message->type, message->name);
+//	cw_dbg(DBG_MSG_PARSING, "*** End parsing message of type %d (%s) ***",
+//	       message->type, message->name);
 
 	if (params.mand_found)
 		mavl_destroy(params.mand_found);
@@ -512,12 +569,12 @@ static int process_elements(struct cw_Conn *conn, uint8_t * rawmsg, int len,
 		message->postprocess(&params,elems_ptr, elems_len);
 	}
 
-	cw_MsgCallbackFun cb_fun = cw_conn_get_msg_cb(conn,message->type);
-	if (cb_fun != NULL){
-		result_code = cb_fun(&params,elems_ptr, elems_len);
-	}
-	else{
+	result_code = cw_conn_run_msg_cbs(conn,message->type,&params);
+
+//	cw_MsgCallbackFun cb_fun = cw_conn_get_msg_cb(conn,message->type);
+	if (result_code==-1){
 		cw_cfg_clear(conn->update_cfg);
+		result_code=0;
 	}
 
 //	conn->remote_cfg=params.cfg;
@@ -530,7 +587,7 @@ static int process_elements(struct cw_Conn *conn, uint8_t * rawmsg, int len,
 
 			cw_send_error_response(conn, rawmsg, result_code);
 		} else if (result_code == 0) {
-			cw_cfg_set_int(conn->update_cfg, "result-code",
+			cw_cfg_set_int(conn->update_cfg, "capwap/result-code",
 					 result_code);
 			if (ui->next) {
 				conn->capwap_prevstate = conn->capwap_state;
@@ -550,7 +607,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);
@@ -709,24 +765,22 @@ int conn_process_packet2(struct cw_Conn *conn, uint8_t * packet, int len,
 
 	if (cw_get_hdr_flag_f(packet)) {
 		/* fragmented, add the packet to fragman */
-		uint8_t *f;
+		uint8_t *f,*fp;
 		int rc;
 
-		f = fragman_add(conn->fragman, packet, offs, payloadlen);
-		if (f == NULL) {
+		fp = fragman_add(conn->fragman, packet, offs, payloadlen);
+		if (fp == NULL) {
 			errno = EAGAIN;
 			return -1;
 		}
 
+		f =fp+MAX_PKT_HDR_LEN;
 
-		cw_dbg_pkt(DBG_PKT_IN, conn, f + 4, *(uint32_t *) f, from);
-/*//		cw_dbg_msg(DBG_MSG_IN, conn, f + 4, *(uint32_t *) f, from);*/
-
-/*		// XXX: Modify fragman to not throw away CAPWAP headers*/
+		cw_dbg_pkt(DBG_PKT_IN, conn, fp, *(uint32_t *) f+MAX_PKT_HDR_LEN, from);
 
 		rc = conn->process_message(conn, f + 4, *(uint32_t *) f, from);
 
-		free(f);
+		free(fp);
 		return rc;
 	}
 

src/cw/conn.h

@@ -58,6 +58,8 @@ struct cw_action_in;
 struct cw_Conn {
 	int sock;
 	struct sockaddr_storage addr;
+	char remote_addr[64];	/* Contains a printfable string, of the connections
+				   peer address */
 
 	struct connlist * connlist;
 
@@ -71,21 +73,23 @@ struct cw_Conn {
 	int recv_timeout;
 
 
-	cw_Cfg_t * global_cfg;	/**< This should set the global cfg of the program
+	cw_Cfg_t * global_cfg;	/**< This should set to the global cfg of the program
 				     which is using this conn object.
 				     Teh global_cfg has to be treated read-only. */
 
 	cw_Cfg_t * local_cfg;	/**< local_cfg contains overrides for global_cfg 
-				     wich are related to this conn object. */
+				     wich are related to this conniection. */
 	
-	mavl_t remote_cfg;	/**< contains the configuration we now from the 
+	cw_Cfg_t * remote_cfg;	/**< contains the configuration we now from the 
 				     device this conn object ist connected to.
 				     Typically this is what we have got from discovery
 				     response or join response in WTP mode. 
-				     And in AC mode this contains date receive from 
-				     configuration status request.  */
+				     And in AC mode this contains datia received by 
+				     configuration status and join request.  */
 
-	mavl_t update_cfg;
+	cw_Cfg_t * update_cfg;
+
+	cw_Cfg_t * cfg_list[10];
 	
 	bstr16_t session_id;
 
@@ -309,7 +313,18 @@ int conn_send_msg(struct cw_Conn *conn, uint8_t * rawmsg);
 void conn_clear_upd(struct cw_Conn*conn, int merge);
 
 
-int cw_conn_set_msg_cb(struct cw_Conn *conn, int type, cw_MsgCallbackFun fun);
+
+struct cw_MsgCb_data;
+//typedef int (*cw_MsgCallbackFun)(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len, 
+//		struct cw_MsgCb_data *d);
+typedef int (*cw_MsgCallbackFun)(struct cw_ElemHandlerParams * params, struct cw_MsgCb_data *d);
+
+struct cw_MsgCb_data{
+	cw_MsgCallbackFun fun;
+	struct cw_MsgCb_data * parent;
+};
+
+int cw_conn_register_msg_cb(struct cw_Conn *conn, int type, cw_MsgCallbackFun fun);
 cw_MsgCallbackFun cw_conn_get_msg_cb(struct cw_Conn *conn, int type);
 
 int cw_decode_element(struct cw_ElemHandlerParams *params, int proto,

src/cw/conn_q_add_packet.c

@@ -42,7 +42,6 @@ void conn_q_add_packet(struct cw_Conn * conn,uint8_t *packet,int len)
 	conn->q[qwpos]=malloc(len+4);
 	if (conn->q[qwpos]==NULL)
 		return;
-	
 	*((uint32_t*)(conn->q[qwpos]))=len;
 	memcpy(conn->q[qwpos]+4,packet,len);	
 	conn->qwpos=qwpos+1;

src/cw/conn_recv_packet.c

@@ -29,6 +29,7 @@
 
 int conn_recv_packet_(struct cw_Conn *conn, uint8_t * buf, int len, int flags)
 {
+	printf("conn_recv\n");
 	int n;
 	while ((n = recv(conn->sock, (char *) buf, len, flags)) < 0) {
 		if (errno != EINTR) {

src/cw/conn_send_msg.c

@@ -14,12 +14,49 @@ int conn_send_msg(struct cw_Conn * conn, uint8_t *rawmsg)
 	packetlen = cw_get_hdr_msg_total_len(rawmsg);
 
 	cw_dbg_msg(DBG_MSG_OUT, conn,rawmsg, packetlen,(struct sockaddr*)&conn->addr);
+	{
+	int type;
+	uint8_t *msgptr;
+	msgptr = rawmsg + cw_get_hdr_msg_offset(rawmsg);
+	struct cw_MsgData * msg;
+	type = cw_get_msg_type(msgptr);
+	msg = cw_msgset_get_msgdata(conn->msgset,type);
+	uint8_t *elems_ptr;
+
+	int offset = cw_get_hdr_msg_offset(rawmsg);
+
+	uint8_t *msg_ptr = rawmsg + offset;
+	int elems_len = cw_get_msg_elems_len(msg_ptr);
+	elems_ptr = cw_get_msg_elems_ptr(msg_ptr);
+	cw_Cfg_t * cfg = cw_cfg_create();
+	cfg->dbg_level = DBG_ELEM_DETAIL_OUT;
+	cfg->dbg_prefix = "    ";
+
+	struct cw_ElemHandlerParams params;
+	memset(&params,0,sizeof(struct cw_ElemHandlerParams));
+	
+	params.cfg=cfg;
+	params.msgset=conn->msgset;
+	params.msgdata=msg;
+	params.mand_found = mavl_create_conststr();
+	params.dbg_level = DBG_ELEM_OUT;
+
+	cw_decode_elements( &params, elems_ptr,elems_len);
+	cw_cfg_destroy(cfg);
+	if (params.mand_found){
+		cw_check_missing_mand(msg, params.mand_found,conn->msgset->handlers_by_key);
+		mavl_destroy(params.mand_found);
+	}
+
+	}
 
 
-	/* Zyxel doesn't count msg element length from
-	   behind seqnum */
+
+
+	//  Zyxel doesn't count msg element length from
+//	   behind seqnum * /
 //	if (conn->capwap_mode == CW_MODE_ZYXEL){
-/*		// XXX val-=3; */
+// *		// XXX val-=3; * /
 //	}
 
 
@@ -38,7 +75,7 @@ mtu = 9440;
 	 int offset = cw_get_hdr_msg_offset(rawmsg);
 	return cw_send_msg(conn,rawmsg+offset);
 
-
+/*
 	if (packetlen>mtu){
 		cw_set_hdr_flags(ptr,CAPWAP_FLAG_HDR_F,1);
 		cw_set_dword(ptr+4, conn->fragid<<16 | fragoffset<<3 );
@@ -85,6 +122,6 @@ mtu = 9440;
 
 	cw_dbg_pkt(DBG_PKT_OUT,conn,ptr,packetlen,(struct sockaddr*)&conn->addr);
 
-	return conn->write(conn,ptr,packetlen-0);
+	return conn->write(conn,ptr,packetlen-0); */
 }
 

src/cw/cw.c

@@ -1,6 +1,7 @@
 #include "cw.h"
 #include "log.h"
 #include "dbg.h"
+#include "keys.h"
 
 int cw_in_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params,
 		uint8_t * elem_data, int elem_len)
@@ -10,7 +11,7 @@ int cw_in_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams *
 	char mkey[CW_CFG_MAX_KEY_LEN];
 	const char *key;
 
-
+//	cw_dbg(DBG_X,"HK: %s",handler->key,);
 
 	if (!type){
 		cw_log(LOG_ERR,"Can't handle element: %s, no type defined",handler->name);
@@ -24,21 +25,16 @@ int cw_in_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams *
 	else{
 		key = handler->key;
 	}
-
-
-	
-
-/*	cw_dbg(DBG_X, "READ: %s / %s",type->name,key);*/
+//	cw_dbg(DBG_X, "READ: %s / %s",type->name,key);
 	type->read(params->cfg, key,elem_data,elem_len,handler->param);
 	return CAPWAP_RESULT_SUCCESS;
 }
 
 
 
-int cw_out_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
-			, uint8_t * dst)
+int cw_out_generic0(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
+			, 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);
@@ -46,10 +42,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) {
@@ -61,7 +70,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{
@@ -78,6 +87,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);
 }
 
 
@@ -117,13 +135,48 @@ int cw_out_radio_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerP
 	int radios;
 	len =0;
 
-	radios = cw_cfg_get_byte_l(params->cfg_list,"wtp-descriptor/max-radios",0);
+	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++){
 
 		type = (struct cw_Type*)handler->type;
 		start = params->msgset->header_len(handler)+len;
 
 		sprintf(key,"radio.%d/%s",i,handler->key);
+//printf("RADIO KEY: %s\n",key);
+		
 //		cw_dbg(DBG_X,"KEY: %s",key);
 
 		l = type->write(params->cfg_list, key,dst+start+1,handler->param);
@@ -156,3 +209,259 @@ int cw_header_len(struct cw_ElemHandler * handler)
 }
 
 
+
+/**
+ * Put the "status part" of an an AC Descriptor to memory
+ * @param cfg_list Cfg list to read status from
+ * @param dst Where to put the status to
+ * @param parent_key prefix to each key
+ */
+int 
+cw_put_ac_status(uint8_t *dst, cw_Cfg_t ** cfg_list, const char * parent_key){
+
+	uint8_t *d = dst;
+	
+	char key[CW_CFG_MAX_KEY_LEN];
+	
+	/* put statiosn */
+	sprintf(key,"%s/%s",parent_key,"stations");
+	d += cw_put_word(d,cw_cfg_get_word_l(cfg_list,key,0));
+
+	/* put station limit */
+	sprintf(key,"%s/%s",parent_key,"station-limit");
+	d += cw_put_word(d,cw_cfg_get_word_l(cfg_list,key,0));
+
+	/* Put number of active WTPs */
+	sprintf(key,"%s/%s",parent_key,"active-wtps");
+	d += cw_put_word(d,cw_cfg_get_word_l(cfg_list,key,0));
+
+	/* Put max WTPs */
+	sprintf(key,"%s/%s",parent_key,"max-wtps");
+	d += cw_put_word(d,cw_cfg_get_word_l(cfg_list,key,0));
+
+	/* Put security flags */	
+	sprintf(key,"%s/%s",parent_key,"security");
+	d += cw_put_byte(d,cw_cfg_get_byte_l(cfg_list,key,0));
+
+	/* Put rmac-filed */
+	sprintf(key,"%s/%s",parent_key,"rmac-field");
+	d += cw_put_byte(d,cw_cfg_get_byte_l(cfg_list,key,0));
+	
+	/* reserved field, must be zero - RFC5415 */
+	d += cw_put_byte(d,0); 
+
+	sprintf(key,"%s/%s",parent_key,"dtls-policy");
+	d += cw_put_byte(d,cw_cfg_get_byte_l(cfg_list,key,0));
+
+	return d - dst;
+}
+
+/** 
+ * Put a descripter sub element like harware vendor/version etc.
+ * Used when putting AC Descriptors or WTP Descriptors
+ * @param dst Where to write to
+ * @param cfg_list list of cfgs
+ * @subelem_id Id of subelement
+ * @parent_key parent key
+ */
+int 
+cw_put_descriptor_subelem (uint8_t *dst, cw_Cfg_t ** cfg_list,
+                                 int subelem_id, const char * parent_key )
+{
+	char key[256];
+	uint32_t vendor;
+	//bstr16_t version;
+	const char *vendor_s;
+
+	uint8_t *d;
+
+
+	/*        d += cw_put_dword(d, bstrv_get_vendor_id(v));
+	d += cw_put_dword(d, (subelem_id << 16) | bstrv_len(v));
+	d += cw_put_data(d, bstrv_data(v), bstrv_len(v));
+	*/
+	sprintf (key, "%s/%s", parent_key, CW_SKEY_VENDOR);
+	vendor_s = cw_cfg_get_l (cfg_list, key, NULL);
+	
+	if (vendor_s == NULL) {
+		cw_log (LOG_ERR, "Can't put subelem %s, no value of type Dword found.", key);
+		return 0;
+	}
+
+	vendor = atoi(vendor_s);	
+
+
+
+	sprintf (key, "%s/%s", parent_key, CW_SKEY_VERSION);
+	cw_Val_t * val = cw_cfg_get_val_l(cfg_list, key, CW_TYPE_BSTR16);
+
+	//version = cw_cfg_get_bstr16 (cfg, key, NULL);
+
+
+	if (val == NULL) {
+		cw_log (LOG_ERR, "Can't put subelem %s, no value of type Bstr16 found.", key);
+		return 0;
+	}
+	
+	d = dst;
+	
+	/* put vendor */
+	d += cw_put_dword(d, vendor); //->type->put (vendor, d);
+	
+	/* put version */
+	
+	d += cw_put_dword (d, (subelem_id << 16) | val->type->len(val));
+//	d += cw_put_bstr16(d, version);
+	d += val->type->put(val,d);
+
+	cw_val_destroy(val);
+
+//	free(version);
+	
+	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

@@ -146,8 +146,10 @@
 
 
 int cw_get_hdr_ws_len(uint8_t * th);
-uint8_t *cw_get_hdr_ws_data(uint8_t * th);
+int cw_get_hdr_ws_len_7(uint8_t * th);
 
+uint8_t *cw_get_hdr_ws_data(uint8_t * th);
+#define cw_get_hdr_ws_data_7(th) (cw_get_hdr_ws_data(th)+1)
 
 
 #define cw_get_hdr_msg_offset(th) (4*cw_get_hdr_hlen(th))
@@ -217,7 +219,7 @@ void cw_set_hdr_rid(uint8_t * th, int rid);
  * @see #cw_is_request
  */
 
-#define cw_is_response(msg_id) (!is_response(msg_id))
+#define cw_is_response(msg_id) (!cw_is_resquest(msg_id))
 
 
 uint8_t *cw_get_hdr_msg_elems_ptr(uint8_t * m);
@@ -353,7 +355,7 @@ int cw_check_missing_mand(struct cw_MsgData *msgdata, mavl_t keys, mavl_t handle
 
 
 
-extern int cw_read_descriptor_subelems(mavl_t store, const char * key, uint8_t * data, int len,
+extern int cw_read_descriptor_subelems(cw_Cfg_t * store, const char * key, uint8_t * data, int len,
 				       struct cw_DescriptorSubelemDef *elems);
 
 /*
@@ -362,7 +364,7 @@ int cw_read_wtp_descriptor(mavl_t mbag, struct cw_Conn *conn,
 				  struct cw_DescriptorSubelemDef *allowed);
 */
 
-int cw_read_wtp_descriptor(mavl_t mbag, struct cw_Conn *conn,
+int cw_read_wtp_descriptor(cw_Cfg_t * mbag, struct cw_Conn *conn,
 			   struct cw_ElemHandler *eh, uint8_t * data, int len,
 			   struct cw_DescriptorSubelemDef *allowed);
 
@@ -373,19 +375,19 @@ int cw_write_radio_element(struct cw_ElemHandler * handler, struct cw_ElemHandle
 			 uint8_t * dst);
 			
 
-extern int cw_read_wtp_descriptor_7(mavl_t mbag, struct cw_Conn *conn,
+extern int cw_read_wtp_descriptor_7(cw_Cfg_t * cfg, struct cw_Conn *conn,
 				    struct cw_ElemHandler *eh, uint8_t * data, int len,
 				    struct cw_DescriptorSubelemDef *allowed);
 
 
-int cw_read_ac_descriptor(mavl_t store,
+int cw_read_ac_descriptor(cw_Cfg_t * store,
 			   struct cw_ElemHandler *eh,
 			   struct cw_ElemHandlerParams * params,
 			   uint8_t *data, int len, 
 			struct cw_DescriptorSubelemDef *allowed);
 
 
-int cw_setup_dtls(struct cw_Conn * conn, mavl_t cfg, const char *prefix, char  * default_cipher);
+int cw_setup_dtls(struct cw_Conn * conn, cw_Cfg_t * cfg, const char *prefix, char  * default_cipher);
 
 
 
@@ -552,6 +554,23 @@ int cw_write_header(struct cw_ElemHandler * handler, uint8_t * dst, int len);
 int cw_header_len(struct cw_ElemHandler * handler);
 
 int cw_compose_message(struct cw_Conn *conn, uint8_t * rawout);
+int cw_put_ac_status(uint8_t *dst, cw_Cfg_t ** cfg_list, const char * parent_key);
+int cw_put_descriptor_subelem (uint8_t *dst, cw_Cfg_t ** cfg_list,
+                                 int subelem_id, const char * parent_key );
+
+
+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);
+int cw_out_generic0(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
+			, uint8_t * dst,const char *key);
+
+
+
+
+int cw_init_capwap_packet( uint8_t * buf, int wbid ,int rid, bstr_t rmac, bstr_t wd);
+int cw_send_capwap_packet(struct cw_Conn * conn, uint8_t * buf, int hlen, uint8_t * data, int len);
+
 
 
 /**

src/cw/cw_80211.h

@@ -1,12 +0,0 @@
-#ifndef __CW_80211_H
-#define __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 cw_read_80211_mac_operation(uint8_t *data,mbag_t r);
-*/
-
-#endif

src/cw/cw_check_missing_mand.c

@@ -10,6 +10,9 @@ int cw_check_missing_mand(struct cw_MsgData *msgdata, mavl_t keys, mavl_t handle
 	mlist_t missing;
 	int count;
 
+	if (msgdata==NULL)
+		return 0;
+	
 	missing = mlist_create_conststr();
 	if (missing==NULL){
 		cw_log(LOG_ERR, "Can't allocate memory for check of missing mand elems: %s", strerror(errno));

src/cw/cw_dbg_set_level.c

@@ -1,26 +0,0 @@
-
-#include "dbg.h"
-
-/**
-  * Set debug level
-  * @param level debug level to set, allowed values are enumberated in #cw_dbg_levels structure.
-  * @param on 1: turns the specified debug level on, 0: turns the specified debug level off.
-  */
-
-void cw_dbg_set_level (int level, int on)
-{
-	switch (level) {
-		case DBG_ALL:
-			if (on)
-				cw_dbg_opt_level = 0xffffffff;
-			else
-				cw_dbg_opt_level = 0;
-			break;
-		default:
-			if (on)
-				cw_dbg_opt_level |= (1 << (level));
-			else 
-				cw_dbg_opt_level &= (0xffffffff) ^ (1 << (level));
-	}
-}
-

src/cw/cw_dbg_set_level_from_str.c

@@ -1,30 +0,0 @@
-
-#include "dbg.h"
-
-int cw_dbg_set_level_from_str(const char *level)
-{
-	int blevel,on;
-	const char *slevel;
-	
-	switch(*level){
-		case '-':
-		case '!':
-			on =0;
-			slevel=level+1;
-			break;
-		case '+':
-			slevel=level+1;
-			on=1;
-			break;
-		default:
-			slevel=level;
-			on=1;
-	}
-
-	blevel = cw_strlist_get_id(cw_dbg_strings, slevel);
-	if (blevel==-1)
-		return 0;
-		
-	cw_dbg_set_level(blevel,on);
-	return 1;
-}

src/cw/cw_detect_nat.c

@@ -3,9 +3,10 @@
 
 #include "dbg.h"
 #include "cw.h"
+#include "cfg.h"
 
 /**
- * @brief Detect NAT after a join/discovery request
+ * @brief Detect NAT after a Join Request
  * @param conn Connection object
  * @retval 1 NAT detected
  * @retval 0 no NAT was detected
@@ -15,7 +16,8 @@ int cw_detect_nat(struct cw_ElemHandlerParams *params)
 	const char  * remote_str;
 	char local_str[128];
 
-	remote_str = cw_cfg_get(params->cfg,"capwap-local-ip-address",NULL);
+	remote_str = cw_cfg_get(params->cfg,"capwap/local-ip-address",NULL);
+
 	if (remote_str == NULL){
 		cw_dbg(DBG_WARN,"Can't detect NAT. No local IP from peer received.");
 		return 0;
@@ -29,9 +31,12 @@ int cw_detect_nat(struct cw_ElemHandlerParams *params)
 	
 	/* if connected and sent address is the same, there is 
 	 * no NAT */
-	if (strcmp(remote_str,local_str)==0)
+	if (strcmp(remote_str,local_str)==0){
+		cw_dbg(DBG_INFO,"Connection from %s: no NAT detected.",local_str);
 		return 0;
+	}		
 	/* otherwise ther must be something between AC and WTP */
+	cw_dbg(DBG_INFO,"Connection from %s: NAT detected.",local_str);
 	return 1;
 }
 

src/cw/cw_format_pkt_hdr.c

@@ -3,105 +3,104 @@
 #include "conn.h"
 #include "cw.h"
 
-/**
- * @brief Format a packet header for debugging purposes
- * @param dst Destination buffer
- * @param incomming True if the packet is an incomming packet, otherweise 0
- * @param packet packet data
- * @param len length of packet data
- * @param from Address from where the packet was received
- * @return Number of bytes written
- */
-int cw_format_pkt_hdr(char *dst, int incomming, uint8_t * packet, int len,
-		      struct sockaddr *from)
+#include "dot11.h"
+
+int cw_format_dot11_fc_flags(char *dst, uint8_t *frame){
+	char *s = dst;
+	uint8_t f = frame[0];
+	s+=sprintf(s,"ToDS:%d ", f&1 ? 1:0);
+	s+=sprintf(s,"FromDS:%d ", f&2 ? 1:0);
+	s+=sprintf(s,"More Frgs:%d ", f&4 ? 1:0);
+	s+=sprintf(s,"Retry:%d ", f&8 ? 1:0);
+	s+=sprintf(s,"PwrMgmt:%d ", f&16 ? 1:0);
+	s+=sprintf(s,"More Dta:%d ", f&32 ? 1:0);
+	s+=sprintf(s,"Protec:%d ", f&64 ? 1:0);
+	s+=sprintf(s,"+HTC/:%d ", f&128 ? 1:0);
+	return s-dst;
+}
+
+
+int cw_format_dot11_rates(char *dst, const uint8_t *src, int len)
+{
+	int i;
+	char * k="";
+	char *s=dst;
+
+	for(i=0; i<len; i++){
+		int rate = src[i] &0x7f;
+		s+=sprintf(s,"%s%0.1f",k,dot11_rate2float(rate));
+		k=", ";
+	}
+	return s-dst;
+}
+
+
+int cw_format_dot11_elem(char *dst, uint8_t id, const uint8_t *src, int len)
+{
+	char *s = dst;
+	s += sprintf(s,"elem(id=%d) ",id);
+
+
+	switch(id){
+		case DOT11_ELEM_SSID:
+			s+=sprintf(s," ssid: %.*s",len,src);
+			break;
+		case DOT11_ELEM_SUPPORTED_RATES:
+			s+=sprintf(s," Supported Rates:");
+			s+=cw_format_dot11_rates(s,src,len);
+			break;
+		case DOT11_ELEM_EXTENDED_SUPPORTED_RATES:
+			s+=sprintf(s," Extended Supported Rates");
+			break;
+		case DOT11_ELEM_POWER_CAPABILITY:
+			s+=sprintf(s," Power Capability");
+			break;
+		case DOT11_ELEM_SUPPORTED_CHANNELS:
+			s+=sprintf(s," Supported Channels");
+			break;
+		case DOT11_ELEM_SUPPORTED_OPERATING_CLASSES:
+			s+=sprintf(s," Supported Operating Classes");
+			break;
+		case DOT11_ELEM_VENDOR_SPECIFIC:
+			s+=sprintf(s," Vendor Specific");
+			break;
+	default:
+			break;
+	}
+	s+=sprintf(s,", len=%d",len);
+	return s-dst;
+}
+
+
+int cw_format_dot11_hdr(char * dst, uint8_t * packet, int len)
 {
-	char sock_buf[SOCK_ADDR_BUFSIZE]; 
-	int preamble;
 	char *s;
-	int hlen, rid, wbid;
-	int frag_id,frag_offs;
+	int type = dot11_get_type_and_subtype(packet);
 
 	s=dst;
 
-	if (incomming){
-		if (cw_get_hdr_flag_f(packet)) {
-			s += sprintf(s, "Fragment from %s",
-				     sock_addr2str_p(from,sock_buf));
-		} else {
-			s += sprintf(s, "From %s", sock_addr2str_p(from,sock_buf));
-		}
-	}
-	else{
-		if (cw_get_hdr_flag_f(packet)) {
-			s += sprintf(s, "Fragment to %s", sock_addr2str(from,sock_buf));
-		} else {
-			s += sprintf(s, "To %s", sock_addr2str(from,sock_buf));
-		}
-	}
-	s += sprintf(s, " l=%d: ", len);
+	s+=sprintf(s,"IEEE 802.11 - %s",dot11_get_frame_name(packet));
+	s+=sprintf(s," da:");
+	s+=format_mac(s,dot11_get_da(packet),6);	
+	s+=sprintf(s," sa:");
+	s+=format_mac(s,dot11_get_sa(packet),6);	
+	s+=sprintf(s," bssid:");
+	s+=format_mac(s,dot11_get_bssid(packet),6);
+	s+=sprintf(s," seq: %d\n",dot11_get_seq(packet));
+	s+=cw_format_dot11_fc_flags(s,packet);
+	s+=sprintf(s,"\nDuration: %d",dot11_get_duration(packet));
+//
+/*	switch (type){
+		case DOT11_ASSOC_REQ:
+			s+=sprintf(s,"\n   ssid: %.*s",dot11_assoc_req_get_ssid_len(packet),
+					dot11_assoc_req_get_ssid(packet)
+			);
+			break;
 			
-	preamble = cw_get_hdr_preamble(packet);
-	if (preamble == 01) {
-		s += sprintf(s, " (encrypted)");
-		return s - dst;
-	}
-
-	if (len < 4)
-		goto abort;
-
-/*		
-	if (cw_get_hdr_flag_f(packet)){
-		s+=sprintf(s," (fragmented)");
-	}
-*/
-	hlen = cw_get_hdr_hlen(packet);
-	rid = cw_get_hdr_rid(packet);
-	wbid = cw_get_hdr_wbid(packet);
-	s += sprintf(s, " H:%d R:%02d W:%02d", hlen, rid, wbid);
-
-
-	s += sprintf(s, " Flgs:");
-	s += format_hdr_flags(s, packet);
-
-	if (len < 8)
-		goto abort;
-	frag_id = cw_get_hdr_fragid(packet);
-	frag_offs = cw_get_hdr_fragoffset(packet);
-	s += sprintf(s, " Frag/Offs:%d/%d", frag_id, frag_offs);
-
-
-	if (cw_get_hdr_flag_m(packet)) {
-		/* rmac is present, print the rmac */
-		int rmac_len = cw_get_hdr_rmac_len(packet);
-		int plen = rmac_len;
-		if (rmac_len + 8 > len)
-			plen = len - 8;
-		if (rmac_len > 10)
-			plen = 10;
-
-		s += sprintf(s, " R-MAC:");
-		s += format_mac(s, cw_get_hdr_rmac_data(packet), plen);
-		if (rmac_len > 10) {
-			s += sprintf(s, " ... (len=%d)", rmac_len);
-		}
-	}
-
-	if (cw_get_hdr_flag_w(packet)) {
-		/* print wireless specific info */
-		int ws_len = cw_get_hdr_ws_len(packet);
-		int plen = ws_len > 20 ? 20 : ws_len;
-		s += sprintf(s, " WS:");
-		s += format_hexu(s, cw_get_hdr_ws_data(packet), plen);
-		if (ws_len > 20) {
-			s += sprintf(s, " ... (len=%d)", ws_len);
-		}
-	}
-	return s - dst;
-
-
-
-      abort:
-	s += sprintf(s, " Incomplete...");
-	return s - dst;
+	}*/
 
 }
+
+
+
+

src/cw/cw_in_generic.c

@@ -1,37 +0,0 @@
-
-#include "capwap.h"
-#include "msgset.h"
-#include "val.h"
-#include "log.h"
-#include "dbg.h"
-
-int cw_in_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params,
-		uint8_t * elem_data, int elem_len)
-{
-	cw_Type_t * type;
-	type = (cw_Type_t*)handler->type;
-	char mkey[CW_CFG_MAX_KEY_LEN];
-	const char *key;
-
-
-
-	if (!type){
-		cw_log(LOG_ERR,"Can't handle element: %s, no type defined",handler->name);
-		return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
-	}
-
-	if (handler->mkkey != NULL){
-		handler->mkkey(handler->key,elem_data,elem_len, mkey);
-		key = mkey;
-	}
-	else{
-		key = handler->key;
-	}
-
-
-	
-
-/*	cw_dbg(DBG_X, "READ: %s / %s",type->name,key);*/
-	type->read(params->cfg, key,elem_data,elem_len,handler->param);
-	return CAPWAP_RESULT_SUCCESS;
-}

src/cw/cw_in_generic_struct.c

@@ -1,39 +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);	
-
-/*	int (*mkkey)(struct cw_ElemHandler * handler, char *dst, struct cw_ElemHandlerParams * params, 
-		uint8_t*data, int len);
-*/
-
-	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_inline.c

@@ -15,6 +15,25 @@ int cw_get_hdr_ws_len(uint8_t * th)
 	return *(th + 9 + cw_get_hdr_rmac_len(th));
 }
 
+
+/** 
+ * Get length of wireless specific data for CAPWAP packet draft 7
+ * @param th Pointer to packet
+ * @return length of wireless specific data
+ *
+ * Call this function only if the W flag is set
+ */
+int cw_get_hdr_ws_len_7(uint8_t * th)
+{
+	if (!cw_get_hdr_flag_m(th)){
+		return *(th + 9);
+	}
+	return *(th + 10 + cw_get_hdr_rmac_len(th));
+}
+
+
+
+
 /** 
  * Get pointer to wireless specific data
  * @param th Pointer to packet
@@ -117,7 +136,7 @@ int cw_set_hdr_rmac(uint8_t * th, bstr_t rmac)
 		hlen++;
 	}
 	cw_set_hdr_hlen(th, hlen);
-	return 1;
+	return rmac_len;
 }
 
 

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_generic_with_index.c

@@ -7,9 +7,6 @@ int cw_out_generic_with_index(struct cw_ElemHandler * eh,
 		struct cw_ElemHandlerParams * params, uint8_t * dst)
 
 {
-	char key[CW_CFG_MAX_KEY_LEN];
-	int idx;
-	cw_Val_t * result, search;
 	int len,start;
 	uint8_t * ob;
 	struct cw_Cfg_entry *e;
@@ -18,7 +15,6 @@ int cw_out_generic_with_index(struct cw_ElemHandler * eh,
 	int i,l;
 
 
-	idx = 0;
 	ob = dst;
 
 	cw_cfg_iter_init(params->cfg_list[0], &cfi, eh->key);
@@ -42,31 +38,5 @@ int cw_out_generic_with_index(struct cw_ElemHandler * eh,
 
 	return ob-dst;
 	
-	stop();
-	return 0;
-
-
-
-	do {
-		sprintf(key,"%s.%d",eh->key,idx);
-		search.key=key;
-		result = mavl_get_first(params->cfg,&search);
-		if (result==NULL)
-			break;
-		if (strncmp(result->key,key,strlen(key))!=0)
-			break;
-	
-		start = params->msgset->header_len(eh);
-		len = cw_put_byte(ob+start,idx);
-		
-		len += result->type->put(result,ob+start+len);
-
-		ob += params->msgset->write_header(eh,ob,len);
-		
-		idx++;
-		
-	}while(1);
-
-	return ob-dst;
 }
 

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_read_ac_descriptor.c

@@ -25,7 +25,7 @@ cw_ValStruct_t acstatus [] = {
 
 
 
-int cw_read_ac_descriptor(mavl_t store,
+int cw_read_ac_descriptor(cw_Cfg_t * store,
 			   struct cw_ElemHandler *eh,
 			   struct cw_ElemHandlerParams * params,
 			   uint8_t *data, int len, 

src/cw/cw_read_descriptor_subelems.c

@@ -22,7 +22,7 @@
 #include "keys.h"
 
 
-int cw_read_descriptor_subelems(mavl_t cfg, const char *parent_key,
+int cw_read_descriptor_subelems(cw_Cfg_t *cfg, const char *parent_key,
 				uint8_t * data, int len,
 				struct cw_DescriptorSubelemDef *elems)
 {

src/cw/cw_read_wtp_descriptor.c

@@ -16,7 +16,7 @@ static struct cw_DescriptorSubelemDef allowed_default[] = {
 };
 
 
-int cw_read_wtp_descriptor(mavl_t cfg, struct cw_Conn *conn,
+int cw_read_wtp_descriptor(cw_Cfg_t * cfg, struct cw_Conn *conn,
 			   struct cw_ElemHandler *eh, uint8_t * data, int len,
 			   struct cw_DescriptorSubelemDef *allowed)
 {

src/cw/cw_read_wtp_descriptor_7.c

@@ -20,7 +20,7 @@ static struct cw_DescriptorSubelemDef allowed_default[] = {
 /**
  * Read WTP Descriptor in Cisco-Style (Draft 7)
  */
-int cw_read_wtp_descriptor_7(mavl_t cfg, struct cw_Conn *conn,
+int cw_read_wtp_descriptor_7(cw_Cfg_t * cfg, struct cw_Conn *conn,
 			     struct cw_ElemHandler *eh, uint8_t * data, int len,
 			     struct cw_DescriptorSubelemDef *allowed)
 {

src/cw/cw_setup_dtls.c

@@ -49,11 +49,13 @@ 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 = cw_cfg_get(cfg, key, NULL);
+	conn->dtls_psk = (bstr16_t)cw_cfg_get(cfg, key, NULL);
 
 	sprintf(key, "%s/%s", prefix, "ssl-psk-enable");
-	conn->dtls_psk_enable = cw_cfg_get_bool(cfg, key, "flase");
+	conn->dtls_psk_enable = cw_cfg_get_bool(cfg, key, 0);
 
 	if (conn->dtls_psk_enable) {
 		security |= CAPWAP_FLAG_AC_SECURITY_S;

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_bits.c

@@ -0,0 +1,84 @@
+#include "val.h"
+#include "cfg.h"
+#include "dbg.h"
+
+static int get_len(const struct cw_ValBit *bits)
+{
+	int i;
+	for (i=0;bits[i].key!=NULL;i++);
+	return bits[i].bit; 
+}
+
+static int get_bit(const uint8_t * src,int pos, int len)
+{
+	int b;
+	uint8_t m;
+       	b = len-1-pos/8;
+	m = 1<<(pos%8);
+	return src[b]&m ? 1:0;
+}
+
+static void set_bit(uint8_t * dst,int pos, int len,int val)
+{
+	int b;
+	uint8_t m;
+	cw_dbg(DBG_X,"set bit val %d",val);
+	if (!val)
+		return;
+       	b = len-1-pos/8;
+	m = 1<<(pos%8);
+	dst[b]|=m;
+}
+
+static int bread(cw_Cfg_t *cfg, const char * key, const uint8_t *src, int len, const void *param)
+{
+	char skey[CW_CFG_MAX_KEY_LEN];
+	const struct cw_ValBit * bits=param;
+	int l,i;
+	
+	l = get_len(bits);
+	for(i=0;bits[i].key!=NULL;i++){
+		sprintf(skey,"%s/%s",key,bits[i].key);
+		cw_cfg_set_bool(cfg,skey,get_bit(src,bits[i].bit,l));
+	}
+	return 1;
+}
+
+
+static 	int bwrite(cw_Cfg_t ** cfgs, const char *key, uint8_t *dst, const void * param)
+{
+	int l,i;
+	char skey[CW_CFG_MAX_KEY_LEN];
+	const struct cw_ValBit * bits=param;
+	l = get_len(bits);
+	memset(dst,0,l);
+	for(i=0;bits[i].key!=NULL;i++){
+		uint8_t val;
+		int rc;
+		val=0;
+		sprintf(skey,"%s/%s",key,bits[i].key);
+		rc = CW_TYPE_BOOL->write(cfgs, skey, &val, NULL);
+		if (rc<0)
+			val=0;
+		cw_dbg(DBG_X,"%s (rc: %d)",skey,rc);
+		set_bit(dst,bits[i].bit,l,val);
+	}
+	return l;
+}
+
+
+const struct cw_Type cw_type_bits = {
+	"Bits",			/* name */
+	NULL,			/* del */
+	NULL,			/* put */
+	NULL,			/* get */
+	NULL,			/* to_str */
+	NULL,		/* from_str */ 
+	NULL,			/* len */
+	NULL,			/* data */
+	NULL,		/* get_type_name */
+	NULL,
+	bread,
+	bwrite
+
+};

src/cw/cw_type_struct.c

@@ -38,14 +38,12 @@ static int read_struct(cw_Cfg_t * cfg,const cw_ValStruct_t * stru, const char *p
 			default:
 				l = stru[i].len;
 				if (pos+l > len){
-					l = len-pos;
+					l = pos<len ? len-pos : 0 ;
 				}
 			
 		}
-
 		l=stru[i].type->read(cfg,key,data+pos,l,stru[i].valguard);
 
-		
 //		printf("READ STRUCT (%d): %s: %s\n",pos,key,dbstr);
 		
 		if (stru[i].len==-1){
@@ -81,6 +79,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 +99,10 @@ 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);
+//		cw_dbg(DBG_X,"Base? :'%s', %d\n",key,rc);
 		if(result) {
 //			char s[2048];
 //			result->type->to_str(result,s,2048);
@@ -108,9 +110,15 @@ static int write_struct(cw_Cfg_t ** cfgs,  const cw_ValStruct_t * stru, const ch
 		}	
 
 		
-		if (result == NULL){
-			cw_log(LOG_ERR,"Can't put %s, no value found, filling wth zeros.",key);
-			memset(dst+pos,0,stru[i].len);
+		if (!rc){
+			int l;
+			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/cw_write_descriptor_subelem.c

@@ -8,55 +8,38 @@
 int cw_write_descriptor_subelem (uint8_t *dst, cw_Cfg_t ** cfg_list,
                                  int subelem_id, const char * parent_key )
 {
-	char key[256];
+	char key[CW_CFG_MAX_KEY_LEN];
 	uint32_t vendor;
-	//bstr16_t version;
+	bstr16_t version;
 	const char *vendor_s;
 
 	uint8_t *d;
 
-
-	/*        d += cw_put_dword(d, bstrv_get_vendor_id(v));
-	d += cw_put_dword(d, (subelem_id << 16) | bstrv_len(v));
-	d += cw_put_data(d, bstrv_data(v), bstrv_len(v));
-	*/
 	sprintf (key, "%s/%s", parent_key, CW_SKEY_VENDOR);
 	vendor_s = cw_cfg_get_l (cfg_list, key, NULL);
-	
 	if (vendor_s == NULL) {
-		cw_log (LOG_ERR, "Can't put subelem %s, no value of type Dword found.", key);
-		return 0;
+		cw_log (LOG_ERR, "Can't put subelem %s, no value found. Setting zero.", key);
+		vendor_s = "0";
 	}
 
 	vendor = atoi(vendor_s);	
-
-
-
 	sprintf (key, "%s/%s", parent_key, CW_SKEY_VERSION);
-	cw_Val_t * val = cw_cfg_get_val_l(cfg_list, key, CW_TYPE_BSTR16);
-
-	//version = cw_cfg_get_bstr16 (cfg, key, NULL);
-
-
-	if (val == NULL) {
-		cw_log (LOG_ERR, "Can't put subelem %s, no value of type Bstr16 found.", key);
-		return 0;
+	version = cw_cfg_get_bstr16_l(cfg_list,key,NULL);
+	if (version == NULL) {
+		cw_log (LOG_ERR, "Can't put subelem %s, no value found. Setting zero.", key);
+		version = bstr16_create_from_str("0.0.0.0");
 	}
 	
 	d = dst;
 	
 	/* put vendor */
-	d += cw_put_dword(d, vendor); //->type->put (vendor, d);
+	d += cw_put_dword(d, vendor); 
 	
 	/* put version */
+	d += cw_put_dword (d, (subelem_id << 16) | bstr16_len(version));
+	d += cw_put_bstr16(d, version);
 
-	d += cw_put_dword (d, (subelem_id << 16) | val->type->len(val));
-//	d += cw_put_bstr16(d, version);
-	d += val->type->put(val,d);
-
-	cw_val_destroy(val);
-
-//	free(version);
+	free(version);
 	
 	return d-dst;
 }

src/cw/cw_write_radio_element.c

@@ -9,7 +9,7 @@ int cw_write_radio_element(struct cw_ElemHandler * handler, struct cw_ElemHandle
 {
 
 	char key[CW_CFG_MAX_KEY_LEN];
-	cw_Val_t *elem, search;
+//	cw_Val_t *elem;
 	int len;
 	uint8_t * d;
 	

src/cw/dbg.c

@@ -31,27 +31,121 @@
 #include "format.h"
 #include "ansi_colors.h"
 
+#include "dot11.h"
 
 /**
  *@addtogroup DBG
  *@{
  */
 
- /*
-  * @defgroup DebugFunctions Debug Functions
-  * @{
-  */
-
 uint32_t cw_dbg_opt_display = DBG_DISP_COLORS;
 
 /**
- * Current debug level
+ * Contains all debuglevels currently set
  */
-uint32_t cw_dbg_opt_level = 0;
+static struct mavl * cw_dbg_opt_level = NULL;
 
 
+static int dbg_cmp(const void *a, const void*b)
+{
+	return (*((int*)a)-*((int*)b));
+}
 
 
+struct cw_DbgStr {
+	int level;
+	const char *str;
+	const char ** str_list;
+	const char *descr;
+};
+
+
+static const char * dbg_level_msg[] = {
+	"msg_in", "msg_out", NULL
+};
+
+static const char * dbg_level_pkt[] = {
+	"pkt_in", "pkt_out",  NULL
+};
+
+static const char * dbg_level_elem[]={
+	"elem_in","elem_out",NULL
+};
+
+static const char * dbg_level_elem_detail[] = {
+	"elem_detail_in", "elem_detail_out", NULL
+};
+
+static const char * dbg_level_elem_dmp[] = {
+	"elem_dmp_in", "elem_dmp_out", NULL
+};
+	
+static const char * dbg_level_elem_all[] = {
+	"elem", "elem_dmp", "elem_detail",NULL
+};
+
+static const char * dbg_level_std[] = {
+	"msg","elem","msg_err", "elem_err", "pkt_err", "rfc", "warn", "state", "info", NULL
+};
+
+
+/**
+ * Debug strings
+ */
+struct cw_DbgStr cw_dbg_strings[] = {
+	{ 0, 			"std", dbg_level_std, "some useful standard options to debug CAPWAP"},
+	{ 0,			"msg", dbg_level_msg, "messages headers" },
+	{ 0,			"pkt", dbg_level_pkt, "packet headers" },
+	{ 0,			"elem", dbg_level_elem, "message elemenst" },
+	{ 0, 			"elem_detail", dbg_level_elem_detail, "details for message elements"},
+	{ 0, 			"elem_dmp", dbg_level_elem_dmp,"hexdump element"},
+	{ 0, 			"elem_all", dbg_level_elem_all,"all possible elem options"},
+
+	{ DBG_WARN,		"warn", NULL, "warnings" },
+
+	{ DBG_ELEM_ERR, 	"elem_err", NULL, "errors in elements" },
+	{ DBG_PKT_ERR,		"pkt_err", NULL, "packets with errors which are usually would be discard" },
+	{ DBG_MSG_ERR,		"msg_err", NULL, "message errors"},
+	{ DBG_RFC,		"rfc", NULL, "errors related to RFC5415/RFC5416 viloations" },
+	{ DBG_CFG_UPDATES, 	"cfg_updates",NULL, "show configuration aupdates" },
+	{ DBG_MOD,		"mod",NULL, "module related"},
+	{ DBG_MOD_DETAIL,	"mod_detail",NULL, "module related details"},
+	{ DBG_STATE,		"state",NULL, "CAWPAP states" },
+	{ DBG_MSG_COMPOSE,	"msg_compose",NULL,"message composing details" },
+
+
+	{ DBG_INFO,		"info", NULL, "several infos are displayed" },
+	{ DBG_PKT_IN,		"pkt_in",NULL, "headers of incomming packets."  },
+	{ DBG_PKT_OUT,		"pkt_out",NULL, "headers out outgoing packets." },
+	{ DBG_PKT_DMP_IN,	"pkt_dmp_in",NULL, "hex-dump incomming packets" },
+	{ DBG_PKT_DMP_OUT,	"pkt_dmp_out",NULL, "hex-dump outgoing packets"  },
+
+	{ DBG_MSG_IN,		"msg_in", NULL, "incomming messages" },
+	{ DBG_MSG_OUT,		"msg_out", NULL, "outgoing messages" },
+	{ DBG_MSG_DMP_IN,	"msg_dmp_in", NULL, "hex-dump incomming messages" },
+	{ DBG_MSG_DMP_OUT,	"msg_dmp_out", NULL,"hex-dump of outgong messages"  },
+	
+
+	{ DBG_ELEM_IN,  	"elem_in", NULL, "elements of incomming messages"},
+	{ DBG_ELEM_OUT, 	"elem_out", NULL, "elements of outgoing messages"},
+	{ DBG_ELEM_DETAIL_IN, 	"elem_detail_in", NULL, "details of incomming message elements" },
+	{ DBG_ELEM_DETAIL_OUT, 	"elem_detail_out",NULL, "details of outgoing message elememnts" },
+	{ DBG_ELEM_DMP_IN, 	"elem_dmp_in", NULL, "hex-dump of incoming elements"},
+	{ DBG_ELEM_DMP_OUT, 	"elem_dmp_out", NULL, "hex-dump of outgoing elements"},
+	{ DBG_ELEM_VNDR,	"elem_vndr", NULL, "expand vendor specific payloads"},	
+	
+	{ DBG_DTLS, 		"dtls",NULL, "DTLS related stuff"},
+	{ DBG_DTLS_BIO,		"dtls_bio",NULL, "DTLS BIO releated" },
+	{ DBG_DTLS_BIO_DMP,	"dtls_bio_dmp",NULL, "hex-dump dtls packets" },
+	{ DBG_DTLS_DETAIL, 	"dtls_detail",NULL, "DTLS detailed messages"},
+
+	{ DBG_X,		"x", NULL, "only for developers" },
+
+	{ DBG_ALL, 		"all", NULL, "all debug levels at once"},
+
+	
+	{ 0, NULL } 
+};
 
 
 
@@ -63,14 +157,13 @@ static struct cw_StrListElem theme0[] = {
 	{DBG_PKT_DMP_OUT, ANSI_BYELLOW ANSI_ITALIC},
 	
 	{DBG_MSG_IN, ANSI_BLUE ANSI_BOLD},
-	{DBG_MSG_PARSING, ANSI_BLUE },
 	
 	{DBG_MSG_OUT, ANSI_BLUE ANSI_BOLD ANSI_ITALIC},
-	{DBG_MSG_ASSEMBLY, ANSI_BLUE ANSI_ITALIC},
+	{DBG_MSG_COMPOSE, ANSI_BLUE ANSI_ITALIC},
 	
 	
-	{DBG_MSG_IN_DMP, ANSI_BBLUE },
-	{DBG_MSG_OUT_DMP, ANSI_BBLUE ANSI_ITALIC},
+	{DBG_MSG_DMP_IN, ANSI_BBLUE },
+	{DBG_MSG_DMP_OUT, ANSI_BBLUE ANSI_ITALIC},
 	
 	{DBG_ELEM_IN, ANSI_DEFAULT},
 	{DBG_ELEM_OUT, ANSI_DEFAULT ANSI_ITALIC},
@@ -79,7 +172,7 @@ static struct cw_StrListElem theme0[] = {
 	{DBG_PKT_ERR, ANSI_RED},
 	{DBG_ELEM_ERR, ANSI_RED},
 	
-	{DBG_SUBELEM, ANSI_BBLACK},
+//	{DBG_SUBELEM, ANSI_BBLACK},
 	{DBG_DTLS, ANSI_MAGENTA ANSI_BOLD},
 	{DBG_DTLS_DETAIL, ANSI_MAGENTA},
 	{DBG_DTLS_BIO, ANSI_BMAGENTA},
@@ -91,9 +184,10 @@ static struct cw_StrListElem theme0[] = {
 	{DBG_RFC, ANSI_BRED},
 	{DBG_X, "\x1b[31m"},
 	{DBG_WARN, ANSI_CYAN},
-	{DBG_MOD, ANSI_WHITE},
-	{DBG_CFG_DMP, ANSI_BCYAN }, 
-	
+	{DBG_MOD_DETAIL, ANSI_WHITE},
+	{DBG_MOD, ANSI_BBLACK ANSI_BOLD },
+//	{DBG_CFG_DMP, ANSI_BCYAN }, 
+	{DBG_CFG_UPDATES,ANSI_GREEN},	
 
 	{CW_STR_STOP, ""}
 };
@@ -103,8 +197,8 @@ static struct cw_StrListElem * color_on = theme0;
 
 struct cw_StrListElem color_ontext[] = {
 
-/*	{DBG_ELEM_DMP, "\x1b[37m"},*/
-	{DBG_ELEM_DMP, ANSI_BBLACK ANSI_ITALIC},
+	{DBG_ELEM_DMP_OUT, ANSI_BBLACK ANSI_ITALIC},
+	{DBG_ELEM_DMP_IN,  ANSI_BBLACK},
 
 	{CW_STR_STOP, ""}
 };
@@ -118,9 +212,9 @@ static struct cw_StrListElem color_off[] = {
 
 static struct cw_StrListElem prefix[] = {
 	{DBG_INFO, 		"Info - "},
-	{DBG_PKT_IN, " Pkt IN -"},
+	{DBG_PKT_IN, 		"Pkt In  - "},
 	{DBG_PKT_OUT, 		"Pkt Out - "},
-	{DBG_MSG_IN, " Msg IN -"},
+	{DBG_MSG_IN, 		"Msg In  - "},
 	{DBG_MSG_OUT,		"Msg Out - "},
 
 	{DBG_ELEM_IN, 		"  Msg Element - "},
@@ -130,18 +224,19 @@ static struct cw_StrListElem prefix[] = {
 	{DBG_PKT_ERR, 		"  Pkt Error - "},
 	{DBG_ELEM_ERR, 		"  Elem Error - "},
 	{DBG_RFC, 		"  RFC - "},
-	{DBG_SUBELEM, " Sub-Element - "},
 	{DBG_DTLS, 		"DTLS - "},
 	{DBG_DTLS_DETAIL,	 "DTLS - "},
 	{DBG_WARN,	 	"Warning - "},
 	{DBG_MOD, 		"Mod - "},
+	{DBG_MOD_DETAIL,	"Mod - "},
 	{DBG_STATE, 		"STATEMACHINE - "},
-	{DBG_CFG_SET, "    Cfg Set - "},
+	{DBG_CFG_UPDATES,	"Cfg - "},
 
 
 
 	{DBG_X, "XXXXX - "},
 
+
 	{CW_STR_STOP, ""}
 };
 
@@ -180,13 +275,36 @@ const char *get_dbg_color_ontext(int level)
  * @param level Level to check
  * @return 0 if leveln is not set, otherwise level is set
  */
-
 int cw_dbg_is_level(int level)
 {
-	if (level >= DBG_ALL ){
-		return 1;
+	if (cw_dbg_opt_level == NULL)
+		return 0;
+
+	return mavl_get(cw_dbg_opt_level,&level) == NULL ? 0:1;
 }
-	return (cw_dbg_opt_level & (1<<level));
+
+/**
+  * Set debug level
+  * @param level debug level to set, allowed values are enumberated in #cw_dbg_levels structure.
+  * @param on 1: turns the specified debug level on, 0: turns the specified debug level off.
+  *
+  * To check if a specific debug level is set, call #cw_dbg_is_level.
+  */
+void cw_dbg_set_level (int level, int on)
+{
+	int exists;
+
+	if (cw_dbg_opt_level == NULL){
+		cw_dbg_opt_level = mavl_create(dbg_cmp,NULL,sizeof(int));
+		if (cw_dbg_opt_level == NULL)
+			return;
+	}
+
+	if (on){
+		mavl_insert(cw_dbg_opt_level,&level,&exists);
+	}
+	else 
+		mavl_del(cw_dbg_opt_level,&level);
 }
 
 
@@ -206,69 +324,43 @@ static void cw_dbg_vlog_line(struct cw_LogWriter * writer,
 				
 	}
 	writer->write(LOG_DEBUG,fbuf,args,writer);
-
 }
 
 
 
 /**
- * Put a list of missing mandatory message elements to debug output
- */
-void cw_dbg_missing_mand(int level, struct cw_Conn *conn, int ** ml, int n,
-			 int  * a)
-{
-	/*
-//      if (!cw_dbg_is_level(DBG_MSG_ERR) || n == 0)
-//              return;
-*/
-
-
-	char buffer[2000];
-/*	char *p = buffer; */
-	int i;
-/*	char *delim = "";*/
-	
-	if (!cw_dbg_is_level(level) || n == 0)
-		return;
-	
-/*
-	// TODO XXXX
-*/
-	for (i = 0; i < n; i++) {
-/*		p += sprintf(p, "%s", delim);
-		delim = ", ";
-		p += sprintf(p, "%s", cw_strelemp(conn->actions, ml[i]->elem_id));
-*/
-	}
-	cw_dbg(level, "Missing mandatory elements: [%s]", buffer);
-}
-
-
-
-
-/**
- * Display a packet on for debugger
+ * Display a packet on debugger
  */
 void cw_dbg_pkt(int level, struct cw_Conn *conn, uint8_t * packet, int len,
 		struct sockaddr *from)
 {
 
-/*	int hlen;*/
 	char buf[1024];
+	int (*fmt_pkt_hdr)(char *dst, int incomming, uint8_t * packet, int len,
+		      struct sockaddr *from);
+	fmt_pkt_hdr = NULL;
+	if (conn){
+		if (conn->msgset)
+			fmt_pkt_hdr = conn->msgset->format_pkt_hdr;
+	}
+	if (fmt_pkt_hdr==NULL){
+		fmt_pkt_hdr = cw_format_pkt_hdr;
+	}
+
 
 	if (!cw_dbg_is_level(level))
 		return;
 	
 	if (level == DBG_PKT_IN)
-		cw_format_pkt_hdr(buf, 1,  packet, len, from);
+		fmt_pkt_hdr(buf, 1,  packet, len, from);
 	else
-		cw_format_pkt_hdr(buf, 0,  packet, len, from);
+		fmt_pkt_hdr(buf, 0,  packet, len, from);
 		
 /*	hlen = cw_get_hdr_msg_offset(packet);*/
 
 	cw_dbg(level, "%s", buf);
 		
-	if (cw_dbg_is_level(DBG_PKT_DMP)) {
+//	if (cw_dbg_is_level(DBG_PKT_DMP)) {
 		int dlevel;
 		if (level == DBG_PKT_IN){
 			dlevel=DBG_PKT_DMP_IN;
@@ -277,7 +369,7 @@ void cw_dbg_pkt(int level, struct cw_Conn *conn, uint8_t * packet, int len,
 			dlevel=DBG_PKT_DMP_OUT;
 		}
 		cw_dbg_dmp(dlevel,packet,len,"");
-	} 
+//	} 
 
 }
 
@@ -352,16 +444,16 @@ void cw_dbg_msg(int level, struct cw_Conn *conn, uint8_t * packet, int len,
 	cw_dbg(level, "%s", buf);
 	
 	
-	if (cw_dbg_is_level(DBG_MSG_DMP)){
+//	if (cw_dbg_is_level(DBG_MSG_DMP)){
 		int dlevel;
 		if(level==DBG_MSG_IN){
-			dlevel = DBG_MSG_IN_DMP;
+			dlevel = DBG_MSG_DMP_IN;
 		}
 		else{
-			dlevel = DBG_MSG_OUT_DMP;
+			dlevel = DBG_MSG_DMP_OUT;
 		}
 		cw_dbg_dmp(dlevel,packet,len,"");
-	}
+//	}
 	
 
 }
@@ -409,10 +501,12 @@ void cw_dbg_elem(int level, struct cw_Conn *conn, int msg,
 	cw_dbg(level,"%s %d (%s), len=%d ",vendorname,handler->id,
 			handler->name,len);
 	
-	if (cw_dbg_is_level(DBG_ELEM_DMP)) {
-		/*dmp = cw_format_dump(msgbuf,len,NULL);*/
+	if (cw_dbg_is_level(DBG_ELEM_DMP_OUT) || cw_dbg_is_level(DBG_ELEM_DMP_IN)) {
+		if (level == DBG_ELEM_OUT)
+			cw_dbg_dmp(DBG_ELEM_DMP_OUT,msgbuf,len,"");
+		else 
+			cw_dbg_dmp(DBG_ELEM_DMP_IN,msgbuf,len,"");
 
-		cw_dbg_dmp(DBG_ELEM_DMP,msgbuf,len,"");
 	}
 
 	return;
@@ -421,69 +515,133 @@ void cw_dbg_elem(int level, struct cw_Conn *conn, int msg,
 
 
 
-void cw_dbg_ktv_dump(mavl_t ktv, uint32_t dbglevel, 
-		const char *header, const char *prefix, const char *footer )
+
+int cw_dbg_set_level_from_str0(const char *level,int on)
 {
-	char value[500];
-	struct cw_Val * data;
-	mavliter_t it;
-	const struct cw_Type * type;
+	int i,all;
+	all = strcmp(level,"all")==0 ? 1: 0;
 	
-	if (header != NULL)
-		cw_dbg (dbglevel, header);
-	
-	mavliter_init(&it,ktv);
-
-	mavliter_foreach(&it){
-		
-		data = mavliter_get(&it);
-		type = data->type;
-		type->to_str(data,value,0);
-		
-		cw_dbg(dbglevel,"%s%s :%s: %s",prefix,data->key,type->get_type_name(data), value);
+	for(i=0; cw_dbg_strings[i].str != NULL; i++){
+		if (strcmp(cw_dbg_strings[i].str,level)==0 || all){
+			if (cw_dbg_strings[i].str_list==NULL)
+				cw_dbg_set_level(cw_dbg_strings[i].level,on);
+			else {
+				const char **l;
+				for (l=cw_dbg_strings[i].str_list; *l; l++){
+					if (!cw_dbg_set_level_from_str0(*l,on)){
+						stop();
 					}
-	
-	if (footer != NULL)
-		cw_dbg (dbglevel, footer);
-
 				}
-
-
-
-
-
-
-
-
-
-
-
-/*
-void dbg_istore_dmp(mbag_t s)
-{
-	DEFINE_AVLITER(it,s);
-	avliter_foreach(&it) {
-
-		mbag_item_t *i = avliter_get(&it);
-
-		char buffer[1000];
-
-		struct cw_str * strings = cw_item_strings;
-		
-		const char * in = cw_strlist_get_str(strings,i->id);
-		
-		cw_format_item(buffer,i);
-		printf("Item ID %d-%s: %s\n",i->id,in,buffer);
-				
-
 			}
-
-
+			if (!all)
+				return 1;
 		}
+	}	
+	if (all)
+		return 1;
+/*	blevel = cw_strlist_get_id(cw_dbg_strings, slevel);
+	if (blevel==-1)
+		return 0;
 */		
+//	cw_dbg_set_level(blevel,on);
+//	return 1;
+	return 0;
+}
+
+
+int cw_dbg_set_level_from_str(const char *level)
+{
+	int on;
+	const char *slevel;
+	
+	switch(*level){
+		case '-':
+		case '!':
+		case '~':
+			on =0;
+			slevel=level+1;
+			break;
+		case '+':
+			slevel=level+1;
+			on=1;
+			break;
+		default:
+			slevel=level;
+			on=1;
+	}
+	return cw_dbg_set_level_from_str0(slevel,on);
+}
+
+
+
+
+void cw_dbg_print_help(FILE *out, const char * prefix)
+{
+	struct cw_DbgStr *s;
+	for (s=cw_dbg_strings; s->str != NULL; s++){
+		const char * descr = s->descr!=NULL ? s->descr : "";
+		fprintf(out,"%s%s: %s",prefix,s->str,descr);
+		if (s->str_list != NULL){
+			const char **l;
+			char *sp="";
+			fprintf(out," (");
+			for(l = s->str_list; *l!=NULL; l++){
+				fprintf(out,"%s%s",sp,*l);
+				sp=" ";
+			}
+			fprintf(out,")");
+		}
+		fprintf(out,"\n");
+	}
+}
+
+
+
+void cw_dbg_dot11_elems(const uint8_t *src,int len)
+{
+	uint8_t id,l;
+	int p;
+	char str[1024];
+
+	for(p=0; p<len; p+=l+2){
+		if (len-p<3){
+			cw_dbg(DBG_X,"Error in dot11 element");
+			return;
+		}
+		id=src[p];
+		l=src[p+1];
+		cw_format_dot11_elem(str,id,src+p+2,l);
+		cw_dbg_dmp(DBG_X,src+p+2,l,"");
+		cw_dbg(DBG_X,str);
+	}
+
+}
+
+void cw_dbg_dot11_frame(uint8_t * frame,int len)
+{
+	char hdr[1024];
+	cw_format_dot11_hdr(hdr, frame, len);
+	cw_dbg(DBG_X,"%s",hdr);
+
+	int type =dot11_get_type_and_subtype(frame);
+
+	switch (type){
+		case DOT11_ASSOC_REQ:
+			cw_dbg_dot11_elems(frame+28,len-28);
+			break;
+		case DOT11_ASSOC_RESP:
+			cw_dbg(DBG_X,"  Capapility info: %04X",dot11_assoc_resp_get_cap(frame)); 
+			cw_dbg(DBG_X,"  Status CodeCapapility info: %04X",dot11_assoc_resp_get_status_code(frame));
+			cw_dbg(DBG_X,"  Assoc ID: %04X",dot11_assoc_resp_get_assoc_id(frame)); 
+
+			cw_dbg_dot11_elems((frame+DOT11_BODY_POS+DOT11_ASSOC_RESP_BODY_LEN),
+					len-DOT11_BODY_POS-DOT11_ASSOC_RESP_BODY_LEN);
+			break;
+			
+	}
+}
 
 
 /**@}*/
 
 
-/**@}*/

src/cw/dbg.h

@@ -39,7 +39,7 @@
 
 
 /**
- *@addtogroup LOGDBG
+ *@addtogroup DBG
  *@{
  */
 
@@ -47,51 +47,41 @@
  * Debug levels
  */ 
 enum cw_dbg_levels{
-	/** Show headers of incomming CAPWAP packets */
-	DBG_PKT_IN=0,
-	
-	/** Show headers of outgoing CAPWAP packets */
+	/** Show headers of incomming/outgoing CAPWAP packets */
+	DBG_PKT_IN 	= 1, 
 	DBG_PKT_OUT,	
 
+	/** Hex-dump incomming/outgoing CAPWAP packets */
+	DBG_PKT_DMP_IN,
+	DBG_PKT_DMP_OUT,
+
 	/** Incomming CAPWAP packets with errors, wich would
 	    usually silently discarded */ 
 	DBG_PKT_ERR,
 	
-	/** Dump content of incomming packets */
-	DBG_PKT_DMP,
 
-	/** Display incomming CAPWAP/LWAPP messages */
+	/** Display incomming/outgoing CAPWAP/LWAPP messages */
 	DBG_MSG_IN,
-
-	/** Display outgoing CAPWAP/LWAPP messages */
 	DBG_MSG_OUT,
 
-	DBG_MSG_DMP,
+	/** Show hex-dump of messages */
+	DBG_MSG_DMP_IN,
+	DBG_MSG_DMP_OUT,
 
 	/** Message errors */
 	DBG_MSG_ERR,
 
-	/** Show message elements in incomming messages */
+	/** Show message elements in incomming/outgoing messages */
 	DBG_ELEM_IN,
-
-	/** Show message elements assembled for outgoing messages */
 	DBG_ELEM_OUT,
 
 	/** Show message element details  */
-	DBG_ELEM_DETAIL,
+	DBG_ELEM_DETAIL_IN,
+	DBG_ELEM_DETAIL_OUT,
 
 	/** Error in msg elements */
 	DBG_ELEM_ERR,
 
-	/** Show subelements */
-	DBG_SUBELEM,
-
-	/** Show dump of subelements */
-	DBG_SUBELEM_DMP,
-
-	/** hex dump elements */	
-	DBG_ELEM_DMP,
-
 	/** General infos, like CAPWAP state */
 	DBG_INFO,	
 
@@ -113,29 +103,47 @@ enum cw_dbg_levels{
 	/** Show DTLS Details */
 	DBG_DTLS_DETAIL,
 	
-	DBG_CFG_DMP,
+//	DBG_CFG_DMP,
 
-	DBG_CFG_SET,
+//	DBG_CFG_SET,
 
 	/** Debug Mods */
 	DBG_MOD,
 	
-	DBG_STATE, /**<Debug State machine */
+       	/**Debug State machine */
+	DBG_STATE,
+	
+	/** Infos about nessage composing */	
+	DBG_MSG_COMPOSE,
+
+	/** Debug Configuration updates */
+	DBG_CFG_UPDATES,
+
+	/** Debug Vendor elements */
+	DBG_ELEM_VNDR,
+	
+	
+	DBG_X,
+
+	DBG_MOD_DETAIL,
 
 	DBG_ALL,
 
-	DBG_PKT_DMP_OUT,
-	DBG_PKT_DMP_IN,
+	/** Hexdump incoming msg elemenets */
+	DBG_ELEM_DMP_IN,
+	/** Hexdump outgoing msg elemenst */
+	DBG_ELEM_DMP_OUT,
 
-	DBG_MSG_IN_DMP,
-	DBG_MSG_OUT_DMP,
-	
-	DBG_MSG_ASSEMBLY,
-	DBG_MSG_PARSING,
-	
-	DBG_X
 };
 
+#define DBG_MSG (DBG_MSG_IN | DBG_MSG_OUT)
+#define DBG_PKT (DBG_PKT_IN | DBG_PKT_OUT)
+#define DBG_ELEM (DBG_ELEM_IN | DBG_ELEM_OUT)
+
+
+
+
+
 
 #define DBG_LN __FILE__,__LINE__
 
@@ -183,8 +191,8 @@ void cw_dbg_dmp(int level, const uint8_t * data, int len, const char *format, ..
 
 
 extern uint32_t cw_dbg_opt_display;
-extern uint32_t cw_dbg_opt_level;
-extern struct cw_StrListElem cw_dbg_strings[];
+//extern uint32_t cw_dbg_opt_level;
+//extern struct cw_StrListElem cw_dbg_strings[];
 
 /*
 #define cw_dbg cw_dbg_colored
@@ -211,8 +219,6 @@ void cw_dbg_msg(int level,struct cw_Conn *conn, uint8_t * packet, int len,struct
 char * cw_dbg_mkdmp(const uint8_t * data, int len);
 //void cw_dbg_version_subelem(int level, const char *context, int subtype, 
 //		uint32_t vendor_id, const uint8_t * vstr, int len);
-void cw_dbg_ktv_dump(mavl_t ktv, uint32_t dbglevel, 
-		const char *header, const char *prefix, const char *footer );
 
 /**
   * Set debug level
@@ -234,6 +240,10 @@ void cw_dbg_ktv_dump(mavl_t ktv, uint32_t dbglevel,
 */
 int cw_dbg_is_level(int level);
 
+void cw_dbg_print_help(FILE *out, const char * prefix);
+void cw_dbg_dot11_frame(uint8_t * frame,int len);
+
+
 
 #define stop() printf("STOP IN %s:%d - %s\n", __FILE__, __LINE__, __FUNCTION__); exit(1)
 

src/cw/dbg_strings.c

@@ -1,118 +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 
- */
-
-
-
-#include "dbg.h"
-
-/**
- *@addtogroup DbgOptions 
- *@{
- */
-
-
-/**
- * Debug strings
- */
-struct cw_StrListElem cw_dbg_strings[] = {
-	{ DBG_INFO,	"info",  },
-	{ DBG_PKT_IN,	"pkt_in"  },
-	{ DBG_PKT_OUT,	"pkt_out" },
-	{ DBG_PKT_ERR,	"pkt_err" },
-	{ DBG_PKT_DMP,	"pkt_dmp" },
-	{ DBG_MSG_IN,	"msg_in"  },
-	{ DBG_MSG_OUT,	"msg_out" },
-	{ DBG_MSG_DMP,	"msg_dmp" },
-	
-	{ DBG_MSG_ERR,	"msg_err"},
-
-	{ DBG_RFC,	"rfc", 	 },
-	{ DBG_ELEM_IN,  "elem_in"},
-	{ DBG_ELEM_OUT, "elem_out"},
-	{ DBG_ELEM_DMP, "elem_dmp"},
-
-	{ DBG_SUBELEM,	"subelem"},
-	{ DBG_SUBELEM_DMP, "subelem_dmp" },
-	
-	{ DBG_ELEM_DETAIL, "elem_detail"},
-
-	{ DBG_ELEM_ERR, "elem_err" },
-	
-	{ DBG_DTLS, "dtls" },
-	{ DBG_DTLS_BIO, "dtls_bio" },
-	{ DBG_DTLS_BIO_DMP, "dtls_bio_dmp"},
-	{ DBG_DTLS_DETAIL, "dtls_detail"},
-
-	{ DBG_CFG_SET, "cfg_set" },
-
-	
-	{DBG_CFG_DMP, "cfg_dmp" },
-	
-	{ DBG_WARN, "warn" },
-	
-	{ DBG_MOD,"mod"},
-	{ DBG_STATE, "state" },
-	{ DBG_ALL, "all"},
-	
-	{ CW_STR_STOP, NULL } 
-};
-
-/**
- *@}
- */
-
-
-
-
-/*
-struct cw_dbg_cfgstrs cw_dbg_cfgstrs[] = {
-
-	{"info",DBG_CW_INFO},
-	{"msg",DBG_MSG},
-	{"elem",DBG_ELEM},
-	{"elem_dmp",DBG_ELEM_DMP},
-	{"rfc",DBG_CW_RFC},
-	{"pkt_in",DBG_CW_PKT_IN},
-	{"pkt_out",DBG_CW_PKT_OUT},
-	{"pkt_dtl",DBG_CW_PKT_DTL},
-	{"pkt",(DBG_CW_PKT_IN | DBG_CW_PKT_OUT)},
-	{"pkt_dmp",DBG_CW_PKT_DMP},
-	{"pkt_err",DBG_CW_PKT_ERR},
-	{"msg_err",DBG_MSG_ERR},
-	{"img_dtl",DBG_CW_IMG_DTL},
-	{"elem_err",DBG_ELEM_ERR},
-
-	{"dtls",DBG_DTLS},
-	{"dtls_dietail",DBG_DTLS_DETAIL},
-	{"dtls_bio",DBG_DTLS_BIO},
-	{"dtls_bio_dmp",DBG_DTLS_BIO_DMP},
-
-
-	{"all",DBG_ALL},
-	{"err",DBG_ERR},
-	{0,0}
-
-};
-*/
-
-

src/cw/discovery.c

@@ -69,7 +69,7 @@ void cw_discovery_results_add(struct cw_DiscoveryResults *dis,
 	} else {
 		/* Get priority for AC from 
 		 * ac-name-with-priority list */
-		sprintf(key, "ac-name-with-priority/%s", acname);
+		sprintf(key, "capwap/ac-name-with-priority/%s", acname);
 		e.prio = cw_cfg_get_byte(wtp_cfg, key, 255);
 	}
 
@@ -78,7 +78,7 @@ void cw_discovery_results_add(struct cw_DiscoveryResults *dis,
 	do {
 		const char *ipval;
 
-		sprintf(key, "capwap-control-ip-address.%d/wtps", i);
+		sprintf(key, "capwap/control-ip-address.%d/wtps", i);
 		e.wtps = cw_cfg_get_word(ac_cfg, key, 65535);
 
 
@@ -86,7 +86,7 @@ void cw_discovery_results_add(struct cw_DiscoveryResults *dis,
 		if (e.wtps == 65535)
 			break;
 
-		sprintf(key, "capwap-control-ip-address.%d/address", i);
+		sprintf(key, "capwap/control-ip-address.%d/address", i);
 		ipval = cw_cfg_get(ac_cfg, key, "");
 
 		sprintf(key, "%04d%05d%04d", e.prio, e.wtps, dis->nr);
@@ -98,7 +98,7 @@ void cw_discovery_results_add(struct cw_DiscoveryResults *dis,
 		if (e.cfg == NULL)
 			continue;
 
-		cw_cfg_copy(ac_cfg,e.cfg);
+		cw_cfg_copy(ac_cfg,e.cfg,0,"");
 		
 		strcpy(e.ip,ipval);
 

src/cw/dot11.c

@@ -38,3 +38,28 @@ const char * dot11_type_strings[]=
 	"Probe Req",
 	"Probe Resp"
 };
+
+
+struct dot11_name{
+	uint8_t val;
+	const char * str;
+};
+
+struct cw_StrListElem dot11_names[]={
+	{DOT11_ASSOC_REQ, "Assoc Req"},
+	{DOT11_ASSOC_RESP, "Assoc Resp"},
+	{DOT11_REASSOC_REQ, "Reassoc Req"},
+	{DOT11_REASSOC_RESP, "Reassoc Resp"},
+	{DOT11_PROBE_REQ, "Probe Req"},	
+	{DOT11_PROBE_RESP, "Probe Resp"},
+	{DOT11_TIMING_ADV, "Timing Adv"},
+	{DOT11_MGM_RES111, "MGMRES111"},
+	{DOT11_BEACON, "Beacon"},
+	{CW_STR_STOP,"Unknown"},
+};
+
+
+int dot11_init_assoc_resp(uint8_t * dst)
+{
+	dot11_set_type_and_subtype(dst,DOT11_ASSOC_RESP);
+}

src/cw/dot11.h

@@ -20,6 +20,8 @@
 #include <endian.h>
 #endif
 
+#include "strlist.h"
+#include "bstr.h"
 
 /**
  * @defgroup DOT11_FRAME_TYPES Frame Types
@@ -47,17 +49,17 @@
  *
  * @{
  */
-#define DOT11_FC_ASSOC_REQ	dot11_fc_mgm(0b0000)
-#define DOT11_FC_ASSOC_RESP	dot11_fc_mgm(0b0001)
-#define DOT11_FC_REASSOC_REQ	dot11_fc_mgm(0b0010)
-#define DOT11_FC_REASSOC_RESP	dot11_fc_mgm(0b0011)
-#define DOT11_FC_PROBE_REQ	dot11_fc_mgm(0b0100)
-#define DOT11_FC_PROBE_RESP	dot11_fc_mgm(0b0101)
-#define DOT11_FC_TIMING_ADV	dot11_fc_mgm(0b0110)
-#define DOT11_FC_MGM_RES111	dot11_fc_mgm(0b0111)
-#define DOT11_FC_BEACON		dot11_fc_mgm(0b1000)
+#define DOT11_ASSOC_REQ		dot11_fc_mgm(0b0000)
+#define DOT11_ASSOC_RESP	dot11_fc_mgm(0b0001)
+#define DOT11_REASSOC_REQ	dot11_fc_mgm(0b0010)
+#define DOT11_REASSOC_RESP	dot11_fc_mgm(0b0011)
+#define DOT11_PROBE_REQ		dot11_fc_mgm(0b0100)
+#define DOT11_PROBE_RESP	dot11_fc_mgm(0b0101)
+#define DOT11_TIMING_ADV	dot11_fc_mgm(0b0110)
+#define DOT11_MGM_RES111	dot11_fc_mgm(0b0111)
+#define DOT11_BEACON		dot11_fc_mgm(0b1000)
 
-#define DOT11_FC_DATA		dot11_fc_dta(0b0000)
+#define DOT11_DATA		dot11_fc_dta(0b0000)
 
 /**
  * @}
@@ -114,6 +116,14 @@
 #define DOT11_ELEM_FH_PARAM_SET			2
 #define DOT11_ELEM_DSSS_PARAM_SET		3
 #define DOT11_ELEM_CF_PARAM_SET			4
+#define DOT11_ELEM_POWER_CAPABILITY		33
+#define DOT11_ELEM_SUPPORTED_CHANNELS		36
+#define DOT11_ELEM_EXTENDED_SUPPORTED_RATES	50
+#define DOT11_ELEM_AP_CHANNEL_REPORT		51
+#define DOT11_ELEM_SUPPORTED_OPERATING_CLASSES	59
+#define DOT11_ELEM_VENDOR_SPECIFIC		221
+
+
 /**
  * @}
  */
@@ -125,27 +135,32 @@ extern const uint8_t dot11_tab_br[256];
 
 #define dot11_get_byte(ptr) (*(ptr))
 
-#define dot11_put_byte(ptr,b) (*(ptr) = b)
+#define dot11_put_byte(ptr,b) (*(ptr) = b,1)
 #define dot11_put_word(dst,v) ((*((uint16_t*)(dst))=htobe16(v)),2)
-#define dot11_put_dword(dst,v) ((*((uint16_t*)(dst))=htobe16(v)),4)
+#define dot11_put_dword(dst,v) ((*((uint32_t*)(dst))=htobe32(v)),4)
 #define dot11_put_qword(dst,v) ((*((uint64_t*)(dst))=htobe64(v)),8)
 
+#define dot11_set_byte(ptr,b) (*(ptr) = b)
+#define dot11_set_word(dst,v) ((*((uint16_t*)(dst))=htobe16(v)))
+#define dot11_set_dword(dst,v) ((*((uint32_t*)(dst))=htobe32(v)))
+#define dot11_set_qword(dst,v) ((*((uint64_t*)(dst))=htobe64(v)))
+
+
+
+#define dot11_set_byte(ptr,b) (*(ptr) = b)
 
 uint16_t dot11_get_word(uint8_t * ptr);
 
 
 
-#define dot11_get_version(frame) ((frame[1])&0x03)
-#define dot11_get_type(frame) (((frame[1])&0x0c) >> 2)
-#define dot11_get_subtype(frame) (((frame[1])&0xf0) >> 4)
-/** 
- * Get Frame Control field 
- * @param frame
- * @return Frame Control field
- */
-#define dot11_get_fc(frame) dot11_get_word(frame)
+#define dot11_get_version(frame) ( (frame)[1] & 0x03)
+#define dot11_get_type(frame)    ( ((frame)[1] & 0x0c) >> 2)
+#define dot11_get_subtype(frame) ( (frame)[1] >> 4 )
+
+#define dot11_get_type_and_subtype(frame) ((frame)[1])
+#define dot11_set_type_and_subtype(frame,val) ((frame)[1]=val)
+
 
-#define dot11_get_duration(frame) dot11_get_word(frame+2)
 
 
 void dot11_get_address(uint8_t * dst, uint8_t * frame);
@@ -201,6 +216,9 @@ void dot11_timer_set(uint64_t val);
 #define dot11_put_address(dst,addr) (memcpy(dst,addr,6),6)
 #define dot11_put_sequence_control(dst,v) (dot11_put_word(dst,v))
 #define dot11_put_capability(dst,v) dot11_put_word(dst,v)
+
+
+
 int  dot11_put_ssid(uint8_t *dst,uint8_t * ssid,int len);
 
 
@@ -221,7 +239,9 @@ int  dot11_put_ssid(uint8_t *dst,uint8_t * ssid,int len);
  */
 #define dot11_rate2float(rate) (((float)(rate))/2.0)
 
-int dot11_put_supported_rates(uint8_t *dst, float *basic, float *rates);
+int dot11_put_supported_rates(uint8_t *dst, bstr_t src);
+
+//		float *basic, float *rates);
 int dot11_put_dsss_param_set(uint8_t *dst,int ch);
 
 
@@ -235,7 +255,81 @@ extern uint8_t dot11_broadcast_address[6];
 
 
 
+extern struct cw_StrListElem dot11_names[];
 
+#define dot11_get_frame_name(data) cw_strlist_get_str(dot11_names,(data)[1])
+
+/** 
+ * Get Frame Control field 
+ * @param frame uint8_t pointer to the frame
+ * @return uint16_t Frame Control field
+ */
+#define dot11_get_fc(frame) dot11_get_word(frame)
+ /** Get duration/aid field 
+  * @param frame uint8_t pointer to frame */
+#define dot11_get_duration(frame) dot11_get_word(frame+2)
+#define dot11_get_da(frame) ((frame)+4)
+#define dot11_get_sa(frame) ((frame)+10)
+#define dot11_get_bssid(frame) ((frame)+16)
+#define dot11_get_seq(frame) dot11_get_word((frame)+22)
+#define dot11_get_body(frame) ((frame)+24)
+
+#define DOT11_BODY_POS 24
+
+
+#define dot11_set_duration(frame,d) dot11_set_word(frame+2,d)
+#define dot11_set_seq(frame,s) dot11_set_word((frame)+22,s)
+
+
+#define DOT11_ASSOC_RESP_BODY_LEN 6
+
+#define dot11_assoc_req_get_cap(frame) \
+		dot11_get_word((frame)+24)
+#define dot11_assoc_req_get_listen_interval(frame) \
+			dot11_get_word((frame)+24+2)
+
+
+
+/*
+#define dot11_assoc_req_get_ssid_len(frame)\
+			((frame)[29])
+#define dot11_assoc_req_get_ssid(frame)\
+			(frame+30)
+*/
+#define dot11_assoc_resp_set_cap(frame,cap)\
+	dot11_set_word(dot11_get_body(frame),cap)
+#define dot11_assoc_resp_get_cap(frame)\
+	dot11_get_word(dot11_get_body(frame))
+
+
+#define dot11_assoc_resp_set_status_code(frame,code)\
+	dot11_set_word(dot11_get_body(frame)+2,code)
+#define dot11_assoc_resp_get_status_code(frame)\
+	dot11_get_word(dot11_get_body(frame)+2)
+
+
+#define dot11_assoc_resp_set_assoc_id(frame,id)\
+	dot11_set_word(dot11_get_body(frame)+4,id)
+#define dot11_assoc_resp_get_assoc_id(frame)\
+	dot11_get_word(dot11_get_body(frame)+4)
+
+
+
+//#define dot11_assoce_resp_get_var_body(frame) 
+//	(get_frame_body(frame)+6)
+
+
+
+#define dot11_copy_mac(src,dst)\
+	memcpy(dst,src,6);
+
+
+struct cw_Dot11Elemenst {
+
+	bstr_t supportet_rates;
+};
+
+int dot11_init_assoc_resp(uint8_t * dst);
 
 
 /**

src/cw/dot11_inline.c

@@ -31,8 +31,6 @@ uint64_t dot11_timer_get()
 	return 1000000 * tv.tv_sec + tv.tv_usec - dot11_timer_offset;
 }
 
-
-
 void dot11_timer_set(uint64_t val)
 {
 	struct timeval tv;
@@ -41,14 +39,15 @@ void dot11_timer_set(uint64_t val)
 }
 
 int  dot11_put_ssid(uint8_t *dst,uint8_t * ssid,int len){
-	dot11_put_byte(dst,DOT11_ELEM_SSID);
-	dot11_put_byte(dst+1,len);
+	dot11_set_byte(dst,DOT11_ELEM_SSID);
+	dot11_set_byte(dst+1,len);
 	memcpy(dst+2,ssid,len);
 	return len;
-
 }
 
-int dot11_put_supported_rates(uint8_t *dst, float *basic, float *rates){
+
+
+int dot11_convert_supported_rates(uint8_t *dst, float *basic, float *rates){
 	uint8_t *d = dst+2;
 	while(*basic != 0.0){
 		*d++ = 0x80 | dot11_float2rate(*basic);
@@ -65,12 +64,25 @@ int dot11_put_supported_rates(uint8_t *dst, float *basic, float *rates){
 }
 
 
+int dot11_put_supported_rates(uint8_t * dst, bstr_t src)
+{
+	int l = bstr_len(src);
+	dot11_set_byte(dst,DOT11_ELEM_SUPPORTED_RATES);
+	memcpy(dst+1, src,l+1);
+	return l+2;
+}
+
+
 int dot11_put_dsss_param_set(uint8_t *dst,int ch) {
 
-	dot11_put_byte(dst,DOT11_ELEM_DSSS_PARAM_SET);
-	dot11_put_byte(dst+1,1);
-	dot11_put_byte(dst+2,ch);
+	dot11_set_byte(dst,DOT11_ELEM_DSSS_PARAM_SET);
+	dot11_set_byte(dst+1,1);
+	dot11_set_byte(dst+2,ch);
 	return 3;
 }
 
 
+#define DOT11_INLINE 
+
+
+

src/cw/dtls_openssl.c

@@ -224,7 +224,7 @@ int dtls_openssl_set_certs(struct cw_Conn * conn, struct dtls_openssl_data *d)
 {
 	int rc;
 	if (conn->dtls_key_file && conn->dtls_cert_file){
-		SSL_CTX_set_default_passwd_cb_userdata(d->ctx, conn->dtls_key_pass);
+		SSL_CTX_set_default_passwd_cb_userdata(d->ctx, (char*)conn->dtls_key_pass);
 		SSL_CTX_set_default_passwd_cb(d->ctx, pem_passwd_cb);
 
 
@@ -291,21 +291,24 @@ return 1;
 
 
 
-
+/*
 static unsigned int psk_server_cb(SSL *ssl,const char *identity, unsigned char * psk, unsigned int max_psk_len)
 {
 	BIO * b = SSL_get_rbio(ssl);
-	struct cw_Conn * conn = BIO_get_data(b); /*->ptr;*/
+	struct cw_Conn * conn = BIO_get_data(b); //->ptr;
 
 	int l = bstr16_len(conn->dtls_psk) < max_psk_len ? bstr16_len(conn->dtls_psk) : max_psk_len;
 	memcpy(psk,conn->dtls_psk,l);
 	return l;
 }
 
+*/
 
 
-
-
+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,11 +325,9 @@ struct dtls_openssl_data * dtls_openssl_data_create(struct cw_Conn * conn, const
 		return NULL;
 	}
 
-	rc = SSL_CTX_get_security_level(d->ctx);
-	printf("Security Level is %d\n");
+//	rc = SSL_CTX_get_security_level(d->ctx);
 
 	SSL_CTX_set_security_level(d->ctx,0);
-	printf("Security Level is %d\n");
 
 	
 
@@ -340,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);
@@ -458,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/dtls_openssl_accept.c

@@ -32,7 +32,7 @@ int dtls_openssl_accept(struct cw_Conn *conn)
 	
 	if (!conn->dtls_data)
 		conn->dtls_data =
-		    dtls_openssl_data_create(conn, DTLSv1_server_method(),
+		    dtls_openssl_data_create(conn, DTLS_server_method(),
 					     dtls_openssl_bio_method());
 
 	d = (struct dtls_openssl_data *) conn->dtls_data;

src/cw/format.c

@@ -27,6 +27,10 @@
 
 #include "cw.h"
 
+#include "format.h"
+
+#include "capwap80211.h"
+
 /**
  * Format bytes as hex string.
  * @param dst Destination buffer
@@ -87,4 +91,145 @@ int format_hdr_flags(char *dst, uint8_t * th)
 
 }
 
+char * cw_format_radio_information(char * dst, int ri)
+{
+	char *d = dst;	
+	if (ri & CW_80211_RADIO_TYPE_A)
+		*d++='a';
+	if (ri & CW_80211_RADIO_TYPE_B)
+		*d++='b';
+	if (ri & CW_80211_RADIO_TYPE_G)
+		*d++='g';
+	if (ri & CW_80211_RADIO_TYPE_N)
+		*d++='n';
+
+	*d=0;
+	return dst;
+}
+
+
+static int cw_format_pkt_hdr0(char *dst, int incomming, uint8_t * packet, int len,
+		      struct sockaddr *from, int draft7)
+{
+	char sock_buf[SOCK_ADDR_BUFSIZE]; 
+	int preamble;
+	char *s;
+	int hlen, rid, wbid;
+	int frag_id,frag_offs;
+
+	s = dst;
+
+	if (incomming){
+		if (cw_get_hdr_flag_f(packet)) {
+			s += sprintf(s, "Fragment from %s",
+				     sock_addr2str_p(from,sock_buf));
+		} else {
+			s += sprintf(s, "From %s", sock_addr2str_p(from,sock_buf));
+		}
+	}
+	else{
+		if (cw_get_hdr_flag_f(packet)) {
+			s += sprintf(s, "Fragment to %s", sock_addr2str(from,sock_buf));
+		} else {
+			s += sprintf(s, "To %s", sock_addr2str(from,sock_buf));
+		}
+	}
+	s += sprintf(s, " l=%d: ", len);
+
+	preamble = cw_get_hdr_preamble(packet);
+	if (preamble == 01) {
+		s += sprintf(s, " (encrypted)");
+		return s - dst;
+	}
+
+	if (len < 4)
+		goto abort;
+
+	hlen = cw_get_hdr_hlen(packet);
+	rid = cw_get_hdr_rid(packet);
+	wbid = cw_get_hdr_wbid(packet);
+	s += sprintf(s, " H:%d R:%02d W:%02d", hlen, rid, wbid);
+
+
+	s += sprintf(s, " Flgs:");
+	s += format_hdr_flags(s, packet);
+
+	if (len < 8)
+		goto abort;
+	frag_id = cw_get_hdr_fragid(packet);
+	frag_offs = cw_get_hdr_fragoffset(packet);
+	s += sprintf(s, " Frag/Offs:%d/%d", frag_id, frag_offs);
+
+
+	if (cw_get_hdr_flag_m(packet)) {
+		/* rmac is present, print the rmac */
+		int rmac_len = cw_get_hdr_rmac_len(packet);
+		int plen = rmac_len;
+		if (rmac_len + 8 > len)
+			plen = len - 8;
+		if (rmac_len > 10)
+			plen = 10;
+
+		s += sprintf(s, " R-MAC:");
+		s += format_mac(s, cw_get_hdr_rmac_data(packet), plen);
+		if (rmac_len > 10) {
+			s += sprintf(s, " ... (len=%d)", rmac_len);
+		}
+	}
+
+	if (cw_get_hdr_flag_w(packet)) {
+		if (!draft7){
+			/* print wireless specific info */
+			int ws_len = cw_get_hdr_ws_len(packet);
+			int plen = ws_len > 20 ? 20 : ws_len;
+			s += sprintf(s, " WS:");
+			s += format_hexu(s, cw_get_hdr_ws_data(packet), plen);
+			if (ws_len > 20) {
+				s += sprintf(s, " ... (len=%d)", ws_len);
+			}
+		}
+		else {
+			int ws_len = cw_get_hdr_ws_len_7(packet);
+			int plen = ws_len > 20 ? 20 : ws_len;
+			s += sprintf(s, " WS:");
+			s += format_hexu(s, cw_get_hdr_ws_data_7(packet), plen);
+			if (ws_len > 20) {
+				s += sprintf(s, " ... (len=%d)", ws_len);
+			}
+
+		}
+	}
+	return s - dst;
+
+      abort:
+	s += sprintf(s, " Incomplete...");
+	return s - dst;
+
+}
+
+
+/**
+ * @brief Format a packet header for debugging purposes
+ * @param dst Destination buffer
+ * @param incomming True if the packet is an incomming packet, otherweise 0
+ * @param packet packet data
+ * @param len length of packet data
+ * @param from Address from where the packet was received
+ * @return Number of bytes written
+ */
+int cw_format_pkt_hdr(char *dst, int incomming, uint8_t * packet, int len,
+		      struct sockaddr *from)
+{
+	return cw_format_pkt_hdr0(dst, incomming, packet, len,
+	      from, 0);
+
+}
+
+int cw_format_pkt_hdr_7(char *dst, int incomming, uint8_t * packet, int len,
+		      struct sockaddr *from)
+{
+	return cw_format_pkt_hdr0(dst, incomming, packet, len,
+	      from, 1);
+
+}
 

src/cw/format.h

@@ -45,7 +45,6 @@ char *format_s_hex_bytes(char *dst, const char *format, const char *delim,
 
 int cw_format_scan_hex_bytes(uint8_t *dst,const char *s, int len);
 
-struct avltree;
 
 /**
  * Format bytes as a hex string. Hexadecimal letters are lower-case.
@@ -110,8 +109,16 @@ char *cw_format_dump(const uint8_t * data, int len,
 void cw_format_get_dump_defaults(struct cw_FormatDumpSettings * settings);
 int cw_format_pkt_hdr(char *dst, int incomming, uint8_t * packet, int len,
 		      struct sockaddr *from);
+int cw_format_pkt_hdr_7(char *dst, int incomming, uint8_t * packet, int len,
+		      struct sockaddr *from);
+
 int cw_format_version(char *s, const uint8_t * version, int len);
 
+char * cw_format_radio_information(char * dst, int ri);
+int cw_format_dot11_hdr(char * dst, uint8_t *packet, int len);
+int cw_format_dot11_elem(char *dst, uint8_t id, const uint8_t *src, int len);
+
+
 /**@}*/
 
 #endif

src/cw/fragman.c

@@ -54,6 +54,7 @@
 
 
 #include "capwap.h"
+#include "cw.h"
 #include "fragman.h"
 
 /**
@@ -101,20 +102,6 @@ static struct frag * frag_new(struct frag * frags, int fragid)
 	return NULL;
 }
 
-/*
-void fragman_free(frag_t * frags,struct frag * f)
-{
-	int i;
-	for (i=0; i<FRAG_MAXIDS; i++){
-		if (frags[i]->fragid==f->fragid){
-			frags[i]=NULL;
-			break;
-		}
-	}
-	free(f);
-}
-*/
-
 /**
  * Add a fragment
  * @pram frags Fragman object
@@ -129,12 +116,10 @@ uint8_t * fragman_add(frag_t * frags, uint8_t *packet, int hlen, int payloadlen)
 	uint32_t val0,val1;
 	int fragid,fragoffset;
 	int dst;
-	int ti;
 	
 	/* read the transport header dword 0,
 	 * contains hlen*/	
 	val0 = ntohl(*((uint32_t*)packet));
-/*	int hlen = (val0 >> 19) & 0x1f;*/
 
 	/* read the transport header dword 1,
 	 * contains fragid and fragoffset */	
@@ -142,33 +127,30 @@ uint8_t * fragman_add(frag_t * frags, uint8_t *packet, int hlen, int payloadlen)
 	fragid = val1>>16;
 	fragoffset=(val1 >>3) & 0x1fff;
 
-/*//	printf("Fragid = %i, offset = %i\n",fragid,fragoffset);*/
-	
-	/* determine size of payload */
-/*	int payloadlen = len - hlen*4;
-	if (payloadlen<0){
-		errno = EINVAL;
-		return NULL;
-	}
-*/
 	/* find / create cfragment */
 	f = frag_get(frags,fragid);
 	if (!f){
 		f = frag_new(frags,fragid);
-	}
 		if (!f){
 			errno = ENOMEM;
 			/* out of fragmentation space */
 			return NULL;
 		}
-
+	}
 	errno = 0;
 
 	dst = fragoffset*8;
 
 	/* copy fragment*/
 	if (dst + payloadlen < FRAG_MAXSIZE) {
-		memcpy( f->buffer+4+dst,packet+hlen,payloadlen);
+		if (fragoffset==0){
+			/* preserve header of 1st fragment */
+			memset(f->buffer,0,MAX_PKT_HDR_LEN);
+			memcpy(f->buffer,packet,hlen);
+			cw_set_hdr_hlen(f->buffer,MAX_PKT_HDR_LEN/4);
+			cw_set_hdr_flags(f->buffer, CAPWAP_FLAG_HDR_F, 0);
+		}
+		memcpy( f->buffer+MAX_PKT_HDR_LEN+4+dst,packet+hlen,payloadlen);
 		f->bytesreceived+=payloadlen;
 	}
 
@@ -177,21 +159,13 @@ uint8_t * fragman_add(frag_t * frags, uint8_t *packet, int hlen, int payloadlen)
 	}
 
 
-	for (ti=0; ti<16; ti++){
-/*//		printf("%02X ",(f->buffer+4)[ti]);*/
-
-	}
-
-
 	if (f->bytesneeded>0 && f->bytesneeded<=f->bytesreceived){
 		uint8_t * r=f->buffer;
 		f->buffer=0;
-/*//		printf("last bytes need %i\n",f->bytesneeded);*/
-		*((uint32_t*)(r))=f->bytesneeded;
+		*((uint32_t*)(r+MAX_PKT_HDR_LEN))=f->bytesneeded;
 		return r; 
 	}
 
-/*//	printf("Fragman bytes needed: %i, received  %i\n",f->bytesneeded,f->bytesreceived);*/
 	return NULL;
 }
 

src/cw/fragman.h

@@ -19,9 +19,9 @@
 
 /**
  *@defgroup Fragman FRAGMAN
- *@breif Frgaman functions
+ *@brief Frgaman functions
  *
- * Detailed esription
+ * Detailed desription
  *@{
  */
 
@@ -33,18 +33,18 @@
 #include <time.h>
 #include <unistd.h>
 
-#ifndef FRAG_MAXSIZE
+
+#define MAX_PKT_HDR_LEN 64
+
 /** maximaum size of a fragment */
-	#define FRAG_MAXSIZE 65536+4
-#endif
+#define FRAG_MAXSIZE (65536+MAX_PKT_HDR_LEN)
 
-#ifndef FRAG_MAXIDS
 #define FRAG_MAXIDS 10
-#endif
 
-#ifndef FRAG_TTL
+/**
+ * TTL of received fragment in seconds
+ */
 #define FRAG_TTL 5 
-#endif
 
 
 struct frag {
@@ -57,7 +57,7 @@ struct frag {
 	int bytesreceived;
 	int bytesneeded;
 	struct timespec t;
-	uint8_t * header;
+//	uint8_t * header;
 };
 
 typedef struct frag frag_t; /*FRAGMAN;*/

src/cw/keys.h

@@ -1,7 +1,7 @@
 #ifndef __KEYS_H
 #define __KEYS_H
 
-#define CW_KEY_WTP_DESCRIPTOR "wtp-descriptor"
+//#define CW_KEY_WTP_DESCRIPTOR "capwap/wtp-descriptor"
 
 #define CW_SKEY_HARDWARE "hardware"
 #define CW_SKEY_SOFTWARE "software"
@@ -15,8 +15,8 @@
 #define CW_SKEY_RADIOS_IN_USE	"radios-in-use"
 
 
-#define CW_KEY_WTP_NAME		"wtp-name"
-#define CW_KEY_DISCOVERY_TYPE	"discovery-type"
+//#define CW_KEY_WTP_NAME		"wtp-name"
+//#define CW_KEY_DISCOVERY_TYPE	"discovery-type"
 #define CW_KEY_WTP_MAC_TYPE	"wtp-mac-type"
 #define CW_KEY_WTP_FRAME_TUNNEL_MODE	"wtp-frame-tunnel-mode"
 

src/cw/lwapp.h

@@ -137,7 +137,7 @@
 #define LW_ELEM_DIRECT_SEQUENCE_CONTROL			14
 
 #define LW_ELEM_CHANGE_STATE_EVENT			26
-#define LW_ELEM_80211_DELETE_WLAN			28
+#define LWAPP_ELEM_80211_DELETE_WLAN			28
 
 #define LW_ELEM_AC_NAME					31
 #define LW_ELEM_LOCATION_DATA				35
@@ -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

@@ -11,6 +11,8 @@ int cw_encode_elements(struct cw_ElemHandlerParams *params, mlist_t elements_lis
 	struct mlistelem * elem;
 
 	len =0;
+	params->len=len;
+
 	mlist_foreach(elem,elements_list){
 		int l;
 		struct cw_ElemData * data;
@@ -20,8 +22,8 @@ int cw_encode_elements(struct cw_ElemHandlerParams *params, mlist_t elements_lis
 		handler = cw_msgset_get_elemhandler(params->msgset,data->proto,data->vendor,data->id);
 		params->elemdata = data;
 
-		cw_dbg(DBG_MSG_ASSEMBLY,"    Add Elem: %d %d %d %s", data->proto, data->vendor, data->id, handler->name);
 		if (handler==NULL){
+			cw_dbg(DBG_MSG_COMPOSE,"    Add Elem: %d %d %d %s", data->proto, data->vendor, data->id, handler->name);
 			cw_log(LOG_ERR,"Can't put message element %d %d %d, no handler defined.",
 					data->proto,data->vendor,data->id);
 			continue;
@@ -29,32 +31,31 @@ int cw_encode_elements(struct cw_ElemHandlerParams *params, mlist_t elements_lis
 
 		if (handler->put == NULL){
 			if (data->mand){
+				cw_dbg(DBG_MSG_COMPOSE,"    Add Elem: %d %d %d %s", data->proto, data->vendor, data->id, handler->name);
 				cw_log(LOG_ERR,"Error: Can't add mandatory message element %d - %s, no put method defined",
 					handler->id, handler->name);
 				
 			}
 			continue;
 		}
-
+/*
 		if (!data->mand){
 			if (!cw_cfg_base_exists(params->cfg_list[0],handler->key)){
-//				cw_dbg(DBG_X,"nothing todo");
+				cw_dbg(DBG_MSG_COMPOSE,"    Add Elem: %d %d %d %s %s - (skip)", 
+						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)", 
+				data->proto, data->vendor, data->id, handler->name,l);
 
-
-	/*	if(l>0)
-			cw_dbg_elem(DBG_ELEM_OUT,conn,type,handler,dst+len,l);
-	*	if (strlen(details)){
-			cw_dbg(DBG_ELEM_DETAIL,"  %s",params.debug_details);
+		len += l;
+		params->len=len;
 	}
-	*/	len += l;
-	}
-
 
 	return len;
 }
@@ -91,17 +92,15 @@ int cw_compose_message(struct cw_Conn *conn, uint8_t * rawout)
 		msg->preprocess(conn);
 	}
 
-	cw_dbg(DBG_MSG_ASSEMBLY,"*** Assembling message of type %d (%s) ***", 
+	cw_dbg(DBG_MSG_COMPOSE,"Composing message of type %d (%s) ***", 
 			msg->type, msg->name);
 	
 	dst = msgptr+8;
 	len =0;
 //cw_dbg(DBG_X,"setting with update CFG");
 	params.conn=conn;
-	params.cfg_list[0]=conn->update_cfg;
-	params.cfg_list[1]=conn->local_cfg;
-	params.cfg_list[2]=conn->global_cfg;
-	params.cfg_list[3]=NULL;
+	params.rawmsg = rawout;
+	params.cfg_list=conn->cfg_list;
 	params.msgset=conn->msgset;
 	params.msgdata=msg;
 	params.debug_details=details;
@@ -114,7 +113,7 @@ int cw_compose_message(struct cw_Conn *conn, uint8_t * rawout)
 		
 		data =  mlistelem_dataptr(elem);
 		handler = cw_msgset_get_elemhandler(conn->msgset,data->proto,data->vendor,data->id);
-		cw_dbg(DBG_MSG_ASSEMBLY,"    Add Elem: %d %d %d %s", data->proto, data->vendor, data->id, handler->name);
+		cw_dbg(DBG_MSG_COMPOSE,"    Add Elem: %d %d %d %s", data->proto, data->vendor, data->id, handler->name);
 		if (handler==NULL){
 			cw_log(LOG_ERR,"Can't put message element %d %d %d, no handler defined.",
 					data->proto,data->vendor,data->id);
@@ -151,8 +150,8 @@ int cw_compose_message(struct cw_Conn *conn, uint8_t * rawout)
 //	}
 
 	cw_set_msg_elems_len(msgptr, len);
-	cw_dbg(DBG_MSG_ASSEMBLY,"*** Done assenmbling message of type %d (%s) ***", 
-			msg->type, msg->name);
+	//cw_dbg(DBG_MSG_COMPOSE,"*** Done assenmbling message of type %d (%s) ***", 
+//			msg->type, msg->name);
 	if (type & 1) {
 		/* It's a request, so we have to set seqnum */
 		int s = conn_get_next_seqnum(conn);
@@ -161,8 +160,8 @@ int cw_compose_message(struct cw_Conn *conn, uint8_t * rawout)
 
 
 	{
-	printf ("----------------------------------- redecode -----------------------------\n");
-	uint8_t *elems_ptr;
+//	printf ("----------------------------------- redecode -----------------------------\n");
+/*	uint8_t *elems_ptr;
 
 	int offset = cw_get_hdr_msg_offset(rawout);
 
@@ -178,7 +177,7 @@ int cw_compose_message(struct cw_Conn *conn, uint8_t * rawout)
 	params.msgset=conn->msgset;
 	params.msgdata=msg;
 	params.mand_found = mavl_create_conststr();
-
+	params.dbg_level = DBG_ELEM_OUT;
 
 	cw_decode_elements( &params, elems_ptr,elems_len);
 	cw_cfg_destroy(cfg);
@@ -186,8 +185,8 @@ int cw_compose_message(struct cw_Conn *conn, uint8_t * rawout)
 		cw_check_missing_mand(msg, params.mand_found,conn->msgset->handlers_by_key);
 		mavl_destroy(params.mand_found);
 	}
-
-	printf ("----------------------------------- end redecode -----------------------------\n");
+*/
+//	printf ("----------------------------------- end redecode -----------------------------\n");
 
 	}
 
@@ -222,7 +221,10 @@ int cw_decode_element(struct cw_ElemHandlerParams *params, int proto,
 	elem_data_search.id = elem_id;
 	elem_data_search.proto = proto;
 	elem_data_search.vendor = vendor;
+	if (params->msgdata)
 		elem_data = mavl_get(params->msgdata->elements_tree, &elem_data_search);
+	else
+		elem_data = NULL;
 	if (!elem_data) {
 		cw_dbg(DBG_ELEM_ERR, "Element %d - %s, not allowed here",
 		       elem_id, handler->name);
@@ -231,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);
@@ -244,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);
@@ -251,7 +261,8 @@ int cw_decode_element(struct cw_ElemHandlerParams *params, int proto,
 		return -1;
 	}
 
-	cw_dbg_elem(DBG_ELEM_IN, NULL, params->msgdata->type, handler,
+	if (!handler->flags || cw_dbg_is_level(DBG_ELEM_VNDR))
+		cw_dbg_elem(params->dbg_level, NULL, params->msgdata->type, handler,
 			    data, len);
 
 	if (handler->get == NULL) {
@@ -274,7 +285,6 @@ int cw_decode_elements(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr
 
 	//mand_found = mavl_create_conststr();
 	//unrecognized = mlist_create(NULL,NULL,sizeof(uint8_t*));
-
 	cw_foreach_elem(elem, elems_ptr, elems_len) {
 		int rc;
 

src/cw/mod.c

@@ -119,7 +119,7 @@ void cw_mod_set_path(const char *path)
  * @param mod_name Name of the module
  * @return a pointer to the module interface
  */
-struct cw_Mod *cw_mod_load(const char *mod_name, mavl_t global_cfg, int role)
+struct cw_Mod *cw_mod_load(const char *mod_name, cw_Cfg_t * global_cfg, int role)
 {
 	struct cw_Mod search;
 	struct cw_Mod *mod;
@@ -139,14 +139,14 @@ struct cw_Mod *cw_mod_load(const char *mod_name, mavl_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, mavl_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, mavl_t global_cfg, int role)
 		goto errX;
 	}
 
-	cw_dbg(DBG_MOD, "MOD: %s sucessfull loaded, calling init now.", filename);
-	mod->init(mod, global_cfg, role);
+	cw_dbg(DBG_MOD, "Module %s sucessfull loaded, calling init now.", filename);
+	if (!mod->init(mod, global_cfg, role)){
+		dlclose(handle);
+		mod=NULL;
+	}		
 	
       errX:
 	free(filename);

src/cw/mod.h

@@ -29,7 +29,7 @@
 
 #include "sock.h"
 #include "conn.h"
-
+#include "cfg.h"
 
 enum {
 	CW_MOD_MODE_CAPWAP,
@@ -44,7 +44,7 @@ struct cw_Mod {
 	const char *name;
 
 	/** Initializion method */
-	int (*init) (struct cw_Mod *mod, mavl_t global_cfg, int role);
+	int (*init) (struct cw_Mod *mod, cw_Cfg_t * global_cfg, int role);
 
 	/** Detect capwap 
 	 * This function is called after receiving and disassembling a complete 
@@ -93,7 +93,7 @@ extern int mod_caching;
 #define mod_set_caching(var) (mod_caching=var)
 #define mod_get_caching() (mod_caching)
 
-struct cw_Mod * cw_mod_load(const char * mod_name, mavl_t global_cfg, int role);
+struct cw_Mod * cw_mod_load(const char * mod_name, cw_Cfg_t * global_cfg, int role);
 struct cw_Mod * cw_mod_add_to_list(struct cw_Mod * mod );
 struct cw_Mod * cw_mod_detect(struct cw_Conn *conn, 
 			uint8_t * rawmsg, int len,