Removed libwifi dependencies

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

INSTALL

@@ -1,40 +1,34 @@
 pre-requisites to build actube
 ==============================
 
+Compile 
+=======
 
-
+FreeBSD 
-
-
-On FreeBSD 10.2
 ----------------
 
-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
-apt-get install libconfuse-dev
+apt install libedit-dev
-apt-get install libsqlite3-dev
+apt install bmake
-
-
-
-pre-requisites to build wtp
-===========================
-
-Ubuntu 14.04
-------------
-
-apt-get install cmake
-apt-get install libnl-genl-3-dev
 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>

include/README

@@ -0,0 +1 @@
+this is an include directroy

src/LocalDefs-example.mak

@@ -0,0 +1,6 @@
+
+CFLAGS+=-Wall -g -O0 -fsanitize=address -fPIC
+LIBS=-lasan
+CC=clang
+
+

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 $(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/cfg.h"
-#include "cw/mavltypes.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;
 			}
 
@@ -93,10 +124,21 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
 			case '?':
 				exit(EXIT_FAILURE);
 			default:
-			case 'h':
+			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";
 
@@ -229,12 +274,8 @@ 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);
@@ -282,6 +329,7 @@ int ac_run(cw_Cfg_t * cfg)
 {
         struct cw_Cfg_iter cfi;
 	const char *s;
+	struct cw_Cfg_entry *e;
 	int i;
 
 
@@ -292,16 +340,17 @@ int ac_run(cw_Cfg_t * cfg)
 	 * good unicast reply socket */
 	
         cw_cfg_iter_init(cfg, &cfi, "actube/listen");
-        for (i=0; (s = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
+        for (i=0; (e = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
 
 		char addr[100];
 		char port[50];
 		int proto;
+		s=e->val;
 		
 		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/ipv4",1),
-				cw_cfg_get_bool(cfg,"actube/ipv6","true")
+				cw_cfg_get_bool(cfg,"actube/ipv6",1)
 				);
         }
 	if (!i) {
@@ -337,11 +386,12 @@ int ac_run(cw_Cfg_t * cfg)
         //mavl_print(cfg,pcb,180);
 
         cw_cfg_iter_init(cfg, &cfi, "actube/bcast");
-        for (i=0; (s = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
+        for (i=0; (e = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
 //	for (i = 0; i < conf_bcast_addrs_len; i++) {
 	
 		char addr[50], port[50];
 		int proto;
+		s=e->val;
 		conf_parse_listen_addr (s, addr, port, &proto);
 		
 		socklist_add_broadcast (addr, port, proto);
@@ -408,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);
 				
 			}
 			
@@ -421,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);
 			}
 			
 		}
@@ -435,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);
@@ -454,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;
 	
@@ -485,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];
 	
@@ -505,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);
 		
@@ -526,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);
-	wtpman_addpacket (wtpman, buffer, len);
+	else{
+//		cw_dbg(DBG_X,"Data packet received");
+		wtpman_datapacket (wtpman, buffer, len);
+	}
 	wtplist_unlock();
 }
 
@@ -599,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 "cw/dbg.h"
-
+#include "cw/cw.h"
-     #include <sys/param.h>
+#include "cw/cfg.h"
-     #include <sys/time.h>
-     #include <sys/socket.h>
-     #include <net/if.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_salist_len = 0;
-int conf_bsalist_len = 0;
+//int conf_bsalist_len = 0;
 
-struct sockaddr *conf_ac_ips;
+//struct sockaddr *conf_ac_ips;
-int conf_ac_ips_len;
+//int conf_ac_ips_len;
 
-char *conf_sslcertfilename = NULL;
+//char *conf_sslcertfilename = NULL;
-char *conf_sslkeyfilename = NULL;
+//char *conf_sslkeyfilename = NULL;
-char *conf_sslkeypass = NULL;
+//char *conf_sslkeypass = NULL;
-char *conf_dtls_psk = 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,8 @@ 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;
 
 	struct cw_Cfg_iter cfi;
@@ -511,11 +453,8 @@ static int init_mods(cw_Cfg_t *cfg){
 //	cw_mod_set_path(conf_mods_dir);
 
         cw_cfg_iter_init(cfg, &cfi, "actube/mod");
-printf("iter mods\n");	
+        for (i=0; (e = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
-        for (i=0; (modname = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
+		modname = e->val;
-
-		printf("init mod name: %s\n",modname);
-
 		struct cw_Mod * mod = cw_mod_load(modname, cfg, CW_ROLE_AC);
 		
 		if (!mod)
@@ -606,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
+# This catches the initial config af a connecting WTP
-ac-descriptor/hardware/version: .x01000001
+# From Discovery to CFG Update
-ac-descriptor/max-wtps : 200
+# The config is saved to a file named
-ac-descriptor/active-wtps:  2
+# wtp-<wtpname-or-ip>.cfg
-ac-descriptor/r-mac-field: 1
+#
-ac-descriptor/reserved1 : 0
+actube/save-initial-wtp-config: true
-ac-descriptor/security : 2
+
-ac-descriptor/software/vendor : 0
+capwap/ac-descriptor/dtls-policy:  1
-ac-descriptor/software/version: v0.0.1
+capwap/ac-descriptor/hardware/vendor: 4232704
-ac-descriptor/station-limit: 1000
+capwap/ac-descriptor/hardware/version: .x01000001
-ac-descriptor/stations: 0
+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/change-state-pending-timer: 3
-capwap-timers/data-check-timer: Word: 10
+capwap/timers/data-check-timer: 10
-capwap-timers/echo-interval :Byte: 30
+capwap/timers/echo-interval: 30
-capwap-timers/max-discovery-interval :Byte: 10
+capwap/timers/max-discovery-interval: 10
+capwap/decryption-error-report-period: 120
+capwap/idle-timeout: 300
+
+
+
+
+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 cw_Conn *nc1 = ((struct dataman *) d1)->nc;
-	struct netconn *nc2 = ((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;
-
+	memset(dm,0,sizeof(struct dataman));
-	dm->nc = netconn_create(sock, addr, 100);
+	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);
 
@@ -114,8 +116,10 @@ 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)){
+			cw_read_messages(dm->nc);
+		}
+	}
+
+	
+
 	while (!cw_timer_timeout(timer)){
-		netconn_read_messages(dm->nc);
+		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

@@ -4,6 +4,7 @@
 #include "cw/mlist.h"
 #include "mavl.h"
 #include "cw/mod.h"
+#include "cw/dbg.h"
 
 #include "discovery_cache.h"
 struct cw_DiscoveryCacheElem{
@@ -108,15 +109,24 @@ errX:
 void discovery_cache_add(struct cw_DiscoveryCache *cache, 
 	struct sockaddr * addr, struct cw_Mod  * mod_capwap, struct cw_Mod * mod_bindings)
 {
+
+	{
+		cw_dbg(DBG_X,"//////////////////////////   ADDD CAHCE ///////////////////////");
+		char str[128];
+	sock_addrtostr(addr,str,128,1);
+	}
+
 	struct cw_DiscoveryCacheElem * cur = cache->queue+cache->qpos;
 	if (cur->cmod!=NULL){
 		/* delete here */
+
+		cw_dbg(DBG_X,"DOIN MAVL DEL ----- ///////////");
+
 		void * ptr = &cur;
 		mavl_del(cache->byaddr,ptr);
-		mavl_del(cache->byaddr,ptr);
+		mavl_del(cache->byaddrp,ptr);
-
 	}
-	
+
 	cur->cmod=mod_capwap;
 	cur->bmod=mod_bindings;
 	sock_copyaddr(&cur->addr,addr);
@@ -144,9 +154,22 @@ int discovery_cache_get(struct cw_DiscoveryCache * cache,struct sockaddr *addr,
 	sock_copyaddr(&search.addr,addr);
 	search.ctrhi=search.ctrlo=0;
 	
+	{
+	cw_dbg(DBG_X,"DISCOVERY CACHE ---------------------------- GET ENTER");
+	char str[128];
+	sock_addrtostr(addr,str,128,1);
+	}
+
 	search_ptr = &search;
 	result = mavl_get(cache->byaddrp ,&search_ptr);
 	if (result != NULL){
+		{
+		cw_dbg(DBG_X,"DISCOVERY CACHE ---------------------------- FOUND 1 with Port");
+		char str[128];
+		sock_addrtostr(addr,str,128,1);
+		}
+
+
 		elem = *result;
 		if (elem != NULL){
 			mavl_del(cache->byaddr,result);
@@ -166,14 +189,36 @@ int discovery_cache_get(struct cw_DiscoveryCache * cache,struct sockaddr *addr,
 	result = mavl_get_first(cache->byaddr, &search_ptr);
 	if (result == NULL)
 		return 0;
+	{
+	cw_dbg(DBG_X,"DISCOVERY CACHE ---------------------------- DOUND BY ADDR");
+	char str[128];
+	sock_addrtostr(addr,str,128,1);
+	}
+
 
 	elem = *result;
 	if (elem != NULL){
+		cw_dbg(DBG_X,"elem != NULL");
+		
+	{
+	cw_dbg(DBG_X,"DISCOVERY CACHE ---------------------------- DOUND BY ADDR");
+	char str[128];
+	sock_addrtostr((struct sockaddr*)&elem->addr,str,128,1);
+	printf("ELEM addr: %s\n",str);
+	}
+
+
+		
+
+
 		if (sock_cmpaddr((struct sockaddr*)&elem->addr,addr,0)!=0)
 			return 0;
 			
-		mavl_del(cache->byaddr,result);
+		cw_dbg(DBG_X,"DOIN MAVL DEL HERO ----- ///////////");
-		mavl_del(cache->byaddrp,result);
+		mavl_del(cache->byaddr,&elem);
+		cw_dbg(DBG_X,"DOIN MAVL DEL HERXXXXXXO ----- ///////////");
+		mavl_del(cache->byaddrp,&elem);
+		cw_dbg(DBG_X,"DOIN MAVL DEL HERO 0000 ----- ///////////");
 		
 		*modcapwap=elem->cmod;
 		*modbindings=elem->bmod;

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,497 +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 {
-		show_cfg(sd->out,conn->remote_cfg);
-	}
-	wtplist_unlock();
-}
-
-void ucfg_cmd(struct shelldata *sd, const char *cmd)
-{
-	struct cw_Conn * conn;
-	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)
-{
-	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, "%s\t\t%s\n", addr, wtp_name);
-	}
-	wtplist_unlock();
-}
-
-
-
-struct cw_Conn * find_ap(const char *name)
-{
-	struct connlist * cl;
-	mavliter_t it;
-
-	/*wtplist_lock();*/
-	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)
-{
-	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);
-		
-		{
-			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;
-	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];
-	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,20 +300,105 @@ 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;
 	conn = wtpman->conn;
 
-	wtpman->conn->remote_cfg = cw_cfg_create();
+//	wtpman->conn->remote_cfg = cw_cfg_create();
 
 
 	if (!wtpman->dtlsmode) {
@@ -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_join;
-		int wait_change_state;
+		//int wait_change_state;
 
 
 
@@ -358,259 +447,31 @@ static void *wtpman_main(void *arg)
 
 
 		while (!cw_timer_timeout(timer)) {
-			if (conn->update_cfg != NULL) {
+			rc = run_update(wtpman);
-				mavl_t tmp;
+			if (rc !=EAGAIN)
-
+				break;
-
-				tmp = conn->local_cfg;
-
-/*				mavl_merge(conn->default_cfg, conn->local_cfg);*/
-/*				mavl_merge(conn->default_cfg, conn->remote_cfg);*/
-
-				conn->local_cfg = conn->update_cfg;
-
-
-
-
-
-				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->remote_cfg, conn->update_cfg);
-
-				conn->update_cfg = NULL;
-				conn->local_cfg = tmp;
-			}
-
 
 			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);
-}
-
-
 
 void wtpman_destroy(struct wtpman *wtpman)
 {
@@ -626,53 +487,147 @@ void wtpman_destroy(struct wtpman *wtpman)
 
 static void copy(struct cw_ElemHandlerParams * params)
 {
-	struct wtpman * wtpman;
+        cw_cfg_copy(params->cfg, params->conn->remote_cfg,DBG_CFG_UPDATES,"GlobalCfg");
-	wtpman = (struct wtpman*)params->conn->data;
-
-	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,wtpman->wtp_cfg);
-	cw_dbg(DBG_X,"Copying done.");
 }
 
-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)
 {
-	cw_dbg(DBG_X,"JOIN Callback");
+	catch_cfg(params,0,"\n#\n# Join Request\n#\n");
-	copy(params);
+	if (d->parent)
-	cw_cfg_clear(params->cfg);
+		return d->parent->fun(params,d->parent);
-	return 0;
-}
-
-static int update_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
-{
-	cw_dbg(DBG_X,"UPDATE Callback");
-	copy(params);
-	cw_cfg_clear(params->cfg);
 	return 0;
 }
 
 
-
+/*
-
+static int fill_update_cfg(struct cw_Conn * conn)
-static setup_complete(struct cw_Conn *conn)
 {
+	struct cw_Cfg_iter cfi;
+	struct cw_Cfg_entry *e;
+	cw_Cfg_t * u;
+	u=cw_cfg_create();
+	if( cw_cfg_load("status_response.ckv",u)){
+		cw_log(LOG_ERR,"Cant load file");
+		stop();
+	};
+	cw_cfg_dump(conn->remote_cfg);
+        cw_cfg_iter_init(u, &cfi, NULL);
+	while ((e = cw_cfg_iter_next(&cfi, NULL))!=NULL){
+		const char * r;
+		r = cw_cfg_get(conn->remote_cfg, e->key, "[]");
+	//	cw_dbg(DBG_CFG_UPDATES,"check: %s: %s",e->key,e->val);
+		if (strcmp(r,e->val)==0)
+			continue;
+
+		cw_dbg(DBG_CFG_UPDATES,"Status reps: %s: %s -> %s",e->key,r,e->val);
+	}
+
+	return 0;
+}
+*/
+
+static int 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;
-//	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");
 
+	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;
+}
+
+
+
 
 
 struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
@@ -680,7 +635,7 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 {
 	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;
@@ -688,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,
@@ -702,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);
@@ -718,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();
@@ -730,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;
@@ -755,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();
@@ -781,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)
+//	               if (wtpman->conn->setup_complete)
-        	                wtpman->conn->setup_complete(wtpman->conn);
+//        	                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;
@@ -798,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);
 }
 
@@ -807,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/contrib/install_libmavl.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION="1.1.0a"
+VERSION="1.2.0"
 
 wget -O libmavl-${VERSION}.tgz ftp://ftp.planix.org/pub/planix/libmavl-${VERSION}.tgz
 tar xzvf libmavl-${VERSION}.tgz

src/contrib/libmavl-LocalDefs.mak

@@ -4,3 +4,4 @@ PREFIX=../../..
 INSTALL_LIB_DIR := /lib/$(KERNEL)/$(ARCH)
 INSTALL_INCLUDE_DIR := /include
 
+CFLAGS+=-fPIC

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\
@@ -34,12 +28,10 @@ CWSRC=\
 	cw_load_file.c\
 	cw_out_generic_with_index.c\
 	cw_out_radio_administrative_states.c\
-	cw_process_element.c\
 	cw_put_elem_radio_administrative_state.c\
 	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\
@@ -64,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,38 +71,16 @@ CWSRC=\
 #	cw_in_generic.c\
 #	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=\
-	cw_ktv_add.c\
-	cw_ktv_cast.c\
-	cw_ktv_replace.c\
-	cw_ktv_add_from_str.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.c\
-	cw_ktv_get_word.c\
-	cw_ktv_get_dword.c\
-	cw_ktv_get_sysptr.c\
-	cw_ktv_get_str.c\
-	cw_ktv_idx_get.c\
-	cw_ktv_mavlcmp.c\
-	cw_ktv_mavlcmp_type_by_name.c\
-	cw_ktv_mavldel.c\
-	cw_ktv_read_file.c\
-	cw_ktv_readline.c\
-	cw_ktv_read_struct.c\
-	cw_ktv_write_struct.c\
-	cw_ktv_std_types.c\
-	cw_ktv_save.c\
 	cfg.c\
 
-#	cw_ktv_parser.c\
-#	cw_ktv_del_sub.c\
-#	cw_ktv_base_exists.c\
 
 LWSRC=\
 	lw_addelem.c\
@@ -162,7 +134,8 @@ LOGSRC=\
 	log_errno.c\
 	log_syslog.c\
 	dbg.c\
-	dbg_strings.c\
+
+#	dbg_strings.c\
 
 MISCSRC=\
 	bstr16_create.c\
@@ -181,7 +154,6 @@ MISCSRC=\
 	conn_create_noq.c\
 	connlist.c\
 	conn_prepare_image_data_request.c\
-	cw_decode_msg.c \
 	conn_q_add_packet.c\
 	conn_q_get_packet.c\
 	conn_q_recv_packet.c\
@@ -194,18 +166,20 @@ MISCSRC=\
 	format.c\
 	format_is_utf8.c\
 	fragman.c\
-	intavltree.c\
 	md5sum.c\
 	mod.c\
 	msgset.c\
 	send.c\
 	strheap.c\
-	netconn.c\
 	conn.c \
 	val.c \
 	discovery.c\
+	message.c\
+	cw_out_radio_generic_struct.c\
 
 
+#	intavltree.c\
+
 #	conn_q_wait_packet.c\
 #	conn_init.c\
 #	conn_create.c\
@@ -213,6 +187,7 @@ MISCSRC=\
 #	cw_put_msg.c\
 #	conn_process_packet.c\
 #	conn_destroy.c\
+	netconn.c\
 
 DTLSSRC+=\
 	dtls_bio.c\
@@ -220,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
@@ -465,9 +465,9 @@ enum cw_reboot_failure_types {
 /** 
  * The Missing AC List Result Code is sent by the 
  * WTP to the AC when the AC List is missing */
-#define CW_RESULT_MISSING_AC_LIST				1
+#define CW_RESULT_MISSING_AC_LIST					1
-#define CAPWAP_RESULT_SUCCESS_NAT				2
+#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;
@@ -128,7 +155,7 @@ const char *cw_cfg_get_l(cw_Cfg_t ** cfg, const char * key, const char *def)
 	struct cw_Cfg_entry e, *r;
 	for(i=0; cfg[i]!=NULL; i++){
 		e.key = key;
-		r = mavl_get(cfg[i], &e);
+		r = mavl_get(cfg[i]->cfg, &e);
 		if (r!=NULL)
 			return r->val;
 	}
@@ -149,11 +176,29 @@ bstr16_t cw_cfg_get_bstr16(cw_Cfg_t * cfg, const char * key, const char *def)
 
 	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);
@@ -166,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);
@@ -175,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;
@@ -456,13 +522,13 @@ int cw_cfg_read_from_file(FILE * f, cw_Cfg_t * cfg)
 	return errs;
 }
 
-
 int cw_cfg_load(const char *filename, cw_Cfg_t * cfg)
 {
 	int errs;
 	FILE *f = fopen(filename, "rb");
 	if (!f)
 		return errno;
+	errno=0;
 	errs = cw_cfg_read_from_file(f, cfg);
 	fclose(f);
 
@@ -471,32 +537,94 @@ 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->cfg);
+	mavliter_foreach(&it) {
+		int n;
+		e = mavliter_get(&it);
+		n=strlen(e->val);
+		if (n>0) 
+			n-=1;
+
+//printf("Write %s: \"%s\"   - %d %d (%02x)\n",e->key,e->val,n,isspace(e->val[n]),e->val[n]);
+		if(isspace(e->val[0]) || isspace(e->val[n]))
+			fprintf(f,"%s: \"%s\"\n", e->key, e->val);
+		else
+			fprintf(f,"%s: %s\n", e->key, e->val);
+
+		//cw_dbg(dbglevel,"%s%s :%s: %s",prefix,data->key,type->get_type_name(data), value);
+	}
+	return 0;
+}
+
+
+int cw_cfg_save(const char *filename, cw_Cfg_t *cfg, const char *format, ...)
+{
+	int rc;
+	FILE *f = fopen(filename, "wb");
+	if (!f)
+		return errno;
+	if (format !=NULL){
+		va_list args;
+		va_start(args,format);
+		vfprintf(f,format,args);
+		va_end(args);
+	}
+	rc = cw_cfg_write_to_file(f, cfg);
+	fclose(f);
+
+	return rc;
+}
+
 
 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);
-	mavliter_seek(&(cfi->it), &search, 0);
+	if (base == NULL){
+		mavliter_seek_set(&(cfi->it));
+		mavliter_next(&(cfi->it));
+	}
+	else
+		mavliter_seek(&(cfi->it), &search, 0);
 	cfi->base = base;
 }
 
 
-const char *cw_cfg_iter_next(struct cw_Cfg_iter *cfi, const char *key)
+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;
 
@@ -505,34 +633,45 @@ const char *cw_cfg_iter_next(struct cw_Cfg_iter *cfi, const char *key)
 			return NULL;
 		else {
 			mavliter_next(&(cfi->it));
-			return e->val;
+			return e;
 		}
 
 	}
-	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->val;
+	return e;
 }
 
 
-int cw_cfg_get_bool(cw_Cfg_t * cfg, const char * key, const char *def)
+int cw_cfg_get_bool(cw_Cfg_t * cfg, const char * key, int def)
 {
 	struct cw_Val v;
-	const char *s = cw_cfg_get(cfg,key,def);
+	const char *s = cw_cfg_get(cfg,key,NULL);
+	if (s==NULL)
+		return def;
 	CW_TYPE_BOOL->from_str(&v,s);
 	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;
@@ -555,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);
@@ -567,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)
 {
@@ -586,8 +745,7 @@ void cw_cfg_set_int(cw_Cfg_t * cfg, const char * key, int val)
 }
 
 
-
+int cw_cfg_get_new_index(cw_Cfg_t * cfg, const char *key)
-int cw_cfg_get_next_index(cw_Cfg_t * cfg, const char *key)
 {
 	char ikey[CW_CFG_MAX_KEY_LEN];
 	struct cw_Cfg_entry search, * result;
@@ -598,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;
 	}
@@ -614,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;
@@ -640,34 +838,56 @@ 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;
 
+
 		e = mavliter_get(&it);
 		new_elem.key = cw_strdup(e->key);
 		new_elem.val = cw_strdup(e->val);
 
-		old_elem = mavl_insert(dst,&new_elem,&exists);
+/*		if (1){
+			const char *ov;
+			ov = cw_cfg_get(dst,e->key,NULL);
+			cw_dbg(DBG_X, "   REAL OV HERE: %s",ov);
+		}
+*/
+
+
+		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){
+			const char *ov;
+			ov = cw_cfg_get(dst,e->key,NULL);
+			cw_dbg(DBG_X, "   OV HERE: %s",ov);
+		}
+*/
+		
 		if (!exists){
-			cw_dbg(DBG_X, "New: %s: %s",new_elem.key,new_elem.val);
+			cw_dbg(dbg_level, "%s: [undef] -> %s",new_elem.key,new_elem.val);
 			continue;
 		}
+
+
+
 		if (strcmp(new_elem.val,old_elem->val)==0){
 			free((void*)new_elem.key);
 			free((void*)new_elem.val);
 			continue;
 		}
 
-		cw_dbg(DBG_X, "Replace: %s: %s (old: %s)",new_elem.key, new_elem.val, old_elem->val);
+		cw_dbg(dbg_level, "%s: %s -> %s",new_elem.key,old_elem->val,new_elem.val);
-		if(dst->del){
+//		cw_dbg(DBG_X, "Replace: %s: %s (old: %s)",new_elem.key, new_elem.val, old_elem->val);
-			dst->del(old_elem);
+		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);
 	}
 
 }
@@ -675,32 +895,84 @@ 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;
+	int rl,kl;
+	char skey[CW_CFG_MAX_KEY_LEN];
+	char * delimiters = "/.";
+	char * d;
 
-        e.key=key;
+	/* can we find the base exactly ?*/
-        result = mavl_get_first(cfg,&e);
+	if (cw_cfg_get(cfg,key,NULL)!=NULL)
-        if (result == NULL)
-                return 0;
-
-	if (strlen(result->key)<strlen(key))
-		return 0;		
-	if (result->key[strlen(key)]!='/' && result->key[strlen(key)]!='.')
-		return 0;
-	if (strncmp(result->key,key,strlen(key))==0)
 		return 1;
 
-	return 0;
 
+	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;
+}
+
+int cw_cfg_base_exists_l(cw_Cfg_t ** cfgs, const char *key)
+{
+	int i;
+	for(i=0; cfgs[i]; i++){
+		if (cw_cfg_base_exists(cfgs[i],key))
+			return 1;
+	}
+//	cw_dbg(DBG_X,"NOX EXISIS: %s in %d",key,i);
+	return 0;
+}
+
+
+
+cw_Val_t * cw_cfg_get_val_l(cw_Cfg_t ** cfgs, const char *key, const struct cw_Type *type)
+{
+	const char *s;
+	cw_Val_t * val;
+	s = cw_cfg_get_l(cfgs,key,NULL);
+	val = malloc(sizeof(cw_Val_t));
+	if (val==NULL)
+		return NULL;
+	val->type=type;
+	val->type->from_str(val,s);
+	return val;
 }

src/cw/cfg.h

@@ -5,9 +5,46 @@
 #include "val.h"
 #include "bstr.h"
 
-#define CW_CFG_MAX_KEY_LEN 1024
 
-typedef struct mavl cw_Cfg_t;
+/**
+ *@file
+ *@brief
+ *@defgroup CFG SOCK
+ *@{
+ */
+
+
+/** Maximum size of a key used in cfg objects */
+#define CW_CFG_MAX_KEY_LEN 1024	
+
+/** Default name for fresh cfg's created by #cw_cfg_create */ 
+#define CW_CFG_DEFAULT_NAME "[anonymous]"
+
+
+/**
+ * A Cfg object 
+ */
+struct cw_Cfg {
+	struct mavl * cfg;	/**< The AVL-tree containig the keys 
+				     and vals */
+	const char *name;	/**< A name for this config object */
+	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;
@@ -28,28 +60,44 @@ struct cw_Cfg_iter{
 
 const char * cw_cfg_get(cw_Cfg_t * cfg, const char *key, const char *def);
 
-const char *cw_cfg_iter_next(struct cw_Cfg_iter *cfi, const char *key);
+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, const char *def);
+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);
 uint8_t cw_cfg_get_byte_l(cw_Cfg_t ** cfgs, char *key, uint8_t def);
+cw_Val_t * cw_cfg_get_val_l(cw_Cfg_t ** cfgs, const char *key, const struct cw_Type *type);
+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))
@@ -60,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,153 +24,12 @@
 
 #include "dtls.h"
 
-
+#define MAX_MSG_CBS 5
-/**
- * Put a message to a buffer
- * This functions assumes, that a message header is
- * alread initilaized in buffer 
- * Message alements are taken fom actiondef in #conn->action
- */
-int cw_assemble_message(struct cw_Conn *conn, uint8_t * rawout)
-{
-	char details[1024];
-	uint8_t *msgptr,*dst;
-	int type;
-	struct cw_MsgData * msg;
-	struct mlistelem * elem;
-	int len,l;
-
-	/* rawout is already initialized, so we can get 
-	 * msg type from buffer */
-	msgptr = rawout + cw_get_hdr_msg_offset(rawout);
-	type = cw_get_msg_type(msgptr);
-
-	/* look for message data */
-	msg = cw_msgset_get_msgdata(conn->msgset,type);
-	if (msg == NULL){
-		cw_log(LOG_ERR,"Error: Can't create message of type %d (%s) - no definition found.",
-			type, cw_strmsg(type));
-		return CAPWAP_RESULT_MSG_UNRECOGNIZED;
-	}
-
-	if (msg->preprocess){
-		msg->preprocess(conn);
-	}
-
-	cw_dbg(DBG_MSG_ASSEMBLY,"*** Assembling message of type %d (%s) ***", 
-			msg->type, msg->name);
-	
-	dst = msgptr+8;
-	len =0;
-	mlist_foreach(elem,msg->elements_list){
-		struct cw_ElemData * data;
-		struct cw_ElemHandler * handler;
-		struct cw_ElemHandlerParams params;
-		
-		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);
-		if (handler==NULL){
-			cw_log(LOG_ERR,"Can't put message element %d %d %d, no handler defined.",
-					data->proto,data->vendor,data->id);
-			continue;
-		}
-
-
-		if (handler->put == NULL){
-			if (data->mand){
-				cw_log(LOG_ERR,"Error: Can't add mandatory message element %d - %s, no put method defined",
-					handler->id, handler->name);
-				
-			}
-			continue;
-		}
-
-		params.conn=conn;
-		params.cfg=conn->remote_cfg;
-		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.msgset=conn->msgset;
-
-
-
-		params.elemdata = data;
-		params.msgdata=msg;
-		params.debug_details=details;
-		*details=0;
-
-/*		if (strcmp(handler->key,"cisco/ap-led-flash-config")==0){
-			printf("flash config\n");
-			 cisco/ap-led-flash-config/flash-enable 
-		}*/
-		
-		if (!data->mand){
-			if (!cw_cfg_base_exists(params.cfg,handler->key)){
-				cw_dbg(DBG_X,"nothing todo");
-				continue;
-			}
-		
-		}
-		l = handler->put(handler,&params,dst+len);
-
-
-	/*	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;
-	}
-
-	cw_set_msg_elems_len(msgptr, len);
-	cw_dbg(DBG_MSG_ASSEMBLY,"*** 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);
-		cw_set_msg_seqnum(msgptr,s);
-	}
-
-
-	{
-	printf ("----------------------------------- redecode -----------------------------\n");
-	uint8_t *elems_ptr;
-
-	int offset = cw_get_hdr_msg_offset(rawout);
-
-	uint8_t *msg_ptr = rawout + 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();
-
-	struct cw_ElemHandlerParams params;
-
-	params.cfg=cfg;
-	params.msgset=conn->msgset;
-	params.msgdata=msg;
-
-
-	cw_decode_elements( &params, elems_ptr,elems_len);
-	cw_cfg_destroy(cfg);
-
-	printf ("----------------------------------- end redecode -----------------------------\n");
-
-	}
-
-	return CAPWAP_RESULT_SUCCESS;
-
-
-}
-
-
 
 struct msg_callback{
-	int type; /**< message type */
+	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)
@@ -199,19 +58,60 @@ void cw_conn_init(struct cw_Conn * conn)
 	conn->process_message=process_message;
 
 	conn->msg_callbacks = mavl_create(msg_callback_cmp,NULL,sizeof(struct msg_callback));
+
+	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;
+	cb.data[0].fun = fun;
-	mavl_insert(conn->msg_callbacks,&cb,&exists);
+	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;
@@ -220,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
@@ -243,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();
@@ -277,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;
@@ -287,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;
 
 
 
@@ -378,7 +294,7 @@ int cw_send_response(struct cw_Conn *conn, uint8_t * rawmsg, int len)
 {
 	int rc;
 	cw_init_response(conn, rawmsg);
-	rc = cw_assemble_message(conn, conn->resp_buffer);
+	rc = cw_compose_message(conn, conn->resp_buffer);
 	if (!cw_result_is_ok(rc))
 		return 0;
 	conn_send_msg(conn, conn->resp_buffer);
@@ -464,8 +380,6 @@ int cw_in_check_generic(struct cw_Conn *conn, struct cw_action_in *a, uint8_t *
 static int process_elements(struct cw_Conn *conn, uint8_t * rawmsg, int len,
 			    struct sockaddr *from)
 {
-	mavl_t mand_found;
-	mlist_t unrecognized;
 	struct cw_MsgData search;
 	struct cw_MsgData *message;
 	int result_code;
@@ -489,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) ",
@@ -505,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) {
@@ -614,55 +529,55 @@ static int process_elements(struct cw_Conn *conn, uint8_t * rawmsg, int len,
 
 	elems_ptr = cw_get_msg_elems_ptr(msg_ptr);
 
+/*	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));
-	mand_found = mavl_create_conststr();
-	unrecognized = mlist_create(NULL, NULL, sizeof(uint8_t *));
 	
+	params.mand_found = mavl_create_conststr();
+	params.unrecognized = mlist_create(NULL, NULL, sizeof(uint8_t *));
 
+	params.cfg = cw_cfg_create();
+	params.cfg->dbg_level = DBG_ELEM_DETAIL_IN;
+	params.cfg->dbg_prefix = "    ";
 
-
+	params.cfg_list=conn->cfg_list;
-	cw_dbg(DBG_MSG_PARSING, "*** Parsing message of type %d - (%s) ***",
-	       message->type, message->name);
-
-	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.from = from;
 	params.msgdata = message;
-	params.mand_found = mand_found;
 	params.msgset=conn->msgset;
 	params.conn = conn;
+	params.dbg_level = DBG_ELEM_IN;
 
 	cw_decode_elements(&params,elems_ptr, elems_len);
 
 	/* all message elements are processed, do now after processing
 	   by calling the "end" function for the message */
 
-	cw_check_missing_mand(message, mand_found);
+	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) ***",
+//	cw_dbg(DBG_MSG_PARSING, "*** End parsing message of type %d (%s) ***",
-	       message->type, message->name);
+//	       message->type, message->name);
 
-
+	if (params.mand_found)
-	mavl_destroy(mand_found);
+		mavl_destroy(params.mand_found);
 
 	if (message->postprocess) {
 		message->postprocess(&params,elems_ptr, elems_len);
 	}
 
-	cw_MsgCallbackFun cb_fun = cw_conn_get_msg_cb(conn,message->type);
+	result_code = cw_conn_run_msg_cbs(conn,message->type,&params);
-	if (cb_fun != NULL){
+
-		result_code = cb_fun(&params,elems_ptr, elems_len);
+//	cw_MsgCallbackFun cb_fun = cw_conn_get_msg_cb(conn,message->type);
-	}
+	if (result_code==-1){
-	else{
+		cw_cfg_clear(conn->update_cfg);
-		cw_cfg_clear(params.cfg);
+		result_code=0;
 	}
 
-	conn->remote_cfg=params.cfg;
+//	conn->remote_cfg=params.cfg;
 
 	/* if we've got a request message, we always have to send a response message */
 	if (message->type & 1) {
@@ -672,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(params.cfg, "result-code",
+			cw_cfg_set_int(conn->update_cfg, "capwap/result-code",
 					 result_code);
 			if (ui->next) {
 				conn->capwap_prevstate = conn->capwap_state;
@@ -692,10 +607,10 @@ static int process_elements(struct cw_Conn *conn, uint8_t * rawmsg, int len,
 		 * Put further actions here, if needed.
 		 */
 	}
-
+	if (params.unrecognized)
-	mlist_destroy(unrecognized);
+		mlist_destroy(params.unrecognized);
 	cw_cfg_destroy(params.cfg);
-	conn->remote_cfg=NULL;
+//	conn->remote_cfg=NULL;
 
 	return result_code;
 
@@ -850,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);
+		fp = fragman_add(conn->fragman, packet, offs, payloadlen);
-		if (f == NULL) {
+		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_pkt(DBG_PKT_IN, conn, fp, *(uint32_t *) f+MAX_PKT_HDR_LEN, from);
-/*//		cw_dbg_msg(DBG_MSG_IN, conn, f + 4, *(uint32_t *) f, from);*/
-
-/*		// XXX: Modify fragman to not throw away CAPWAP headers*/
 
 		rc = conn->process_message(conn, f + 4, *(uint32_t *) f, from);
 
-		free(f);
+		free(fp);
 		return rc;
 	}
 
@@ -955,8 +868,8 @@ void conn_destroy(struct cw_Conn * conn)
 	if (conn->local_cfg)
 		cw_cfg_destroy(conn->local_cfg);
 
-
+	if (conn->update_cfg)
-
+		cw_cfg_destroy(conn->update_cfg);
 	free(conn);
 }
 

src/cw/conn.h

@@ -38,7 +38,6 @@
 
 /*#include "mbag.h"*/
 
-#include "intavltree.h"
 #include "bstr.h"
 #include "msgset.h"
 
@@ -59,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;
 
@@ -70,13 +71,25 @@ struct cw_Conn {
 
 
 	int recv_timeout;
+
+
+	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 conniection. */
 	
-	
+	cw_Cfg_t * remote_cfg;	/**< contains the configuration we now from the 
-	mavl_t remote_cfg;
+				     device this conn object ist connected to.
-//	mavl_t default_cfg;
+				     Typically this is what we have got from discovery
-	mavl_t update_cfg;
+				     response or join response in WTP mode. 
-	mavl_t local_cfg;
+				     And in AC mode this contains datia received by 
-	mavl_t global_cfg;
+				     configuration status and join request.  */
+
+	cw_Cfg_t * update_cfg;
+
+	cw_Cfg_t * cfg_list[10];
 	
 	bstr16_t session_id;
 
@@ -90,9 +103,6 @@ struct cw_Conn {
 	uint8_t wbid;
 
 
-	/** Counter for mandatory message elements */
-/*	struct avltree *mand;*/
-
 
 	/** Actionsdefs - this defines the possible actions for
 	    this conn object, so in the end this is the specification
@@ -119,10 +129,6 @@ struct cw_Conn {
 	int last_seqnum_received;
 	int last_message_id_received;
 
-
-//	struct cwmsg req_msg;
-//	struct cwmsg resp_msg;
-
 	/** Buffer for outgoing request messages */
 	uint8_t req_buffer[CONN_MAX_MSG_LENGTH];
 
@@ -141,17 +147,10 @@ struct cw_Conn {
 	int (*recv_packet) (struct cw_Conn*, uint8_t *, int);
 	int (*recv_packet_peek) (struct cw_Conn*, uint8_t *, int);
 	int (*send_packet) (struct cw_Conn*, const uint8_t *, int);
-/*
-//	int (*recv_data_packet) (struct cw_Conn*, uint8_t *,int);
-//	int (*send_data_packet) (struct cw_Conn*, const uint8_t *, int);
-*/	
-
 	int (*readfrom) (struct cw_Conn*, uint8_t *, int, struct sockaddr_storage *);
 	int (*read) (struct cw_Conn*, uint8_t *, int);
 	int (*write) (struct cw_Conn*, const uint8_t *, int);
-/*
+
-//	int (*write_data) (struct cw_Conn*, const uint8_t *, int);
-*/
 	/* optional packet queue */
 	uint8_t **q;
 	int qsize;
@@ -314,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_init.c

@@ -1,74 +0,0 @@
-/*
-    This file is part of libcapwap.
-
-    libcapwap is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    libcapwap is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-
-/**
- * @file
- * @brief conn_init
- */ 
-
-#include <string.h>
-
-
-#include "conn.h"
-#include "capwap.h"
-#include "cw.h"
-
-/*
-static int write_header(struct cw_ElemHandler * handler, uint8_t * dst, int len)
-{
-	if (handler->vendor)
-		return len + cw_put_elem_vendor_hdr(dst, handler->vendor, handler->id, len);
-
-	return  len + cw_put_elem_hdr(dst, handler->id, len);
-}
-
-static int header_len(struct cw_ElemHandler * handler)
-{
-	return handler->vendor ? 10 : 4;
-}
-
-*/
-
-/**
- * Basic initialization of a conn object 
- * @param conn conn object to initialize
- */ 
-void conn_init(struct cw_Conn * conn)
-{
-	memset(conn,0,sizeof(struct cw_Conn ));
-	conn->retransmit_interval=CAPWAP_RETRANSMIT_INTERVAL;
-	conn->max_retransmit=CAPWAP_MAX_RETRANSMIT;
-	conn->wait_dtls=CAPWAP_WAIT_DTLS;
-	conn->wait_join=CAPWAP_WAIT_JOIN;
-	conn->mtu_discovery=1;
-//	conn->capwap_mode = 0;
-	conn->strict_capwap=1;
-
-
-
-	conn->process_packet=conn_process_packet;
-	conn->process_message=process_message;
-/*
-	conn->write_header = write_header;
-	conn->header_len = header_len;
-*/
-
-}
-
-

src/cw/conn_process_packet.c

@@ -1,40 +0,0 @@
-/*
-    This file is part of libcapwap.
-
-    libcapwap is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    libcapwap is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#include "cw.h"
-#include "dbg.h"
-
-#include "log.h"
-#include "cw_util.h"
-
-#include "conn.h"
-#include "sock.h"
-
-/*#include "stravltree.h"*/
-#include "mod.h"
-#include "msgset.h"
-
-#include "val.h"
-
-
-
-
-

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 );
@@ -66,7 +103,7 @@ mtu = 9440;
 		if (conn->write(conn,ptr,mtu)<0)
 			return -1;
 
-/*		// XXX Fragmentation stuff.. */
+/ *		// XXX Fragmentation stuff.. * /
 		ptr +=mtu-hlen;
 		fragoffset+=(mtu-hlen)/8;
 
@@ -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,31 +25,41 @@ 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
+int cw_out_generic0(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
-			, uint8_t * dst)
+			, uint8_t * dst,const char *key)
 {
-
 	int start, len, l;
+	
+//	cw_dbg(DBG_X,"cw_out_generic (%s)%s",((struct cw_Type*)handler->type)->name,handler->key);
 
 //	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) {
 		const char *vendor="";
@@ -59,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{
@@ -69,12 +80,22 @@ int cw_out_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams
 			       , cw_strmsg(a->msg_id),a->item_id);
 */
 		}
+
 		return 0;
 	} 
 
 	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);
 }
 
 
@@ -113,20 +134,57 @@ int cw_out_radio_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerP
 	int len,i,l,start;
 	int radios;
 	len =0;
+
+	for (i=0; (i=cw_cfg_get_first_index_l(params->cfg_list,"radio",i))!=-1; i++){
+		sprintf(key,"radio.%d/%s",i,handler->key);
+		if (!params->elemdata->mand){
+			if (!cw_cfg_base_exists(params->cfg_list[0],key)){
+				cw_dbg(DBG_MSG_COMPOSE,"    Add Elem: %d %d %d %s %s - (skip)", 
+						params->elemdata->proto, 
+						params->elemdata->vendor, 
+						params->elemdata->id, 
+						handler->name, key);
+				continue;
+			}
+		}
+
+		type = (struct cw_Type*)handler->type;
+		start = params->msgset->header_len(handler)+len;
+
+		l = type->write(params->cfg_list, key,dst+start+1,handler->param);
+		if (l==-1)
+			continue;
+
+		l += cw_put_byte(dst+start,i);
+
+		l = params->msgset->write_header(handler,dst+len,l);
+		len+=l;
+		
+
+	}
+
+	return len;
+
+
+
 	
-	radios = cw_cfg_get_byte(params->cfg,"wtp-descriptor/max-radios",0);
+	radios = cw_cfg_get_byte_l(params->cfg_list,"capwap/wtp-descriptor/max-radios",0);
 	for(i=0;i<radios;i++){
-		l=0;
 
 		type = (struct cw_Type*)handler->type;
 		start = params->msgset->header_len(handler)+len;
 
 		sprintf(key,"radio.%d/%s",i,handler->key);
-		cw_dbg(DBG_X,"KEY: %s",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);
+		if (l==-1)
+			continue;
+
+		l += cw_put_byte(dst+start,i);
 
-		l += cw_put_byte(dst+start+l,i);
-		l += type->write(params->cfg_list, key,dst+start+l,handler->param);
-	
 		l = params->msgset->write_header(handler,dst+len,l);
 		len+=l;
 
@@ -134,3 +192,276 @@ int cw_out_radio_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerP
 	return len;
 }
 
+
+int cw_write_header(struct cw_ElemHandler * handler, uint8_t * dst, int len)
+{
+	if (handler->vendor)
+		return len + cw_put_elem_vendor_hdr(dst, handler->vendor, handler->id, len);
+
+	return  len + cw_put_elem_hdr(dst, handler->id, len);
+}
+
+
+
+int cw_header_len(struct cw_ElemHandler * handler)
+{
+	return handler->vendor ? 10 : 4;
+}
+
+
+
+/**
+ * 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);
@@ -348,11 +350,12 @@ struct cw_DescriptorSubelemDef {
 
 
 
-int cw_check_missing_mand(struct cw_MsgData *msgdata, mavl_t keys );
+//int cw_check_missing_mand(struct cw_MsgData *msgdata, mavl_t keys );
+int cw_check_missing_mand(struct cw_MsgData *msgdata, mavl_t keys, mavl_t handlers_by_key );
 
 
 
-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);
 
 /*
@@ -361,30 +364,30 @@ 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);
 
-int cw_write_descriptor_subelem (uint8_t *dst, mavl_t ktvstore,
+int cw_write_descriptor_subelem (uint8_t *dst, cw_Cfg_t ** cfg_list,
                                  int subelem_id, const char * parent_key);
 
 int cw_write_radio_element(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params, int idx,
 			 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);
 
 
 
@@ -550,6 +553,26 @@ int cw_stricmp(char const *a, char const *b);
 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

@@ -3,12 +3,15 @@
 #include "dbg.h"
 #include "log.h"
 
-int cw_check_missing_mand(struct cw_MsgData *msgdata, mavl_t keys )
+int cw_check_missing_mand(struct cw_MsgData *msgdata, mavl_t keys, mavl_t handlers_by_key )
 {
 	mlistelem_t * elem;
 	char *mandkey, *result;
 	mlist_t missing;
 	int count;
+
+	if (msgdata==NULL)
+		return 0;
 	
 	missing = mlist_create_conststr();
 	if (missing==NULL){
@@ -26,7 +29,22 @@ int cw_check_missing_mand(struct cw_MsgData *msgdata, mavl_t keys )
 	}
 	
 	mlist_foreach(elem,missing){
-		cw_dbg(DBG_RFC,"     Missing mandatory message element: %s", mlistelem_get_str(elem));
+		const char * str;
+		struct cw_ElemHandler search, *result;
+
+		str = mlistelem_get_str(elem);
+
+		search.key = str;
+		result = mavl_get(handlers_by_key,&search);
+		if (result == NULL){
+			cw_log(LOG_ERR,"Can't find handler for for key %s",str);
+		} 
+		else {
+			cw_dbg(DBG_RFC,"Missing mandatory message element: %s: %d - %s", 
+					str,result->id, result->name);
+		}
+
+
 	}
 
 	count = missing->count;

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

@@ -1,127 +0,0 @@
-#include "cw.h"
-#include "dbg.h"
-#include "log.h"
-#include "msgset.h"
-
-int cw_decode_element(struct cw_ElemHandlerParams *params, int proto,
-		      int vendor, int elem_id, uint8_t * data, int len)
-{
-
-	struct cw_ElemHandler *handler;
-	struct cw_ElemData *elem_data, elem_data_search;
-	int rc;
-
-	//params->elem = NULL;
-
-	/* try to retrieve a handler for this message element */
-	handler =
-	    cw_msgset_get_elemhandler(params->msgset, proto, vendor,
-				      elem_id);
-	if (!handler) {
-
-		cw_dbg(DBG_ELEM_ERR,
-		       "Unrecognized message element: %d, ignoring", elem_id);
-		return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
-	}
-
-	/* check if this message element in the current message allowed */
-	elem_data_search.id = elem_id;
-	elem_data_search.proto = proto;
-	elem_data_search.vendor = vendor;
-	elem_data = mavl_get(params->msgdata->elements_tree, &elem_data_search);
-	if (!elem_data) {
-		cw_dbg(DBG_ELEM_ERR, "Element %d - %s, not allowed here",
-		       elem_id, handler->name);
-		return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
-	}
-
-	/* check the length of the message */
-	if (len < handler->min_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);
-		return -1;
-	}
-
-
-	if (elem_data->mand) {
-		mavl_add_str(params->mand_found, handler->key);
-	}
-
-
-	if (len > handler->max_len && handler->max_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);
-		/* TODO XXX truncate the element instead of return */
-		return -1;
-	}
-
-	cw_dbg_elem(DBG_ELEM_IN, NULL, params->msgdata->type, handler,
-		    data, len);
-
-	if (handler->get == NULL) {
-		cw_log(LOG_ERR, "No get method defined for %d %s", handler->id,
-		       handler->name);
-		return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
-	}
-
-	rc = handler->get(handler, params, data, len);
-
-	return rc;
-}
-
-
-int cw_decode_elements(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
-{
-	uint8_t *elem;
-	mavl_t mand_found;
-	mlist_t unrecognized;
-
-	mand_found = mavl_create_conststr();
-	unrecognized = mlist_create(NULL,NULL,sizeof(uint8_t*));
-
-	cw_foreach_elem(elem, elems_ptr, elems_len) {
-		int rc;
-
-		int elem_len, elem_id, max_len;
-		uint8_t * elem_data;
-
-
-		elem_len = cw_get_elem_len(elem);
-		elem_data=cw_get_elem_data(elem);
-		elem_id = cw_get_elem_id(elem);
-		
-		max_len=elems_len-(elem_data-elems_ptr);
-		if (elem_len > max_len){
-			cw_dbg(DBG_RFC,
-			"Messag element claims size of %d bytes, but only %d bytes are left in the payload, truncating.",
-			elem_len,max_len-4);
-		}
-	
-		
-
-		params->from=NULL; /*from;*/
-		params->mand_found=mand_found;
-		
-		rc = cw_decode_element(params,0,0,elem_id,elem_data,elem_len); 
-		
-
-		if (cw_result_is_ok(rc))
-			continue;
-		
-		if (rc == CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT){
-			mlist_append(unrecognized,&elem);
-			continue;
-		}
-		
-		if (rc < 0 ){
-			continue;
-		}
-
-	}
-
-	mavl_destroy(mand_found);
-	mlist_destroy(unrecognized);
-	return 0;
-}

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"
 
-/**
+#include "dot11.h"
- * @brief Format a packet header for debugging purposes
+
- * @param dst Destination buffer
+int cw_format_dot11_fc_flags(char *dst, uint8_t *frame){
- * @param incomming True if the packet is an incomming packet, otherweise 0
+	char *s = dst;
- * @param packet packet data
+	uint8_t f = frame[0];
- * @param len length of packet data
+	s+=sprintf(s,"ToDS:%d ", f&1 ? 1:0);
- * @param from Address from where the packet was received
+	s+=sprintf(s,"FromDS:%d ", f&2 ? 1:0);
- * @return Number of bytes written
+	s+=sprintf(s,"More Frgs:%d ", f&4 ? 1:0);
- */
+	s+=sprintf(s,"Retry:%d ", f&8 ? 1:0);
-int cw_format_pkt_hdr(char *dst, int incomming, uint8_t * packet, int len,
+	s+=sprintf(s,"PwrMgmt:%d ", f&16 ? 1:0);
-		      struct sockaddr *from)
+	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 type = dot11_get_type_and_subtype(packet);
-	int frag_id,frag_offs;
 
-	s = dst;
+	s=dst;
 
-	if (incomming){
+	s+=sprintf(s,"IEEE 802.11 - %s",dot11_get_frame_name(packet));
-		if (cw_get_hdr_flag_f(packet)) {
+	s+=sprintf(s," da:");
-			s += sprintf(s, "Fragment from %s",
+	s+=format_mac(s,dot11_get_da(packet),6);	
-				     sock_addr2str_p(from,sock_buf));
+	s+=sprintf(s," sa:");
-		} else {
+	s+=format_mac(s,dot11_get_sa(packet),6);	
-			s += sprintf(s, "From %s", sock_addr2str_p(from,sock_buf));
+	s+=sprintf(s," bssid:");
-		}
+	s+=format_mac(s,dot11_get_bssid(packet),6);
-	}
+	s+=sprintf(s," seq: %d\n",dot11_get_seq(packet));
-	else{
+	s+=cw_format_dot11_fc_flags(s,packet);
-		if (cw_get_hdr_flag_f(packet)) {
+	s+=sprintf(s,"\nDuration: %d",dot11_get_duration(packet));
-			s += sprintf(s, "Fragment to %s", sock_addr2str(from,sock_buf));
+//
-		} else {
+/*	switch (type){
-			s += sprintf(s, "To %s", sock_addr2str(from,sock_buf));
+		case DOT11_ASSOC_REQ:
-		}
+			s+=sprintf(s,"\n   ssid: %.*s",dot11_assoc_req_get_ssid_len(packet),
-	}
+					dot11_assoc_req_get_ssid(packet)
-	s += sprintf(s, " l=%d: ", len);
+			);
-
+			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_check_disc_req.c

@@ -1,43 +0,0 @@
-
-#include "capwap.h"
-
-
-#include "intavltree.h"
-#include "log.h"
-#include "dbg.h"
-#include "sock.h"
-
-int cw_in_check_disc_req(struct conn *conn, struct cw_action_in *a, uint8_t * data,
-			 int len,struct sockaddr *from)
-{
-/*	
-	char sock_buf[SOCK_ADDR_BUFSIZE];
-
-	cw_action_in_t *mlist[120];
-	int n = cw_check_missing_mand(mlist, conn, a);
-
-	conn->capwap_state = CW_STATE_NONE;
-
-
-	if (n && conn->strict_capwap) {
-		cw_dbg_missing_mand(DBG_MSG_ERR, conn, mlist, n, a);
-		// if mandatory elements are missing, in strict 
-		   // mode send no discovery response 
-		cw_dbg(DBG_MSG_ERR,
-		       "Ignoring Discovery Request from %s - missing mandatory elements.",
-		       sock_addr2str(from,sock_buf));
-		return -1;
-	}
-
-	if ( n ) {
-		// put a warning here 
-		cw_dbg_missing_mand(DBG_RFC, conn, mlist, n, a);
-	}
-
-		
-
-	// ok, send response 
-	conn->capwap_state = CAPWAP_STATE_JOIN;
-*/
-	return 0;
-}

src/cw/cw_in_check_join_req.c

@@ -1,44 +0,0 @@
-
-#include "capwap.h"
-#include "intavltree.h"
-#include "dbg.h"
-#include "log.h"
-
-#include "format.h"
-#include "connlist.h"
-
-int cw_in_check_join_req(struct conn *conn, struct cw_action_in *a, uint8_t * data,
-			 int len,struct sockaddr *from)
-{
-/*
-	cw_action_in_t * mlist[60];
-
-	//Check for mandatory elements 
-	int n = cw_check_missing_mand(mlist,conn,a);
-	if (n) {
-		if ( conn->strict_capwap ){
-			cw_dbg_missing_mand(DBG_MSG_ERR,conn,mlist,n,a);
-			conn->capwap_state=CAPWAP_STATE_JOIN;
-			return CW_RESULT_MISSING_MAND_ELEM;
-		}
-		cw_dbg_missing_mand(DBG_RFC,conn,mlist,n,a);
-	}
-
-	connlist_lock(conn->connlist);
-	struct conn *cc = connlist_get_by_session_id(conn->connlist,conn);
-	if (!cc){
-		connlist_add_by_session_id(conn->connlist,conn);
-	}
-	connlist_unlock(conn->connlist);
-	if (cc){
-		cw_dbg(DBG_ELEM_ERR,"Session already in use %s",format_bin2hex(conn->session_id,16));
-		conn->capwap_state=CAPWAP_STATE_JOIN;
-		return CW_RESULT_JOIN_FAILURE_SESSION_ALREADY_IN_USE;
-	}
-	
-	// set result code to ok and change to configure state 
-	mbag_set_dword(conn->outgoing,CW_ITEM_RESULT_CODE,0);
-	conn->capwap_state = CW_STATE_CONFIGURE;
-*/
-	return 0;
-}

src/cw/cw_in_check_join_resp.c

@@ -1,47 +0,0 @@
-
-#include <errno.h>
-
-#include "capwap.h"
-#include "intavltree.h"
-#include "dbg.h"
-#include "log.h"
-
-
-int cw_in_check_join_resp(struct conn *conn, struct cw_action_in *a, uint8_t * data,
-			 int len,struct sockaddr *from)
-{
-/*
-	cw_action_in_t * mlist[60];
-
-	mbag_item_t * jresult = mbag_get(conn->incomming,CW_ITEM_RESULT_CODE);
-	if  (jresult ) {
-		if (!cw_result_is_ok(jresult->u2.dword)){
-			return jresult->u2.dword;
-		}
-	}
-
-
-	// Check for mandatory elements 
-	int n = cw_check_missing_mand(mlist,conn,a);
-	if (n && conn->strict_capwap) {
-		cw_dbg_missing_mand(DBG_MSG_ERR,conn,mlist,n,a);
-		conn->capwap_state=CAPWAP_STATE_JOIN;
-		errno=EAGAIN;
-		return -1; //CW_RESULT_MISSING_MAND_ELEM;
-	}
-	if (n){
-		cw_dbg_missing_mand(DBG_RFC,conn,mlist,n,a);
-	}
-
-	
-
-
-	if ( jresult ) {
-		return jresult->u2.dword;
-	}
-
-	// set result code to ok and change to configure state 
-//	mbag_set_dword(conn->outgoing,CW_ITEM_RESULT_CODE,0);
-*/
-	return 0;
-}

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

@@ -7,12 +7,11 @@ int cw_in_generic_with_index(struct cw_ElemHandler *eh,
 {
 	char key[CW_CFG_MAX_KEY_LEN];
 	int idx;
+	struct cw_Type * type = (struct cw_Type*)eh->type;
 
-cw_dbg(DBG_X,"Fix cw_in_generic_with_index");
-stop();	
 	idx = cw_get_byte(data);
 	sprintf(key,"%s.%d",eh->key,idx);
 //	cw_cfg_add(params->cfg,key,eh->type,NULL,data+1,len-1);
-
+	type->read(params->cfg,key,data+1,len-1,eh->param);
 	return 1;
 }

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

@@ -1,43 +0,0 @@
-#include "val.h"
-#include "cw.h"
-
-#include "log.h"
-#include "dbg.h"
-
-cw_Val_t * cw_ktv_add(mavl_t kvtstore, const char *key, const struct cw_Type *type, 
-			const void * valguard,
-			const uint8_t * data, int len)
-{
-	cw_Val_t mdata, *mresult;
-	int exists;
-	mdata.key=cw_strdup(key);
-	mdata.valguard=valguard;
-	
-	if (!mdata.key){
-		cw_log(LOG_ERR, "Can't allocate memory for KTV key %s: %s",
-				key,strerror(errno));
-		return NULL;
-	}
-
-
-	mresult = type->get(&mdata,data,len);
-	if (!mresult){
-		cw_log(LOG_ERR, "Can't create kvstore element for key %s of type %s: %s",
-				key,type->name, strerror(errno));
-		free(mdata.key);
-		return NULL;
-	}
-
-	mavl_del(kvtstore,&mdata);
-	mresult = mavl_insert(kvtstore, &mdata, &exists);
-	if (exists){
-		cw_log(LOG_ERR, "Element already exists %s", key);
-		/* element already exists */
-		free(mdata.key);
-		if (type->del)
-			type->del(&mdata);
-		return mresult;
-	}
-
-	return mresult;
-}

src/cw/cw_ktv_add_from_str.c

@@ -1,45 +0,0 @@
-#include "val.h"
-#include "cw.h"
-
-#include "log.h"
-#include "dbg.h"
-
-const char * cw_ktv_add_from_str(mavl_t kvtstore, const char *key, 
-			const struct cw_Type *type,
-			const void * valguard,
-			const char * str)
-{
-	cw_Val_t mdata, *mresult;
-	int exists;
-
-/*	cw_dbg(DBG_ELEM,"KVStore (%p,%d) add elem (%s): %s", kvstore, kvstore->count,
-			type->name, key );
-*/
-	mdata.key=cw_strdup(key);
-	mdata.valguard=valguard;
-	if (!mdata.key){
-		cw_log(LOG_ERR, "Can't allocate memory for key %s: %s",
-				key,strerror(errno));
-		return NULL;
-	}
-
-	mresult = type->from_str(&mdata,str);
-	if (!mresult){
-		cw_log(LOG_ERR, "Can't create kvstore element for key %s of type %s: %s",
-				key,type->name, strerror(errno));
-		free(mdata.key);
-		return NULL;
-	}
-	
-	mresult = mavl_insert(kvtstore, &mdata, &exists);
-	if (exists){
-		cw_log(LOG_ERR, "Element already exists %s", key);
-		/* element already exists */
-		free(mdata.key);
-		if (type->del)
-			type->del(&mdata);
-		return key;
-	}
-
-	return mdata.key;
-}

src/cw/cw_ktv_base_exists.c

@@ -1,29 +0,0 @@
-#include "val.h"
-/**
- * @file 
- * @description Implementation of cw_ktv_base_exisits
- */
-
-
-/**
- * @brief Check if elements with e certain baskey can be found in 
- * in ktvstore.
- * @param ktvstore ktvstore to search in
- * @param basekey basekey to search for
- * @return The first ktv element belonging to the base eky, 
- * otherwise NULL if no element was found. 
- * 
- */
-cw_Val_t * cw_ktv_base_exists(mavl_t ktvstore, const char *basekey)
-{
-	cw_Val_t * result, search;
-	search.key=(char*)basekey;
-	result = mavl_get_first(ktvstore,&search);
-	if (result == NULL)
-		return NULL;
-	
-	if (strncmp(result->key,basekey,strlen(basekey))==0)
-		return result;
-
-	return NULL;
-} 

src/cw/cw_ktv_cast.c

@@ -1,14 +0,0 @@
-#include "val.h"
-
-cw_Val_t * cw_ktv_cast(cw_Val_t *v,const cw_Type_t * type)
-{
-	if (strcmp(v->type->name,type->name)==0)
-		return v;
-	if (type->cast==NULL)
-		return NULL;
-	if (!type->cast(v))
-		return NULL;
-		
-	return v;
-}
-

src/cw/cw_ktv_get.c

@@ -1,32 +0,0 @@
-
-#include "val.h"
-#include "mavl.h"
-
-/**
- * @brief Get a ktv value from a ktv store
- * @param ktv ktv store
- * @param key key to search for
- * @param type type to match
- * @return A pointer to a #cw_Val_t element, found in the ktv store or
- * NULL if no element with matching key/type is found.
- */
-cw_Val_t * cw_ktv_get(mavl_t ktv, const char *key, const cw_Type_t * type)
-{
-	cw_Val_t search, *result;
-	/* we can safely cast from const char * to char *, because
-	 * we never will use the search varaiable to store ktv values */
-	search.key=(char*)key;
-	
-	result = mavl_get(ktv,&search);
-	if (result == NULL){
-		return NULL;
-	}
-	if (type == NULL){
-		return result;
-	}
-	if (strcmp(type->name,result->type->name)==0){
-		return result;
-	}
-	
-	return NULL;
-}

src/cw/cw_ktv_get_bool.c

@@ -1,11 +0,0 @@
-#include "val.h"
-
-uint8_t cw_ktv_get_bool(mavl_t ktv,const char *key, uint8_t def)
-{
-	cw_Val_t * k;
-	k = cw_ktv_get(ktv,key,CW_TYPE_BOOL);
-	if (k != NULL){
-		return k->val.boolean;
-	}
-	return def;
-}

src/cw/cw_ktv_get_bstr16.c

@@ -1,13 +0,0 @@
-#include "val.h"
-#include "bstr.h"
-
-bstr16_t cw_ktv_get_bstr16(mavl_t ktv,const char *key, bstr16_t def)
-{
-	cw_Val_t * k;
-	k = cw_ktv_get(ktv,key,CW_TYPE_BSTR16);
-	if (k != NULL){
-		return bstr16_create(k->type->data(k),k->type->len(k));
-	}
-	return def;
-}
-

src/cw/cw_ktv_get_byte.c

@@ -1,11 +0,0 @@
-#include "val.h"
-
-uint8_t cw_ktv_get_byte(mavl_t ktv,const char *key, uint8_t def)
-{
-	cw_Val_t * k;
-	k = cw_ktv_get(ktv,key,CW_TYPE_BYTE);
-	if (k != NULL){
-		return k->val.byte;
-	}
-	return def;
-}

src/cw/cw_ktv_get_dword.c

@@ -1,11 +0,0 @@
-#include "val.h"
-
-uint32_t cw_ktv_get_dword(mavl_t ktv,const char *key, uint32_t def)
-{
-	cw_Val_t * k;
-	k = cw_ktv_get(ktv,key,CW_TYPE_DWORD);
-	if (k != NULL){
-		return k->val.dword;
-	}
-	return def;
-}

src/cw/cw_ktv_get_str.c

@@ -1,11 +0,0 @@
-#include "val.h"
-
-char * cw_ktv_get_str(mavl_t ktv,const char *key, char * def)
-{
-	cw_Val_t * k;
-	k = cw_ktv_get(ktv,key,CW_TYPE_STR);
-	if (k != NULL){
-		return k->val.ptr;
-	}
-	return def;
-}

src/cw/cw_ktv_get_sysptr.c

@@ -1,11 +0,0 @@
-#include "val.h"
-
-void * cw_ktv_get_sysptr(mavl_t ktv,const char *key, void * def)
-{
-	cw_Val_t * k;
-	k = cw_ktv_get(ktv,key,CW_TYPE_SYSPTR);
-	if (k != NULL){
-		return k->val.ptr;
-	}
-	return def;
-}

src/cw/cw_ktv_get_word.c

@@ -1,11 +0,0 @@
-#include "val.h"
-
-uint16_t cw_ktv_get_word(mavl_t ktv,const char *key, uint16_t def)
-{
-	cw_Val_t * k;
-	k = cw_ktv_get(ktv,key,CW_TYPE_WORD);
-	if (k != NULL){
-		return k->val.word;
-	}
-	return def;
-}

src/cw/cw_ktv_idx_get.c

@@ -1,126 +0,0 @@
-#include "val.h"
-#include "cfg.h"
-
-void * ktvn(struct mavl *t ,const void *search)
-{
-	
-	struct mavlnode *n,/**lastl,*/*lastb;
-	lastb = NULL; /*lastl=NULL;*/
-	n = t->root;
-	while(n){
-		int rc;
-/*		const cw_Val_t;*//* *c1,*c2;*/
-		/*c1=search;
-		c2=mavlnode_dataptr(n);
-		*/
-		
-		rc = t->cmp(search,mavlnode_dataptr(n));
-		
-		/*printf("Compare: %s %s = %d\n",c1->key,c2->key, rc);*/
-		
-		if (rc==0){
-			return NULL;
-			
-		}
-		
-		if (rc<0){
-			/*lastl = n;*/
-			if (n->s[0]==NULL){
-				return mavlnode_dataptr(lastb);
-				
-			}
-			n=n->s[0];
-		}
-		else{
-			lastb=n;
-			if(n->s[1]==NULL){
-				return mavlnode_dataptr(lastb);
-				
-			}
-			n=n->s[1];
-		}
-	}
-	return NULL;
-	
-}
-
-int cw_ktv_idx_get(mavl_t ktv, const char *key)
-{
-	char ikey[CW_CFG_MAX_KEY_LEN];
-	cw_Val_t search, * result;
-	char *d;
-	
-	sprintf(ikey,"%s.%d",key,65536);
-		
-	search.key=ikey;
-	/*//result = ktvn(ktv,&search);*/
-	
-	result = mavl_get_last(ktv,&search);
-	
-	if (result == NULL){
-		return -1;
-	}
-	
-	d = strchr(result->key,'.');
-	if (d==NULL){
-		return -1;
-	}
-	
-	if (strncmp(result->key,ikey,d-result->key)!=0)
-		return -1;
-	
-	return atoi(d+1);
-}
-
-
-
-int cw_ktv_idx_get_next(mavl_t ktv, const char *key, int n)
-{
-	char ikey[CW_CFG_MAX_KEY_LEN];
-	cw_Val_t search, * result;
-	char *d;
-	int i;
-	
-	sprintf(ikey,"%s.%d",key,n);
-		
-	search.key=ikey;
-	/*//result = ktvn(ktv,&search);*/
-	
-	result = mavl_get_first(ktv,&search);
-	
-	if (result == NULL){
-		return -1;
-	}
-	
-	/*d = strchr(result->key,'.');*/
-	d=NULL;
-/*	for (i = strlen(result->key); i>=0; i--){
-		if (result->key[i]=='/')
-			break;
-	}
-*/	for (i = strlen(ikey); i>=0; i--){
-
-		if (ikey[i]=='.'){
-			d = result->key+i;
-			break;
-		}
-	}
-	
-	
-	if (d==NULL){
-		return -1;
-	}
-	
-	if(result->key[i]!='.'){
-		return -1;
-	}
-	
-/*	if (strncmp(result->key,ikey,d-result->key)!=0)
-		return -1;
-*/
-	if (strncmp(result->key,ikey,i)!=0)
-		return -1;
-	
-
-	return atoi(result->key+i+1);
-}

src/cw/cw_ktv_mavlcmp.c

@@ -1,67 +0,0 @@
-
-#include <ctype.h>
-
-#include "val.h"
-/**
- * @brief Default function to compare two values of type #cw_Val_t.
- *
- * @param v1
- * @param v2
- * @return
- */
-int cw_ktv_mavlcmp (const void *v1, const void *v2)
-{
-	char *d1, *d2, *k1, *k2;
-	int l1, l2, rc, i1, i2;
-	
-	k1 = ( (cw_Val_t *) v1)->key;
-	k2 = ( (cw_Val_t *) v2)->key;
-	
-	while (1) {
-		/* Find dots in both keys */
-		d1 = strchr (k1, '.');
-		d2 = strchr (k2, '.');
-		
-		/* if there are no dots, compare keys as normal */
-		if (d1 == NULL || d2 == NULL)
-			return strcmp (k1, k2);
-			
-			
-		/* calculate the length of the key till dots */
-		l1 = d1 - k1; /*((cw_Val_t *) v1)->key;*/
-		l2 = d2 - k2; /*((cw_Val_t *) v2)->key;*/
-		
-		/* if length differs do a normal compare */
-		if (l1 != l2) {
-			return strcmp (k1, k2); /*((cw_Val_t *) v1)->key, ((cw_Val_t *) v2)->key);*/
-		}
-		
-		
-		rc = strncmp (k1, k2, l1); /*((cw_Val_t *) v1)->key,((cw_Val_t *) v2)->key,l1);*/
-		
-		if (rc != 0) {
-			return rc;
-		}
-		
-		d1++;
-		d2++;
-		i1 = atoi (d1);
-		i2 = atoi (d2);
-		
-		rc = i1 - i2;
-		
-		if (rc != 0)
-			return rc;
-			
-		while (isdigit (*d1))
-			d1++;
-			
-		while (isdigit (*d2))
-			d2++;
-		
-		k1=d1;
-		k2=d2;
-		/*return strcmp(d1,d2);*/
-		/*return cw_ktv_mavlcmp(d1,d2);*/
-	}
-}

src/cw/cw_ktv_mavlcmp_type_by_name.c

@@ -1,8 +0,0 @@
-
-#include "val.h"
-
-int cw_ktv_mavlcmp_type_by_name (const void *v1, const void *v2)
-{
-	return strcmp ( (*((struct cw_Type**) v1))->name, 
-			(*((struct cw_Type**) v2))->name);
-}

src/cw/cw_ktv_mavldel.c

@@ -1,14 +0,0 @@
-
-#include <stdlib.h>
-
-
-#include "val.h"
-
-void cw_ktv_mavldel(void *data)
-{
-	struct cw_Val *ktv = data;
-	if (ktv->type->del) {
-		ktv->type->del(data);
-	}
-	free(ktv->key);
-}

src/cw/cw_ktv_parser.c

@@ -1,359 +0,0 @@
-#include <stdint.h>
-
-#include "val.h"
-
-
-static int str_getc(struct cw_Val_Reader * r)
-{
-	if (r->next==r->maxlen)
-		return EOF;
-		
-	return *((uint8_t*)(r->data)+r->next++);
-}
-
-static void str_ungetc(struct cw_Val_Reader * r, int c)
-{
-	if (r->next>0)
-		r->next--;
-}
-
-void cw_ktv_init_str_reader(struct cw_Val_Reader *r, const char * str, int len)
-{
-	memset(r,0,sizeof(struct cw_Val_Reader));
-	r->data = str;
-	r->xgetchar=str_getc;
-	r->ungetchar=str_ungetc;
-	r->maxlen=len;
-}
-
-#include <ctype.h>
-
-#include "val.h"
-/*
-struct parser {
-	int line;
-	int pos;
-	int prevpos;
-	char error[256];
-	int quote;
-	FILE *f;
-	int (*getc)(struct parser *);
-	void (*ungetc)(struct parser *)
-};
-*/
-
-
-
-static int get_char(struct cw_Val_Reader *r)
-{
-	int c;
-	c = r->xgetchar (r);
-	r->pos++;
-	if (c=='\n'){
-		r->prevpos=r->pos;
-		r->line ++;
-		r->pos=0;
-	}
-	return c;
-}
-
-
-static void unget_char(struct cw_Val_Reader * r,int c){
-	r->ungetchar(r,c);
-	if (c=='\n'){
-		r->line--;
-		r->pos=r->prevpos;
-	}
-	else
-		r->pos--;
-}
-
-
-
-static int get_char_q(struct cw_Val_Reader *p)
-{
-	int c;
-
-	while(1) {
-		c = get_char(p);
-		if (c==EOF || c=='\n')
-			return c;
-	
-		if(c=='"' && !p->quote){
-			p->quote=1;
-			continue;
-		}
-		if(c=='"' && p->quote){
-			p->quote=0;
-			continue;
-		}
-		break;
-	}
-	
-	
-	if (!p->quote)
-		return c;
-			
-	if (c!='\\')
-		return c;
-			
-	c = get_char(p);
-	switch(c){
-		case EOF:
-			return c;
-		case 'n':
-			return '\n';
-			
-		case '\\':
-			return '\\';
-		case '"':
-			return '"';
-		default:
-			unget_char(p,c);
-			return '\\';
-	}
-			
-	/* We will never reach here */
-	/* return c;*/
-}
-
-
-
-
-
-
-
-
-
-
-
-
-static int skip_chars (struct cw_Val_Reader *r, const char * chars)
-{
-	int c;
-	
-	while ( (c = get_char (r)) != EOF) {
-		if (strchr (chars, c))
-			continue;
-		return c;
-	}
-	return c;
-}
-
-static int skip_to_chars (struct cw_Val_Reader *r, const char *chars)
-{
-	int c;
-	
-	while ( (c = get_char (r)) != EOF) {
-		if (strchr (chars, c))
-			return c;
-	}
-	return c;
-}
-
-
-
-static int read_key (struct cw_Val_Reader *r, char *key, int max_len)
-{
-	int c,n;
-
-	do {
-		c = skip_chars (r, " \t\n\a\v");
-		if (c == '#') {
-			c = skip_to_chars (r, "\n\a");
-		} else {
-			break;
-		}
-	} while (c != EOF);
-	
-	unget_char(r,c);
-	c=get_char_q(r);
-
-	n=0;
-	while(c!=EOF && n<max_len){
-		if (!r->quote && !isalnum(c) && !strchr("._/-()@#|{}[]\\",c)){
-			unget_char(r,c);
-			break;
-		}
-
-		key[n]=c;
-		c=get_char_q(r);
-		n++;
-
-	}
-	key[n]=0;
-	return n;
-}
-
-
-static int skip_to_colon(struct cw_Val_Reader * r)
-{
-	int c;
-	c = skip_chars (r, " \t");
-	if (c!=':' && c!='='){
-		if (c=='\n'){
-			unget_char(r,c);
-			sprintf(r->error,"Unexpected EOL, colon or equal sign expected.");
-			return -1;
-		}
-		sprintf(r->error,"Colon or equal sign expected.");
-		return -1;
-	}
-	return c;
-}
-
-
-static int read_type(struct cw_Val_Reader * r, char *type, int max_len)
-{
-	int c,n;
-	
-	c = skip_to_colon(r);
-	if (c==-1)
-		return -1;
-	if (c=='='){
-		unget_char(r,c);
-		return sprintf(type,"%s","Str");
-		
-	}
-
-	c = skip_chars (r, " \t");
-	
-	if (c==':'){
-		unget_char(r,c);
-		sprintf(type,"%s","Str");
-		return 0;
-	}
-		
-	if (!isalpha(c)){
-		if (c=='\n'){
-			unget_char(r,c);
-			/*sprintf(p->error,"Error at line %d, pos %d: Unexpected EOL.", p->line, p->pos);*/
-			return -1;
-		}
-		
-		/*sprintf(p->error,"Error at line %d, pos %d: Letter expected.", p->line, p->pos);*/
-		return -1;
-	}
-
-	n=0;
-	while(c!=EOF && n<max_len){
-		if (!isalnum(c) && !strchr("_/-.()@#|{}[]",c)/*strchr(": \t\n\a",c)*/){
-			unget_char(r,c);
-			break;
-		}
-
-		type[n]=c;
-		c=get_char(r);
-		n++;
-	}
-	type[n]=0;
-	return n;
-}
-
-
-static int read_val(struct cw_Val_Reader *r, char *val, int max_len){
-	int c,n,quote;
-	c = skip_to_colon(r);
-	if (c==-1)
-		return -1;
-	c = skip_chars (r, " \t");
-	if (c=='"'){
-		quote=1;
-		c=get_char(r);
-	}
-	else{
-		quote=0;
-	}
-	n=0;
-	while(c!=EOF && n<max_len){
-		if (quote && c=='"'){
-			break;
-		}
-		if (c=='\n'){
-			break;
-		}
-		if (quote){
-			if (c=='\\'){
-				c = get_char(r);
-				switch(c){
-					case 'n':
-						c='\n';
-						break;
-					case '\\':
-						break;
-					case '"':
-						break;
-					default:
-						unget_char(r,c);
-						c='\\';
-				}
-			}
-		}
-		val[n++]=c;
-		c=get_char(r);
-	}
-	
-	
-	if(!quote && n>0){
-		while(n>0){
-			if (isspace(val[n-1]))
-				n--;
-			else
-				break;
-		}
-	}
-	
-	val[n]=0;
-
-	return n;
-
-}
-
-
-/*
-int cw_ktv_parse_line (FILE *f, char * key, char * type, char *val)
-{
-	int n;
-
-	struct parser p;
-	p.line=1;
-	p.pos=0;
-	p.prevpos=0;
-	p.quote=0;
-	p.f=f;
-		
-	n = read_key (&p,key,CW_KTV_MAX_KEY_LEN);
-	n = read_type (&p,type,CW_KTV_MAX_KEY_LEN);
-	if (n==-1){
-		return -1;
-	}
-
-	n = read_val (&p,val,CW_KTV_MAX_KEY_LEN);
-	if (n==-1){
-		return -1;
-	}
-	return 0;
-}
- */
-
-
-int cw_ktv_parse_line(struct cw_Val_Reader * r)
-{
-	
-}
-
-int cw_ktv_parse_string(struct cw_Val_Reader *r, char *key, char *type, char *val)
-{
-
-	int n;
-
-	
-
-	n = read_key (r,key,CW_KTV_MAX_KEY_LEN);
-	n = read_type(r,type,200);
-	if (n==1)
-		return -1;
-	n = read_val(r,val,200);
-	return n;
-	
-}

src/cw/cw_ktv_read_file.c

@@ -1,40 +0,0 @@
-
-#include "val.h"
-#include "cfg.h"
-
-int cw_ktv_read_file(FILE * file, mavl_t ktv, mavl_t types)
-{
-	char key[CW_CFG_MAX_KEY_LEN];
-	char type[256];
-	char val[2048];
-	
-	
-	int rc;
-	struct cw_Type typesearch, *cwtype;
-
-	
-	do {
-
-		rc = cw_ktv_read_line(file,key,type,val);
-		if (rc != 0){
-			continue;
-		}
-
-		typesearch.name=type;
-
-		cwtype = mavl_get_ptr(types,&typesearch);
-		if (cwtype != NULL){
-		/*//	printf("Yes! I know the type: %s\n",cwtype->name);*/
-		}
-		else {
-			printf("Unknown type: %s\n",typesearch.name);
-			continue;
-		}
-
-		cw_ktv_add_from_str(ktv,key,cwtype,NULL,val);
-	
-
-	}while(rc==0);
-	
-	return 0;
-}

src/cw/cw_ktv_read_struct.c

@@ -1,62 +0,0 @@
-#include "val.h"
-#include "dbg.h"
-#include "cfg.h"
-
-int cw_ktv_read_struct(mavl_t ktv,const cw_ValStruct_t * stru, const char *pkey, 
-	uint8_t * data, int len)
-{
-	char key[CW_CFG_MAX_KEY_LEN];
-	int pos, i,l;
-	cw_Val_t * result;
-	
-	
-	pos=0; i=0;
-	while (stru[i].type != NULL){
-		char dbstr[100];
-		if(stru[i].position!=-1)
-			pos=stru[i].position;
-		
-		if (stru[i].key!=NULL)
-			sprintf(key,"%s/%s",pkey,stru[i].key);
-		else	
-			sprintf(key,"%s",pkey);
-		
-		switch (stru[i].len){
-			case CW_KTVSTRUCT_L8:
-				l = cw_get_byte(data+pos);
-				pos ++;
-				break;
-			case CW_KTVSTRUCT_L16:
-				l = cw_get_word(data+pos);
-				pos ++;
-				break;
-			case -1:
-				l = len-pos;
-				break;
-			default:
-				l = stru[i].len;
-				if (pos+l > len){
-					l = len-pos;
-				}
-			
-		}
-
-		result = cw_ktv_add(ktv,key,stru[i].type,stru[i].valguard,data+pos,l);
-		
-		stru[i].type->to_str(result,dbstr,100);
-		cw_dbg(DBG_ELEM_DETAIL, "Read (%d): %s: %s",pos,key,dbstr);
-		printf("READ STRUCT (%d): %s: %s\n",pos,key,dbstr);
-		
-		if (stru[i].len==-1)
-			l = result->type->len(result);
-		else 
-			l = stru[i].len;
-	
-		if(stru[i].position == -1)
-			pos+=l;
-
-		i++;
-	}
-
-	return pos;
-}

src/cw/cw_ktv_readline.c

@@ -1,306 +0,0 @@
-#include <ctype.h>
-
-#include "val.h"
-#include "cfg.h"
-
-struct parser {
-	int line;
-	int pos;
-	int prevpos;
-	char error[256];
-	int quote;
-	FILE *f;
-	int (*getc)(struct parser *);
-	void (*ungetc)(struct parser *);
-};
-
-/*
-static int pgetc(struct parser *parser)
-{
-	return fgetc(parser->f);
-}*/
-
-static int get_char(struct parser *p)
-{
-	int c;
-	c = fgetc (p->f);
-	p->pos++;
-	if (c=='\n'){
-		p->prevpos=p->pos;
-		p->line ++;
-		p->pos=0;
-	}
-	return c;
-}
-
-
-static void unget_char(struct parser *p,int c){
-	ungetc(c,p->f);
-	if (c=='\n'){
-		p->line--;
-		p->pos=p->prevpos;
-	}
-	else
-		p->pos--;
-}
-
-
-
-static int get_char_q(struct parser *p)
-{
-	int c;
-
-	while(1) {
-		c = get_char(p);
-		if (c==EOF || c=='\n')
-			return c;
-	
-		if(c=='"' && !p->quote){
-			p->quote=1;
-			continue;
-		}
-		if(c=='"' && p->quote){
-			p->quote=0;
-			continue;
-		}
-		break;
-	}
-	
-	
-	if (!p->quote)
-		return c;
-			
-	if (c!='\\')
-		return c;
-			
-	c = get_char(p);
-	switch(c){
-		case EOF:
-			return c;
-		case 'n':
-			return '\n';
-			
-		case '\\':
-			return '\\';
-		case '"':
-			return '"';
-		default:
-			unget_char(p,c);
-			return '\\';
-	}
-			
-	/* We will never reach here */
-	/* return c;*/
-}
-
-
-
-
-
-
-
-
-
-
-
-
-static int skip_chars (struct parser *p, const char * chars)
-{
-	int c;
-	
-	while ( (c = get_char (p)) != EOF) {
-		if (strchr (chars, c))
-			continue;
-		return c;
-	}
-	return c;
-}
-
-static int skip_to_chars (struct parser *p, const char *chars)
-{
-	int c;
-	
-	while ( (c = get_char (p)) != EOF) {
-		if (strchr (chars, c))
-			return c;
-	}
-	return c;
-}
-
-
-
-static int read_key (struct parser *p, char *key, int max_len)
-{
-	int c,n;
-
-	do {
-		c = skip_chars (p, " \t\n\a\v");
-		if (c == '#') {
-			c = skip_to_chars (p, "\n\a");
-			
-		} else {
-			break;
-		}
-	} while (c != EOF);
-	
-	unget_char(p,c);
-	c=get_char_q(p);
-
-	n=0;
-	while(c!=EOF && n<max_len){
-		if (!p->quote && !isalnum(c) && !strchr("._/-()@#|{}[]\\",c)/*strchr(": \t\n\a",c)*/){
-			unget_char(p,c);
-			break;
-		}
-
-		key[n]=c;
-		c=get_char_q(p);
-		n++;
-
-	}
-	key[n]=0;
-	return n;
-}
-
-
-static int skip_to_colon(FILE *f,struct parser * p)
-{
-	int c;
-	c = skip_chars (p, " \t");
-	if (c!=':'){
-		if (c=='\n'){
-			unget_char(p,c);
-			sprintf(p->error,"Error at line %d, pos %d: Unexpected EOL, collon expected.", p->line, p->pos);
-			return 0;
-		}
-		sprintf(p->error,"Error at line %d, pos %d: Collon expected.", p->line, p->pos);
-		return 0;
-	}
-	return 1;
-}
-
-
-static int read_type(struct parser *p, char *type, int max_len)
-{
-	int c,n;
-	
-	if (!skip_to_colon(p->f,p))
-		return -1;
-
-	c = skip_chars (p, " \t");
-	
-	if (c==':'){
-		unget_char(p,c);
-		sprintf(type,"%s","");
-		return 0;
-	}
-		
-	if (!isalpha(c)){
-		if (c=='\n'){
-			unget_char(p,c);
-			sprintf(p->error,"Error at line %d, pos %d: Unexpected EOL.", p->line, p->pos);
-			return -1;
-		}
-		
-		sprintf(p->error,"Error at line %d, pos %d: Letter expected.", p->line, p->pos);
-		return -1;
-	}
-
-	n=0;
-	while(c!=EOF && n<max_len){
-		if (!isalnum(c) && !strchr("_/-.()@#|{}[]",c)/*strchr(": \t\n\a",c)*/){
-			unget_char(p,c);
-			break;
-		}
-
-		type[n]=c;
-		c=get_char(p);
-		n++;
-	}
-	type[n]=0;
-	return n;
-}
-
-
-static int read_val(struct parser *p, char *val, int max_len){
-	int c,n,quote;
-	if (!skip_to_colon(p->f,p))
-		return -1;
-	c = skip_chars (p, " \t");
-	if (c=='"'){
-		quote=1;
-		c=get_char(p);
-	}
-	else{
-		quote=0;
-	}
-	n=0;
-	while(c!=EOF && n<max_len){
-		if (quote && c=='"'){
-			break;
-		}
-		if (c=='\n'){
-			break;
-		}
-		if (quote){
-			if (c=='\\'){
-				c = get_char(p);
-				switch(c){
-					case 'n':
-						c='\n';
-						break;
-					case '\\':
-						break;
-					case '"':
-						break;
-					default:
-						unget_char(p,c);
-						c='\\';
-				}
-			}
-		}
-		val[n++]=c;
-		c=get_char(p);
-	}
-	
-	
-	if(!quote && n>0){
-		while(n>0){
-			if (isspace(val[n-1]))
-				n--;
-			else
-				break;
-		}
-	}
-	
-	val[n]=0;
-
-	return n;
-
-}
-
-
-
-int cw_ktv_read_line (FILE *f, char * key, char * type, char *val)
-{
-	int n;
-
-	struct parser p;
-	p.line=1;
-	p.pos=0;
-	p.prevpos=0;
-	p.quote=0;
-	p.f=f;
-		
-	n = read_key (&p,key,CW_CFG_MAX_KEY_LEN);
-	n = read_type (&p,type,CW_CFG_MAX_KEY_LEN);
-	if (n==-1){
-		return -1;
-	}
-
-	n = read_val (&p,val,CW_CFG_MAX_KEY_LEN);
-	if (n==-1){
-		return -1;
-	}
-	return 0;
-}

src/cw/cw_ktv_replace.c

@@ -1,32 +0,0 @@
-#include "val.h"
-#include "cw.h"
-
-#include "log.h"
-#include "dbg.h"
-
-cw_Val_t * cw_ktv_replace(mavl_t kvtstore, const char *key, const struct cw_Type *type,
-			const void * valguard,
-			const uint8_t * data, int len)
-{
-	cw_Val_t mdata, *mresult;
-	int exists;
-
-	mdata.key=cw_strdup(key);
-	if (!mdata.key){
-		cw_log(LOG_ERR, "Can't allocate memory for KTV key %s: %s",
-				key,strerror(errno));
-		return NULL;
-	}
-
-	mresult = type->get(&mdata,data,len);
-	if (!mresult){
-		cw_log(LOG_ERR, "Can't create kvstore element for key %s of type %s: %s",
-				key,type->name, strerror(errno));
-		free(mdata.key);
-		return NULL;
-	}
-	
-	mresult = mavl_replace(kvtstore, &mdata, &exists);
-
-	return mresult;
-}

src/cw/cw_ktv_save.c

@@ -1,58 +0,0 @@
-
-#include "val.h"
-
-
-static int write_str(FILE *outfile,const char *str)
-{
-	if ( (strchr(str,'\\')!=NULL) || (strchr(str,'"')!=NULL) || (strchr(str,'\n')!=NULL)){
-		fprintf(outfile,"\"");
-		
-		while (*str != 0){
-			switch(*str){
-				case '\n':
-					fprintf(outfile,"\\n");
-					break;
-				case '\\':
-					fprintf(outfile,"\\\\");
-					break;
-				case '"':
-					fprintf(outfile,"\\\"");
-					break;
-				default:
-					fprintf(outfile,"%c",*str);
-					break;
-			}
-			str++;
-		}
-
-		fprintf(outfile,"\"");
-		return 1;
-	}
-	
-	fprintf(outfile,"%s",str);
-	return 1;
-}
-
-int cw_ktv_save(mavl_t ktvstore, const char * filename){
-	mavliter_t it;
-	FILE * outfile;
-	
-	outfile = fopen(filename,"w");
-	if (outfile == NULL)
-		return 0;
-	
-	mavliter_init(&it,ktvstore);
-	mavliter_foreach(&it){
-		cw_Val_t * val;
-		char buf[4000];
-		val = mavliter_get(&it);
-		val->type->to_str(val,buf,4000);
-		write_str(outfile,val->key);
-		fprintf(outfile," :%s: ",val->type->name);
-		write_str(outfile,buf);
-		fprintf(outfile,"\n");
-		
-	}
-	fclose(outfile);
-	return 1;
-}