WTP bind addr and discovery addr ist configurable

(Work in progress)

INSTALL

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

Makefile

@@ -1,13 +1,23 @@
+.OBJDIR: ./
 
-all:
-	$(MAKE) -C src/cw
-	$(MAKE) -C src/mod
-	$(MAKE) -C src/ac
+all: ac wtp 
 	
 
 clean:
 	$(MAKE) -C src/cw clean
 	$(MAKE) -C src/mod clean
 	$(MAKE) -C src/ac clean
-	
+	$(MAKE) -C src/wtp clean
+
+cw:
+	$(MAKE) -C src/cw 
+
+ac: cw mod
+	$(MAKE) -C src/ac 
+
+wtp: cw mod
+	$(MAKE) -C src/wtp 
+
+mod: cw
+	$(MAKE) -C src/mod 
 

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,11 +5,15 @@ 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\
 
+ACTOBJS = \
+	act.o 
+
+ACTPRG=act
 PRG=actube
 LIBPATH=-L../../lib/$(KERNEL)/$(ARCH)/ -L/usr/local/lib -L/usr/lib 
 
@@ -17,27 +21,37 @@ LIBS+=-lmavl
 LIBS+=-lcw
 LIBS+=-lrt
 LIBS+=-lpthread
-LIBS+=-lconfuse
 LIBS+=-lc
 LIBS+=-lnettle
 LIBS+=-lssl
 LIBS+=-lcrypto
+LIBS+=-ledit
 
 INCL_DIRS=-I../ -I/usr/local/include -I./ -I../../include
 #FLAGS=-DWITH_IPV6 -DWITH_OPENSSL -DSYS_ARCH="$(ARCH)" -DSYS_ARCH="XXX"
-FLAGS=-DWITH_IPV6 -DUSE_OPENSSL -DSYS_ARCH='"$(ARCH)"'
+FLAGS=-DWITH_IPV6 -DUSE_OPENSSL -DSYS_ARCH='"$(KERNEL)/$(ARCH)"'
+
+
+
 
 .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) $(LDFLAGS) $(LIBS) -ledit 
+
+
+
+
 
 clean: 
-	rm  -f $(PRG) $(OBJS)
+	rm -f $(PRG) $(OBJS)
+	rm -f $(ACTPRG) $(ACTOBJS)
 
 

src/ac/ac.h

@@ -1,11 +1,7 @@
 #ifndef __ACTUBE_AC_H
 #define __ACTUBE_AC_H
 
-#include "mavl.h"
-#include "cw/mavltypes.h"
-
-extern mavl_t actube_global_cfg;
-
+#include "cw/cfg.h"
 
 extern struct ac_status ac_global_status;
 
@@ -21,6 +17,8 @@ enum {
 	AC_PROTO_UNKNOWN
 };
 
+int start_rpc(cw_Cfg_t *global_cfg);
+int test_shell();
 
 
 #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"
@@ -48,12 +47,39 @@
 
 #include "cw/cfg.h"
 
-int ac_run();
+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;
@@ -64,9 +90,9 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
 	int c;
 	opterr = 1;
 	
-	bootcfg->cfgfilename = "config.atv";
+	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':
@@ -77,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;
 			}
 
@@ -104,7 +136,6 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
 
 
 struct cw_DiscoveryCache * discovery_cache;
-mavl_t actube_global_cfg;
 
 int ac_global_init()
 {
@@ -141,52 +172,6 @@ extern void test_sets();
 
 
 #include "discovery_cache.h"
-void tester1()
-{
-	struct cw_DiscoveryCache * cache;
-	struct sockaddr_storage addr;
-	int rc;
-	const char *c,*b;
-	
-	cache = discovery_cache_create(1);
-	
-	sock_strtoaddr("192.168.0.12:1234",(struct sockaddr*)&addr);
-	discovery_cache_add(cache,(struct sockaddr*)&addr,"Nase","Loeffel");
-
-	sock_strtoaddr("192.168.0.13:1234",(struct sockaddr*)&addr);
-	discovery_cache_add(cache,(struct sockaddr*)&addr,"Nase","Loeffel");
-
-	
-	rc = discovery_cache_get(cache,(struct sockaddr*)&addr,&c,&b);
-	
-	if (rc) {
-		printf("RC: %d, %s %s\n",rc,c,b);
-	}
-}
-
-
-static 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);
-	}
-	
-	
-}
-
 /*
 	{
 		cw_Cfg_t * cfg;
@@ -214,22 +199,18 @@ static void show_cfg (FILE *out, mavl_t ktv)
 return 0;	
 */
 
+static cw_Cfg_t * global_cfg = NULL;
 
 
 int main (int argc, char *argv[])
 {
 	int rc = 0;
 	struct bootcfg bootcfg;
-	FILE * file;
-	mavl_t types_tree, acglobal_cfg;
-	const cw_Type_t **ti;
-
-
-	cw_Cfg_t * global_cfg = NULL;
 
 	/* 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));
@@ -239,74 +220,44 @@ int main (int argc, char *argv[])
 	rc = cw_cfg_load(bootcfg.cfgfilename,global_cfg);
 	if (rc)
 	{
-		if (rc<0)
+		if (rc)
 			fprintf(stderr,"Can't load cfg '%s': %s\n",bootcfg.cfgfilename,strerror(errno));
 		goto errX;
 	};
 
-
-
-	/* open config file */
-        file = fopen("config.ktv","r");
-        if (file == NULL){
-                cw_log(LOG_ERR,"Cant open config file '%s': %s", 
-				bootcfg.cfgfilename, strerror(errno));
-                exit(EXIT_FAILURE);
-        }
-
-
-	/* create types tree with default types */
-	types_tree = cw_ktv_create_types_tree();
-	for (ti=CW_KTV_STD_TYPES;*ti;ti++){
-		mavl_insert_ptr(types_tree,*ti);
-	}
-	
-	acglobal_cfg = cw_ktv_create();
-	if (acglobal_cfg == NULL){
-		cw_log(LOG_ERR,"Can't create local_cfg: %s",strerror(errno));
-		exit(EXIT_FAILURE);
-	}
-
-	cw_ktv_read_file(file,acglobal_cfg,types_tree);
-
-	fclose(file);
-
-	actube_global_cfg = acglobal_cfg;
-
-
-	cw_dbg_ktv_dump(acglobal_cfg,DBG_INFO,NULL,"CFG:",NULL);
-
-
 	cw_log_name = "AC-Tube";
-	
-	if (!read_config ("ac.conf"))
-		return 1;
-		
-	start_shell();
-
-
-	/* Show debug options if there are any set */
-	if (cw_dbg_opt_level)
-		cw_log (LOG_INFO, "Debug Options: %08X", cw_dbg_opt_level);
-		
-	/* XXX Hard coded debug settigns, set it by config in the future */
-//	cw_dbg_opt_display = DBG_DISP_ASC_DMP | DBG_DISP_COLORS;
-	
-	/* Warn, if the "secret" debugging feature for
-	   developers is turned on ;) */
 
 /*
-//	DBGX("Attention! %s", "DBG X is ON!");
 
-//	cw_mod_set_mod_path("../../lib/actube");
-	//cw_mod_load("capwap");
-	*/
+	{
+	int rc;
+	cw_Cfg_t * cfg = global_cfg;
+	struct cw_Cfg_entry e, *result;
+
+	e.key="hi";
+
+	rc = cw_cfg_base_exists(cfg,"ac-descriptor");
+        if (!rc ){
+		printf("No!\n");
+                return 0;
+        }
+
+	printf("RESULT: %d\n",rc);
+
+	cw_cfg_set(tcfg,"tube.0","hallo");
+	cw_cfg_set(tcfg,"tube.1","welt");
+	cw_cfg_set(tcfg,"tube.2","der guten laune");
+	cw_cfg_dump(tcfg);
+
+	printf("Next Index: %d\n",cw_cfg_get_next_index(tcfg,"kinder"));
 
 
+	exit(0);
+	}
+
+*/
 	
-	
-	
-	
+		
 
 	/* Init DTLS library */
 	dtls_init();
@@ -315,22 +266,33 @@ int main (int argc, char *argv[])
 	
 	if (!socklist_init())
 		goto errX;
-		
+	
 	if (!wtplist_init())
 		goto errX;
 		
 	if (!dataman_list_init())
 		goto errX;
+
+
+
+	ac_conf_init(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", conf_acname, conf_acid);
-	rc = ac_run();
+	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);
 
-	/* XXX There is more cleanup to do */
 	wtplist_destroy();
 	socklist_destroy();
 	return rc;
@@ -339,45 +301,52 @@ errX:
 
 
 
-
-
-
 void process_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len);
 
 void process_cw_data_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len);
 
 
-int ac_run()
-{
 
-	if (!conf_listen_addrs_len) {
-		cw_log (LOG_ERR, "Fatal error: No listen addresses found.");
-		return 1;
-	}
-	
-	
+int ac_run(cw_Cfg_t * cfg)
+{
+        struct cw_Cfg_iter cfi;
+	const char *s;
+	struct cw_Cfg_entry *e;
+	int i;
+
+
 	
 	/* it is important to create the unicast sockets first,
 	 * because when we create the mcast an bcast sockets next
 	 * we will look for already created sockets to find a
 	 * good unicast reply socket */
 	
-	int i;
-	
-	for (i = 0; i < conf_listen_addrs_len; i++) {
+        cw_cfg_iter_init(cfg, &cfi, "actube/listen");
+        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 (conf_listen_addrs[i], addr, port, &proto);
-		
-		socklist_add_unicast (addr, port, proto);
+		conf_parse_listen_addr (s, addr, port, &proto);
+		socklist_add_unicast (addr, port, proto,
+				cw_cfg_get_bool(cfg,"actube/ipv4",1),
+				cw_cfg_get_bool(cfg,"actube/ipv6",1)
+				);
+        }
+	if (!i) {
+		cw_log (LOG_ERR, "Fatal error: No listen addresses found.");
+		return 1;
 	}
-	
+
 	if (socklist_len == 0) {
 		cw_log (LOG_ERR, "Fatal error: Could not setup any listen socket");
 		return 1;
 	}
+
+
+
 	
 	/* create multicast sockets */
 	for (i = 0; i < conf_mcast_groups_len; i++) {
@@ -395,13 +364,21 @@ int ac_run()
 	}
 	
 	/* broadcast socket ipv4 only */
-	for (i = 0; i < conf_bcast_addrs_len; i++) {
+
+        //mavl_print(cfg,pcb,180);
+
+        cw_cfg_iter_init(cfg, &cfi, "actube/bcast");
+        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;
-		conf_parse_listen_addr (conf_bcast_addrs[i], addr, port, &proto);
+		s=e->val;
+		conf_parse_listen_addr (s, addr, port, &proto);
 		
 		socklist_add_broadcast (addr, port, proto);
+
+
 #ifdef WITH_LWAPP
 		
 //              printf("Adding %d\n",socklist_len);
@@ -517,7 +494,7 @@ void process_cw_data_packet (int index, struct sockaddr *addr, uint8_t * buffer,
 	
 	dataman_list_unlock();
 	
-	dataman_add_packet (dm, buffer, len);
+	//dataman_add_packet (dm, buffer, len);
 	
 	return;
 	
@@ -561,7 +538,7 @@ void process_cw_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer,
 
 	if (!wtpman) {
 	
-		wtpman = wtpman_create (index, addr, preamble & 0xf);
+		wtpman = wtpman_create (index, addr, preamble & 0xf, global_cfg);
 		
 		
 		if (!wtpman) {
@@ -581,7 +558,8 @@ 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);
+
 	wtpman_addpacket (wtpman, buffer, len);
 	wtplist_unlock();
 }

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,29 +15,13 @@
     along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/utsname.h>
-
-#include <confuse.h>
-
-#include "cw/capwap.h"
-#include "cw/sock.h"
-
-#include "cw/log.h"
-#include "cw/dbg.h"
 #include "cw/cw_util.h"
-#include "cw/dtls.h"
-
-     #include <sys/param.h>
-     #include <sys/time.h>
-     #include <sys/socket.h>
-     #include <net/if.h>
-
+#include "cw/dbg.h"
+#include "cw/cw.h"
+#include "cw/cfg.h"
 #include "conf.h"
 #include "ac.h"
 
-#include "cw/mavltypes.h"
 
 uint8_t conf_macaddress[12];
 uint8_t conf_macaddress_len = 0;
@@ -45,44 +29,30 @@ uint8_t conf_macaddress_len = 0;
 
 long conf_strict_capwap = 1;
 long conf_strict_headers = 0;
-/*int conf_capwap_mode = CW_MODE_CAPWAP;*/
 
 
 
-const char *conf_acname = NULL;
-int conf_acname_len = 0;
-
 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_listen_addrs;
-int conf_listen_addrs_len = 0;
-
 
 char **conf_mcast_groups = 0;
 int conf_mcast_groups_len = 0;
 
-char **conf_bcast_addrs = 0;
-int conf_bcast_addrs_len;
 
+//struct sockaddr_storage *conf_bsalist = NULL;
 
-struct sockaddr_storage *conf_bsalist = NULL;
+//int conf_salist_len = 0;
+//int conf_bsalist_len = 0;
 
-int conf_salist_len = 0;
-int conf_bsalist_len = 0;
+//struct sockaddr *conf_ac_ips;
+//int conf_ac_ips_len;
 
-struct sockaddr *conf_ac_ips;
-int conf_ac_ips_len;
-
-char *conf_sslcertfilename = NULL;
-char *conf_sslkeyfilename = NULL;
-char *conf_sslkeypass = NULL;
-char *conf_dtls_psk = NULL;
+//char *conf_sslcertfilename = NULL;
+//char *conf_sslkeyfilename = NULL;
+//char *conf_sslkeypass = NULL;
+//char *conf_dtls_psk = NULL;
 
 int conf_security = 0;
 long conf_vendor_id = CONF_DEFAULT_VENDOR_ID;
@@ -120,14 +90,44 @@ char *conf_control_port = 0;
 
 int conf_dtls_verify_peer = 1;
 
-static int init_acname()
+static int init_ac_name(cw_Cfg_t * cfg)
 {
-	if (conf_acname == NULL) {
-		char *s = malloc(strlen(CONF_DEFAULT_ACNAME) + strlen(conf_acid) + 1);
-		sprintf(s, "%s%s", CONF_DEFAULT_ACNAME, conf_acid);
-		conf_acname = s;
+	char *s;
+	char *primary_if=NULL;
+	char ac_name[CAPWAP_MAX_AC_NAME_LEN+1];
+	uint8_t macaddress[128];
+	uint8_t macaddress_len;
+	char acid[128];
+	int i;
+
+
+	s= (char*)cw_cfg_get(cfg,"capwap/ac-name",NULL);
+	if (s!=NULL)
+		return 1;
+
+	if (!primary_if)
+		primary_if = sock_get_primary_if(AF_INET);
+
+	acid[0]=0;
+
+	if (primary_if) {
+		macaddress_len=8;
+		if (!sock_getifhwaddr(primary_if, macaddress, &macaddress_len)) {
+			cw_dbg(DBG_INFO, "Fatal: Unable to detect link layer address for %s\n",
+			       primary_if);
+		}
+		else{
+			s=acid;
+			for (i = 0; i < macaddress_len; i++) {
+				s += sprintf(s, "%02X", macaddress[i]);
+			}
+
+		}
+		free(primary_if);
 	}
-	conf_acname_len = strlen(conf_acname);
+
+	sprintf(ac_name,"actube%s",acid);
+	cw_cfg_set(cfg,"capwap/ac-name",ac_name);
 	return 1;
 }
 
@@ -135,121 +135,27 @@ static int init_acname()
 
 
 
-
-static int init_acid()
-{
-	int i;
-	char *s;
-	
-	if (conf_acid != NULL)
-		return 1;
-
-
-#ifdef WITH_IPV6
-	conf_primary_if = sock_get_primary_if(AF_INET6);
-	if (!conf_primary_if)
-		conf_primary_if = sock_get_primary_if(AF_INET);
-#else
-	conf_primary_if = get_primary_if(AF_INET);
-#endif
-
-	if (!conf_primary_if) {
-		cw_log(LOG_ERR,
-		       "Fatal: Unable to detect primary interface, needed to set ac_id. Pleas use confiPleas u to set ac_id");
-		return 0;
-	}
-
-	if (!sock_getifhwaddr(conf_primary_if, conf_macaddress, &conf_macaddress_len)) {
-		cw_log(LOG_ERR, "Fatal: Unable to detect link layer address for %s\n",
-		       conf_primary_if);
-		return 0;
-	};
-
-
-
-
-	conf_acid = malloc(2 * conf_macaddress_len + 1);
-	s = conf_acid;
-
-	for (i = 0; i < conf_macaddress_len; i++) {
-		s += sprintf(s, "%02X", conf_macaddress[i]);
-	}
-	return 1;
-
-}
-
-
-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()
+static int init_listen_addrs(cw_Cfg_t * cfg)
 {
+	char key[CW_CFG_MAX_KEY_LEN];
+
 	struct ifaddrs *ifap, *ifa;
 	int rc;
 	int ctr;
-	
-	if (conf_listen_addrs != 0)
-		return 1;
+	struct cw_Cfg_iter cfi;
 
 
 
+        cw_cfg_iter_init(cfg, &cfi, "actube/listen");
+	if (cw_cfg_iter_next(&cfi,NULL) != NULL)
+		return 0;
+
 	rc = getifaddrs(&ifap);
 	if (rc == -1)
 		return 0;
 
-	/* count the addresses */
-	ctr = 0;
-	for (ifa = ifap; ifa != 0; ifa = ifa->ifa_next) {
-		if (!ifa->ifa_addr)
-			continue;
-
-		if (ifa->ifa_addr->sa_family == AF_INET && conf_ipv4)
-			ctr++;
-		if (ifa->ifa_addr->sa_family == AF_INET6 && conf_ipv6)
-			ctr++;
-	}
-
-	conf_listen_addrs = malloc(sizeof(char *) * ctr);
-	if (!conf_listen_addrs) {
-		rc = 0;
-		goto errX;
-	}
-	memset(conf_listen_addrs, 0, sizeof(char *) * ctr);
-
-
 	ctr = 0;
 	/* get the addresses */
 	for (ifa = ifap; ifa != 0; ifa = ifa->ifa_next) {
@@ -267,12 +173,9 @@ static int init_listen_addrs()
 		if (ifa->ifa_addr->sa_family == AF_INET && conf_ipv4) {
 			sock_addrtostr(ifa->ifa_addr, str, 100,0);
 
-			conf_listen_addrs[ctr] =
-			    (char *) cw_setstr((uint8_t **) & conf_listen_addrs[ctr],
-					       (uint8_t *) str, strlen(str));
-			if (conf_listen_addrs[ctr])
-				ctr++;
 
+			sprintf(key,"actube/listen.%d",ctr++);
+			cw_cfg_set(cfg,key,str);
 		}
 		if (ifa->ifa_addr->sa_family == AF_INET6 && conf_ipv6) {
 			sock_addrtostr(ifa->ifa_addr, str, 100,0);
@@ -281,16 +184,12 @@ static int init_listen_addrs()
 				strcat(str, "%");
 				strcat(str, ifa->ifa_name);
 			}
-			conf_listen_addrs[ctr] =
-			    (char *) cw_setstr((uint8_t **) & conf_listen_addrs[ctr],
-					       (uint8_t *) str, strlen(str));
-			if (conf_listen_addrs[ctr])
-				ctr++;
+			sprintf(key,"actube/listen.%d",ctr++);
+			cw_cfg_set(cfg,key,str);
 		}
 	}
-	conf_listen_addrs_len = ctr;
 	rc = 1;
-      errX:
+      /*errX:*/
 	freeifaddrs(ifap);
 	return rc;
 }
@@ -336,18 +235,23 @@ static int add_bcast_addr(void *priv, void *addr)
 /*
  * Initialize broadcast addresses (ipv4 only)
  */
-int init_bcast_addrs()
+int init_bcast_addrs(cw_Cfg_t *cfg)
 {
 	int rc;
 	char str[100];
+	char key[100];
 	struct ifaddrs *ifa0, *ifa;
 	mavl_t t;
 	mavliter_t it;
-	
-	if (conf_bcast_addrs)
-		return 1;
+	struct cw_Cfg_iter cfi;
+	int i;
 
-	if (!conf_ipv4)
+        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", 1))
 		return 1;
 
 	/*t = mavl_create_ptr(); */
@@ -385,22 +289,34 @@ int init_bcast_addrs()
 
 
 		if (ifa->ifa_broadaddr) {
+			char *s; //,*sr;
 			sock_addrtostr(ifa->ifa_broadaddr, str, 100,1);
 			*strchr(str, ':') = 0;
-			mavl_add_str(t, cw_strdup(str));
+
+
+			s = cw_strdup(str);
+			mavl_add_str(t, s);
+
+
+//			printf("BCAST = %p --- %p: %s\n",str,s,str);
 		}
 
 	}
 
-	conf_bcast_addrs = malloc(t->count * sizeof(char *));
+//	conf_bcast_addrs = malloc(t->count * sizeof(char *));
 
+	i=0;
 	mavliter_init(&it,t);
 	mavliter_foreach(&it){
 		char * d;
 		d = mavliter_get_str(&it);
-		conf_bcast_addrs[conf_bcast_addrs_len] = cw_strdup(d);
-		if (conf_bcast_addrs[conf_bcast_addrs_len] != 0)
-			conf_bcast_addrs_len++;
+	//	conf_bcast_addrs[conf_bcast_addrs_len] = cw_strdup(d);
+	//	if (conf_bcast_addrs[conf_bcast_addrs_len] != 0)
+	//		conf_bcast_addrs_len++;
+
+		sprintf(key,"actube/bcast.%d",i++);
+		cw_cfg_set(cfg,key,d);
+
 
 	}
 
@@ -412,7 +328,7 @@ int init_bcast_addrs()
 	return 1;
 }
 
-int init_mcast_groups()
+int init_mcast_groups(cw_Cfg_t * cfg)
 {
 	int ctr;
 	int i;
@@ -466,6 +382,7 @@ int init_mcast_groups()
 
 }
 
+/*
 static int conf_read_strings(cfg_t * cfg, char *name, char ***dst, int *len)
 {
 
@@ -491,8 +408,9 @@ static int conf_read_strings(cfg_t * cfg, char *name, char ***dst, int *len)
 	return 1;
 }
 
+*/
 
-
+/*
 static int conf_read_dbg_level(cfg_t * cfg)
 {
 	const char *name = "dbg";
@@ -510,6 +428,7 @@ static int conf_read_dbg_level(cfg_t * cfg)
 	}
 	return 1;
 }
+*/
 
 struct cw_Mod ** conf_mods; 
 char *conf_mods_dir = NULL;
@@ -517,19 +436,26 @@ char *conf_mods_dir = NULL;
 /*
  * Read the module names from config file
  */ 
-static int conf_read_mods(cfg_t *cfg){
+static int init_mods(cw_Cfg_t *cfg){
 
-	int n, i;
-	n = cfg_size(cfg,CFG_ENTRY_MODS);
-	
-	conf_mods = malloc(sizeof(struct cw_Mod *)*(n+1));
+	int  i;
+	struct cw_Cfg_entry *e;
+	const char * modname;
 
-	cw_dbg(DBG_INFO,"Mods directory: %s",conf_mods_dir);
-	cw_mod_set_path(conf_mods_dir);
+	struct cw_Cfg_iter cfi;
+        cw_cfg_iter_init(cfg, &cfi, "actube/mod");
+	if (cw_cfg_iter_next(&cfi,NULL) == NULL){
+		cw_cfg_set(cfg,"actube/mod.0","capwap");
+		cw_cfg_set(cfg,"actube/mod.1","capwap80211");
+	}
 
-	for (i=0; i < n; i++){
-		char *modname = cfg_getnstr(cfg, CFG_ENTRY_MODS, i);
-		struct cw_Mod * mod = cw_mod_load(modname, actube_global_cfg, CW_ROLE_AC);
+//	cw_dbg(DBG_INFO,"Mods directory: %s",conf_mods_dir);
+//	cw_mod_set_path(conf_mods_dir);
+
+        cw_cfg_iter_init(cfg, &cfi, "actube/mod");
+        for (i=0; (e = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
+		modname = e->val;
+		struct cw_Mod * mod = cw_mod_load(modname, cfg, CW_ROLE_AC);
 		
 		if (!mod)
 			return 0;
@@ -619,159 +545,12 @@ 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");
-}
 
 
-int read_config(const char *filename)
+void ac_conf_init(cw_Cfg_t *cfg)
 {
-	int i, n;
-
-	cfg_opt_t opts[] = {
-		CFG_STR_LIST("mods", "{}", CFGF_NONE),
-		CFG_SIMPLE_STR("mods_dir", &conf_mods_dir),
-		
-		CFG_STR_LIST("dbg", "{}", CFGF_NONE),
-		CFG_STR_LIST("listen", "{}", CFGF_NONE),
-		CFG_STR_LIST("mcast_groups", "{}", CFGF_NONE),
-		CFG_STR_LIST("broadcast_listen", "{}", CFGF_NONE),
-		CFG_STR_LIST("ac_ips", "{}", CFGF_NONE),
-		CFG_SIMPLE_STR("control_port", &conf_control_port),
-
-		CFG_SIMPLE_BOOL("strict_capwap", &conf_strict_capwap),
-		CFG_SIMPLE_BOOL("strict_headers", &conf_strict_headers),
-		CFG_SIMPLE_BOOL("use_loopback", &conf_use_loopback),
-/*//		CFG_SIMPLE_STR("capwap_mode", &conf_capwap_mode_str),*/
-
-
-#ifdef WITH_LWAPP
-		CFG_SIMPLE_STR("lw_control_port", &conf_lw_control_port),
-		CFG_SIMPLE_BOOL("lwapp", &conf_lwapp),
-#endif
-
-		CFG_SIMPLE_INT("max_wtps", &conf_max_wtps),
-		CFG_SIMPLE_INT("debug_level", &conf_debug_level),
-
-
-		CFG_SIMPLE_INT("vendor_id", &conf_vendor_id),
-		CFG_SIMPLE_STR("ac_id", &conf_acid),
-		CFG_SIMPLE_STR("ac_name", &conf_acname),
-		CFG_SIMPLE_STR("hardware_version", &conf_hardware_version),
-		CFG_SIMPLE_STR("software_version", &conf_software_version),
-
-		CFG_SIMPLE_STR("cisco_hardware_version", &conf_cisco_hardware_version),
-		CFG_SIMPLE_STR("cisco_software_version", &conf_cisco_software_version),
-
-
-
-		CFG_SIMPLE_STR("ssl_cert", &conf_sslcertfilename),
-		CFG_SIMPLE_STR("ssl_key", &conf_sslkeyfilename),
-		CFG_SIMPLE_STR("ssl_key_pass", &conf_sslkeypass),
-		CFG_SIMPLE_STR("dtls_psk", &conf_dtls_psk),
-
-		CFG_SIMPLE_BOOL("dtls_verify_peer", &conf_dtls_verify_peer),
-		CFG_SIMPLE_BOOL("ipv4", &conf_ipv4),
-		CFG_SIMPLE_BOOL("ipv6", &conf_ipv6),
-		CFG_SIMPLE_STR("db_file", &conf_db_file),
-		CFG_SIMPLE_STR("image_dir", &conf_image_dir),
-
-		CFG_END()
-	};
-	cfg_t *cfg;
-
-	conf_mods_dir=cw_strdup("");
-
-	if (!init_control_port())
-		return 0;
-
-	
-	cfg = cfg_init(opts, CFGF_NONE);
-	cfg_set_error_function(cfg, errfunc);
-
-	if (cfg_parse(cfg, filename))
-		return 0;
-	
-
-	/* read debug options */
-	conf_read_dbg_level(cfg);
-
-	/* read the listen addresses */
-	conf_read_strings(cfg, "listen", &conf_listen_addrs, &conf_listen_addrs_len);
-
-	/* read multi cast groups */
-	conf_read_strings(cfg, "mcast_groups", &conf_mcast_groups,
-			  &conf_mcast_groups_len);
-
-	/* read ipv4 broadcast addresses */
-	conf_read_strings(cfg, "broadcast_listen", &conf_bcast_addrs, &conf_bcast_addrs_len);
-
-
-	/* read ac_ips */
-	n = cfg_size(cfg, "ac_ips");
-	if (!(conf_ac_ips = malloc(sizeof(struct sockaddr) * n)))
-		return 0;
-
-	conf_ac_ips_len = n;
-	for (i = 0; i < n; i++) {
-		struct sockaddr sa;
-		char *str = cfg_getnstr(cfg, "ac_ips", i);
-		if (sock_strtoaddr(cfg_getnstr(cfg, "ac_ips", i), &sa))
-			conf_ac_ips[i] = sa;
-		else {
-			perror(str);
-		}
-	}
-
-
-	if (!conf_read_mods(cfg)){
-		cfg_free(cfg);
-		return 0;
-	}
-
-
-	cfg_free(cfg);
-
-	if (!init_acid())
-		return 0;
-
-	if (!init_acname())
-		return 0;
-
-/*	if (!init_version())
-		return 0;
-*/
-
-	if (!init_vendor_id())
-		return 0;
-
-	if (!init_dtls())
-		return 0;
-
-/*	if (!conf_sslcipher)
-		conf_sslcipher = CAPWAP_CIPHER;
-
-*/	if (!conf_image_dir)
-		conf_image_dir = CONF_DEFAULT_IMAGE_DIR;
-
-
-
-	init_listen_addrs();
-	init_mcast_groups();
-	init_bcast_addrs();
-
-
-	return 1;
-}
-
-void free_config()
-{
-
+	init_listen_addrs(cfg);
+	init_bcast_addrs(cfg);
+	init_ac_name(cfg);
+	init_mods(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>
 
@@ -31,7 +30,7 @@
 #include "cw/bstr.h"
 #include "cw/mod.h"
 #include "cw/vendors.h"
-
+#include "cw/cfg.h"
 
 extern struct cw_Mod ** conf_mods;
 
@@ -94,8 +93,6 @@ extern bstr_t conf_cisco_software_version;
 
 
 
-extern char **conf_listen_addrs;
-extern int conf_listen_addrs_len;
 
 extern struct sockaddr *conf_ac_ips;
 extern int conf_ac_ips_len;
@@ -141,5 +138,8 @@ extern int conf_parse_listen_addr(const char *addr, char *saddr, char *port, int
 
 #define CFG_ENTRY_MODS "mods"
 
+#define CONF_PREFIX "actube"
+
+void ac_conf_init(cw_Cfg_t *cfg);
 
 #endif

src/ac/config.ckv

@@ -0,0 +1,75 @@
+#Cfg
+
+#
+# AC Name
+# Deafults to actube + mac address of primary interface
+#
+#capwap/ac-name
+#
+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"
+
+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
+
+
+# 
+# Whether or not to use IPv4/IPv6 
+#
+#actube/ipv4: true
+#actube/ipv6: true
+#
+actube/ipv6: false
+
+#
+# List of Mods
+#
+#actube/mod.1: capwap
+#actube/mod.2: capwap80211
+#
+
+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
+
+
+capwap/ac-descriptor/dtls-policy:  1
+capwap/ac-descriptor/hardware/vendor: 4232704
+capwap/ac-descriptor/hardware/version: .x01000001
+capwap/ac-descriptor/max-wtps : 200
+capwap/ac-descriptor/active-wtps:  2
+capwap/ac-descriptor/r-mac-field: 1
+cawpap/ac-descriptor/reserved1 : 0
+capwap/ac-descriptor/security : 2
+capwap/ac-descriptor/software/vendor : 0
+capwap/ac-descriptor/software/version: v0.0.1
+capwap/ac-descriptor/station-limit: 1000
+capwap/ac-descriptor/stations: 0
+
+
+capwap/control-ip-address/address.0: 192.168.0.24
+
+
+
+#
+# CAPWAP Timers
+#
+capwap/timers/change-state-pending-timer: Word: 3
+capwap/timers/data-check-timer: Word: 10
+capwap/timers/echo-interval :Byte: 30
+capwap/timers/max-discovery-interval :Byte: 10
+
+
+

src/ac/dataman.c

@@ -114,8 +114,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;

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{
@@ -31,6 +32,9 @@ void discovery_cache_destroy(struct cw_DiscoveryCache * c)
 	
 	if (c->byaddrp)
 		mavl_destroy(c->byaddrp);
+
+	if (c->queue)
+		free(c->queue);
 	
 	free(c);
 }
@@ -105,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);
@@ -141,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);
@@ -163,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);
-		mavl_del(cache->byaddrp,result);
+		cw_dbg(DBG_X,"DOIN MAVL DEL HERO ----- ///////////");
+		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/discovery_cache.h

@@ -3,7 +3,7 @@
 
 
 
-
+#include "cw/mod.h"
 
 
 struct cw_DiscoveryCache * discovery_cache_create(int len);
@@ -14,4 +14,5 @@ void discovery_cache_add(struct cw_DiscoveryCache *cache,
 int discovery_cache_get(struct cw_DiscoveryCache * cache,struct sockaddr *addr, 
 			struct cw_Mod ** modcapwap, struct cw_Mod **modbindings);
 
-#endif
+void discovery_cache_destroy(struct cw_DiscoveryCache * c);
+#endif

src/ac/rpc.c

@@ -0,0 +1,722 @@
+
+#include <stdio.h>
+#include <errno.h>
+#include <string.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 "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);
+
+//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},
+
+	{"@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 *cmd)
+{
+	cw_cfg_fdump(sd->out,sd->global_cfg);
+	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)
+{
+		//fprintf(sd->out,"Unknown command: '%s'\n\r\n\r",cmd);
+
+//	printf("Exitcmd %s\n",cmd);
+	//fprintf(sd->out,"END: %s\n\r",cmd);
+	finish_cmd(sd->out);
+	fflush(sd->out);
+	return 1;
+}
+
+
+
+int cfg_cmd(struct rpcdata *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 {
+		cw_cfg_fdump(sd->out,conn->remote_cfg);
+	}
+	finish_cmd(sd->out);
+	wtplist_unlock();
+	return 0;
+}
+
+int ucfg_cmd(struct rpcdata *sd, const char *cmd)
+{
+//	struct cw_Conn * conn;
+	stop();
+//	show_cfg(sd->out,sd->update_cfg);
+	return 0;
+}
+
+#include "wtpman.h"
+
+int
+send_cmd(struct rpcdata * 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();
+	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");
+//		cw_ktv_read_file(f,sd->update_cfg,conn->msgset->types_tree);
+		//conn->update_cfg=sd->update_cfg;
+		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);
+
+	cw_cfg_destroy(cfg);
+
+	finish_cmd(sd->out);
+
+//	cw_ktv_init_str_reader(&r,str,strlen(str));
+	
+//	cw_ktv_parse_string(&r,key,type,val);
+	/*cw_ktv_parse_string(key,type,val, 2048);*/
+	
+//	fprintf(sd->out,"%s %s\n",key,val);
+//	cw_ktv_add(sd->update_cfg,key,CW_TYPE_STR,NULL,val,strlen(val));
+	return 0;
+}
+
+int del_cmd(struct rpcdata *sd, const char *str)
+{
+	char key[CW_CFG_MAX_KEY_LEN];
+	sscanf(str,"%s",key);
+	stop();
+//	cw_ktv_del_sub(sd->update_cfg,key);
+//
+	return 0;
+}
+
+
+/*
+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 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;
+	
+}
+
+
+void con (FILE *out)
+{
+	stop();
+
+/*	
+	struct connlist * cl;
+	mavliter_t it;
+	
+	
+	
+	wtplist_lock();
+	
+	cl = wtplist_get_connlist();
+	
+	
+	mavliter_init (&it, cl->by_addr);
+	fprintf (out, "IP\t\t\twtp-name\n");
+	mavliter_foreach (&it) {
+		cw_Val_t * result;
+		char addr[SOCK_ADDR_BUFSIZE];
+		char wtp_name[CAPWAP_MAX_WTP_NAME_LEN];
+		struct cw_Conn * conn;
+		conn = mavliter_get_ptr (&it);
+		
+		sock_addr2str_p (&conn->addr, addr);
+		
+		result = cw_ktv_get (conn->remote_cfg, "wtp-name", NULL);
+		
+		if (result == NULL) {
+			strcpy (wtp_name, "");
+			
+		} else {
+			result->type->to_str (result, wtp_name, CAPWAP_MAX_WTP_NAME_LEN);
+		}
+		
+		
+		fprintf (out, "Con!! %s\t\t%s\n", addr, wtp_name);
+		
+		{
+			stop();
+
+			mavl_t update;
+//			update = cw_ktv_create();
+//			cw_ktv_set_byte(update,"radio.255/admin-state",1);
+//			conn->update_cfg=update;
+		}
+
+
+		fprintf(out,"\n");
+
+	}
+	wtplist_unlock();
+	*/
+}
+
+
+struct command * find_cmd(const char *cmd)
+{
+	struct command * search,*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 cw_Val_Reader reader;
+	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){
+			return searchcmd->fun(sd, str+strlen(cmd));
+		}
+	}
+	else{
+		fprintf(sd->out,"Unknown command: '%s'\n",cmd);
+		finish_cmd(sd->out);
+	}
+
+	return 0;
+	
+	
+	char key[CW_CFG_MAX_KEY_LEN];
+	char type[128];
+	char val[2048];
+
+	key[0]=0;
+	type[0]=0;
+	val[0]=0;
+
+	stop();
+//	cw_ktv_init_str_reader(&reader,str, strlen(str));
+//	n = cw_ktv_parse_string(&reader, key,type,val);
+	
+	if (n==-1){
+		int i;
+		fprintf(sd->out,"Error on pos %d\n",reader.pos);
+		fprintf(sd->out,"%s",str);
+		for(i=0;i<reader.pos;i++){
+			fprintf(sd->out," ");
+		}
+		fprintf(sd->out,"^\n");
+		fprintf(sd->out,"%s\n",reader.error);
+	}
+	else{
+		fprintf(sd->out,"%s :%s: %s\n", key,type,val);
+	}
+	return 0;
+	
+	
+	n = sscanf (str, "%s%s", cmd, args);
+
+	if (n<=0)
+		return 0;
+	/*printf("CMD: %s, ARGS:\n",cmd);*/
+	
+	if (strcmp (cmd, "s") == 0) {
+		show_aps (sd->out);
+		return 0;
+	}
+	
+	if (strcmp (cmd, "con")==0){
+		con(sd->out);
+		return 0;
+	}
+	
+	return 0;
+}
+
+struct esc_strings {
+	char *str;
+	char * result;
+};
+
+struct esc_strings estr[] = {
+	{"\x1b[H", "home"},
+	{"\x1b[F", "end"},
+	{"\x1b[A", "up"},
+	{"\x1b[B", "donw"},
+	{"\x1b[D", "left"},
+	{"\x1b[C", "right"},
+
+	{NULL,NULL}
+
+};
+
+
+
+
+
+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;
+
+
+	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);
+		}
+		
+		
+		
+		//cw_dbg (DBG_INFO,"Accepting shell session %i, %s", rc, strerror (errno));
+	}	
+	
+	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_storage client;
+	//socklen_t client_size;
+	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;
+	}
+	//int clientsock = accept (fd, (struct sockaddr*) &client, &client_size);
+
+	return fd;
+}
+
+int start_rpc(cw_Cfg_t *global_cfg)
+{
+	struct sockdata * sockdata;
+	const char *sockname;
+	int rc; //, type;
+	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,491 +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 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 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 conn * conn;
-	show_cfg(sd->out,sd->update_cfg);
-
-}
-
-#include "wtpman.h"
-
-void 
-send_cmd(struct shelldata * sd, const char *cmd)
-{
-	struct 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)
-{
-	struct 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 conn * conn;
-	struct cw_Val_Reader r;
-	char key[CW_KTV_MAX_KEY_LEN];
-	char type[CW_KTV_MAX_KEY_LEN];
-	char val[2048];
-	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_KTV_MAX_KEY_LEN];
-	sscanf(str,"%s",key);
-	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 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 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 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 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_KTV_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/socklist.c

@@ -335,7 +335,7 @@ static int socklist_check_size()
 }
 
 
-int socklist_add_unicast(const char *addr, const char *port, int ac_proto)
+int socklist_add_unicast(const char *addr, const char *port, int ac_proto, int ipv4, int ipv6)
 {
 	char sock_buf[SOCK_ADDR_BUFSIZE];
 	struct addrinfo hints;
@@ -364,6 +364,14 @@ int socklist_add_unicast(const char *addr, const char *port, int ac_proto)
 		struct sockaddr broadcast;
 		struct sockaddr *sa;
 		int sockfd;
+
+		if (res->ai_addr->sa_family == AF_INET && !ipv4){
+			continue;
+		}
+		if (res->ai_addr->sa_family == AF_INET6 && !ipv6){
+			continue;
+		}
+
 		
 		ifname[0] = 0;
 		rc = sock_getifinfo(res->ai_addr, ifname, &broadcast, &netmask);
@@ -372,6 +380,7 @@ int socklist_add_unicast(const char *addr, const char *port, int ac_proto)
 			continue;
 		}
 
+		
 		/* Bind the control port */
 		sa = res->ai_addr;
 		sockfd = socket(res->ai_addr->sa_family, SOCK_DGRAM, 0);

src/ac/socklist.h

@@ -40,7 +40,7 @@ struct socklistelem{
 
 
 extern int socklist_add_multicast(const char * addr, const char * port, int ac_proto);
-extern int socklist_add_unicast(const char *addr, const char * port, int ac_proto);
+extern int socklist_add_unicast(const char *addr, const char * port, int ac_proto, int ipv4, int ipv6);
 extern int socklist_add_broadcast(const char *addr, const char * port,int ac_proto);
 extern int socklist_init();
 extern void socklist_destroy();

src/ac/statemachine.c

@@ -0,0 +1,137 @@
+#include <stdint.h>
+
+#include <mavl.h>
+
+#include "cw/capwap.h"
+#include "cw/dbg.h"
+
+#include "statemachine.h"
+
+static cw_StateMachineState_t statemachine_states[];
+
+int cw_statemachine_run(struct cw_StateMachine * mach)
+{
+	struct mavl * st = cw_statemachine_load_states(NULL,statemachine_states);
+	mavl_destroy(st);
+	return 0;
+}
+
+static cw_StateMachineState_t statemachine_states[]={
+	{	CW_STATE_NONE, CAPWAP_STATE_DISCOVERY,		/* transition */
+		NULL,0						/* timer */
+
+	}
+	,
+
+
+	{
+		CAPWAP_STATE_DTLS_SETUP, CAPWAP_STATE_JOIN,	/* transition */
+		"wait-join",CAPWAP_WAIT_JOIN,			/* timer */
+		1						/* retval */
+	}
+	,
+	{
+		CAPWAP_STATE_JOIN,CAPWAP_STATE_TIMEOUT,
+		NULL,0,
+		0, "WTP Join timeout"
+	}
+	,
+	{
+		CAPWAP_STATE_JOIN, CAPWAP_STATE_JOIN,
+		NULL,0,
+		1, "WTP has joined"
+		
+	}
+	,
+	{
+		CAPWAP_STATE_JOIN, CAPWAP_STATE_CONFIGURE,
+		"capwap-timers/change-state-pending-timer",CAPWAP_TIMER_CHANGE_STATE_PENDING_TIMER,
+		1, NULL
+	}
+	,
+	{
+		CAPWAP_STATE_CONFIGURE,CAPWAP_STATE_TIMEOUT,
+		NULL,0,
+		0, "WTP change state timeout"
+	}
+	,
+	{
+		CAPWAP_STATE_CONFIGURE,CAPWAP_STATE_DATA_CHECK,
+		"capwap-timers/data-check-timer",CAPWAP_TIMER_DATA_CHECK_TIMER,
+		1, NULL
+	}
+	,
+	{
+		CAPWAP_STATE_DATA_CHECK,CAPWAP_STATE_TIMEOUT,
+		NULL,0,
+		0, "WTP data check timeout"
+	}
+	,
+	
+	{
+		CAPWAP_STATE_DATA_CHECK,CAPWAP_STATE_RUN,
+		"capwap-timers/echo-interval",CAPWAP_ECHO_INTERVAL,
+		1, NULL
+	}
+	,
+	{
+		CAPWAP_STATE_RUN,CAPWAP_STATE_RUN,
+		"capwap-timers/echo-interval",CAPWAP_ECHO_INTERVAL,
+		1, NULL
+	}
+	,
+	{
+		CAPWAP_STATE_RUN,CAPWAP_STATE_TIMEOUT,
+		NULL,0,
+		0, "WTP echo timout"
+	}
+	,
+	{0,0,0}
+};
+
+
+
+static int cmp_statemachine_state(const void *state1, const void *state2)
+{
+        const struct cw_StateMachineState *s1 = state1;
+        const struct cw_StateMachineState *s2 = state2;
+        int rc;
+        rc = s1->state - s2->state;
+        if (rc!=0)
+                return rc;
+        return s1->prevstate-s2->prevstate;
+}
+
+
+struct mavl * cw_statemachine_load_states (struct mavl * statemachine_states, cw_StateMachineState_t * states)
+{
+        cw_StateMachineState_t * s;
+        int replaced;
+	cw_dbg(DBG_STATE,"Loading State Machine States");
+
+	if (statemachine_states == NULL){
+		statemachine_states = mavl_create(cmp_statemachine_state,NULL,sizeof(cw_StateMachineState_t));
+		if (statemachine_states == NULL)
+			return NULL;
+	}
+
+        s=states;
+        while (s->state != 0){
+                const char * repstr;
+                mavl_replace(statemachine_states,s,&replaced);
+
+                if (replaced){
+                        repstr = "Replacing";
+                }
+                else{
+                        repstr = "Adding";
+                }
+                cw_dbg(DBG_STATE,"     %s: [%s->%s]",repstr,
+                        cw_strstate(s->prevstate),
+                        cw_strstate(s->state));
+                s++;
+        }
+        return NULL;
+}
+
+

src/ac/statemachine.h

@@ -0,0 +1,13 @@
+#ifndef STATEMACHINE_H
+#define STATEMACHINE_H
+
+struct cw_StateMachine{
+	uint8_t prevstate,currentstate;
+
+};
+
+
+struct mavl * cw_statemachine_load_states (struct mavl * statemachine_states, cw_StateMachineState_t * states);
+int cw_statemachine_run(struct cw_StateMachine * mach);
+
+#endif

src/ac/wtplist.c

@@ -71,17 +71,17 @@ void wtplist_destroy()
 struct wtpman * wtplist_get(const struct sockaddr * addr)
 {
 
-	struct conn * conn = connlist_get(connlist,addr);
+	struct cw_Conn * conn = connlist_get(connlist,addr);
 	if (!conn)
 		return 0;
 	return conn->data;
 
 }
 
-struct wtpman * wtplist_get_by_session_id(bstr16_t *session_id)
+struct wtpman * wtplist_get_by_session_id(bstr16_t session_id)
 {
-	struct conn  search;
-	struct conn * conn;
+	struct cw_Conn  search;
+	struct cw_Conn * conn;
 	
 	search.session_id = session_id;
 	/*memcpy (search.session_id, session_id,16);*/

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

@@ -21,7 +21,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <unistd.h> 
+#include <unistd.h>
 
 
 #include "cw/capwap.h"
@@ -37,7 +37,6 @@
 
 #include "ac.h"
 #include "conf.h"
-#include "db.h"
 #include "socklist.h"
 #include "wtpman.h"
 #include "wtplist.h"
@@ -45,34 +44,6 @@
 
 #include "actube.h"
 
-static void reset_echointerval_timer(struct wtpman *wtpman)
-{
-/*	char sock_buf[SOCK_ADDR_BUFSIZE];*/
-/*	uint16_t ct = mbag_get_word(wtpman->conn->local, CW_ITEM_CAPWAP_TIMERS,
-				    CW_MAX_DISCOVERY_INTERVAL << 8 |
-				    CAPWAP_ECHO_INTERVAL);
-*/
-	/* start echinterval timer and put 2 seconds for "safety" on it */
-
-/*
-//	wtpman->echointerval_timer = cw_timer_start(2+ (ct & 0xff));
-//	db_ping_wtp(sock_addr2str_p(&wtpman->conn->addr,sock_buf), conf_acname);
-//	cw_dbg(DBG_X, "Starting capwap timer: %d", wtpman->echointerval_timer);
-*/
-
-}
-
-
-static int msg_start_handler(struct conn *conn, struct cw_action_in *a, uint8_t * data,
-			     int len, struct sockaddr *from)
-{
-	struct wtpman *wtpman = conn->data;
-	reset_echointerval_timer(wtpman);
-	return 0;
-}
-
-
-
 
 static void wtpman_remove(struct wtpman *wtpman)
 {
@@ -86,6 +57,7 @@ static void wtpman_remove(struct wtpman *wtpman)
 
 static void wtpman_run_discovery(void *arg)
 {
+
 	struct wtpman *wtpman = (struct wtpman *) arg;
 
 	time_t timer = cw_timer_start(10);
@@ -97,20 +69,24 @@ static void wtpman_run_discovery(void *arg)
 	       && 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;
-			
-			cw_dbg(DBG_INFO,"Discovery has detected mods: %s %s", 
-				wtpman->conn->cmod->name,wtpman->conn->bmod->name);
+
+
+		if (cw_result_is_ok(rc)) {
+			wtpman->conn->capwap_state = CAPWAP_STATE_JOIN;
+
+			cw_dbg(DBG_INFO, "Discovery has detected mods: %s %s",
+			       wtpman->conn->cmod->name,
+			       wtpman->conn->bmod->name);
 
 			wtplist_lock();
-			discovery_cache_add(discovery_cache,(struct sockaddr*)&wtpman->conn->addr,
-				wtpman->conn->cmod,wtpman->conn->bmod);
+			discovery_cache_add(discovery_cache,
+					    (struct sockaddr *) &wtpman->conn->
+					    addr, wtpman->conn->cmod,
+					    wtpman->conn->bmod);
 			wtplist_unlock();
-			
+
 		}
 	}
-
 	return;
 }
 
@@ -124,43 +100,47 @@ static int wtpman_dtls_setup(void *arg)
 	/* try to accept the connection */
 	if (!dtls_accept(wtpman->conn)) {
 		cw_dbg(DBG_DTLS, "Error establishing DTLS session with %s",
-		       sock_addr2str_p(&wtpman->conn->addr,sock_buf));
+		       sock_addr2str_p(&wtpman->conn->addr, sock_buf));
 		return 0;
 	}
 
 	cw_dbg(DBG_DTLS, "DTLS session established with %s, %s",
-	       sock_addr2str_p(&wtpman->conn->addr,sock_buf), dtls_get_cipher(wtpman->conn,cipherstr));
+	       sock_addr2str_p(&wtpman->conn->addr, sock_buf),
+	       dtls_get_cipher(wtpman->conn, cipherstr));
 
 
 	return 1;
 }
-
+/*
 static int wtpman_join(void *arg)
 {
 	int rc;
 	char sock_buf[SOCK_ADDR_BUFSIZE];
 	struct wtpman *wtpman = (struct wtpman *) arg;
-	struct conn *conn = wtpman->conn;
+	struct cw_Conn *conn = wtpman->conn;
 	time_t timer, wait_join;
 
-	cw_dbg(DBG_INFO, "Join State - %s", sock_addr2str(&conn->addr,sock_buf));
-	
-	wait_join = cw_ktv_get_word(conn->global_cfg,"wait-join",CAPWAP_WAIT_JOIN);
+	cw_dbg(DBG_INFO, "Join State - %s",
+	       sock_addr2str(&conn->addr, sock_buf));
+
+	wait_join =
+	    cw_ktv_get_word(conn->global_cfg, "wait-join", CAPWAP_WAIT_JOIN);
 
 	timer = cw_timer_start(wait_join);
 
 
-	while (!cw_timer_timeout(timer) && wtpman->conn->capwap_state == CAPWAP_STATE_JOIN) {
+	while (!cw_timer_timeout(timer)
+	       && wtpman->conn->capwap_state == CAPWAP_STATE_JOIN) {
 		rc = cw_read_messages(wtpman->conn);
 		if (rc < 0) {
 			if (errno == EAGAIN)
 				continue;
-				
+
 			break;
 		}
-		cw_dbg_ktv_dump(conn->remote_cfg,DBG_INFO,
-		"-------------dump------------",
-		"DMP","---------end dump --------");
+		cw_dbg_ktv_dump(conn->remote_cfg, DBG_INFO,
+				"-------------dump------------",
+				"DMP", "---------end dump --------");
 	}
 
 	if (rc != 0) {
@@ -170,8 +150,9 @@ static int wtpman_join(void *arg)
 
 
 	if (wtpman->conn->capwap_state != CAPWAP_STATE_JOIN_COMPLETE) {
-		cw_dbg(DBG_MSG_ERR, "No join request from %s after %d seconds, WTP died.",
-		       sock_addr2str(&wtpman->conn->addr,sock_buf), wait_join);
+		cw_dbg(DBG_MSG_ERR,
+		       "No join request from %s after %d seconds, WTP died.",
+		       sock_addr2str(&wtpman->conn->addr, sock_buf), wait_join);
 
 		return 0;
 	}
@@ -181,11 +162,14 @@ 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 conn *conn = wtpman->conn;
+	struct cw_Conn *conn = wtpman->conn;
 
 	// Image upload 
 	const char *filename = mbag_get_str(conn->outgoing, CW_ITEM_IMAGE_FILENAME, NULL);
@@ -241,13 +225,13 @@ static void wtpman_image_data(struct wtpman *wtpman)
 
 
 
-void * wtpman_run_data(void *wtpman_arg)
+void *wtpman_run_data(void *wtpman_arg)
 {
 
 	return NULL;
 /*
 	struct wtpman *wtpman = (struct wtpman *) wtpman_arg;
-	struct conn *conn = wtpman->conn;
+	struct cw_Conn *conn = wtpman->conn;
 
 
 	uint8_t data[1001];
@@ -263,44 +247,49 @@ void * wtpman_run_data(void *wtpman_arg)
 
 }
 
-int cw_run_state_machine(struct conn * conn, time_t *timer)
+
+
+int cw_run_state_machine(struct cw_Conn *conn, time_t * timer)
 {
 
 	int timerval;
 	cw_StateMachineState_t search, *result;
 
-	
-	while(1){
+
+	while (1) {
 		search.state = conn->capwap_state;
 		search.prevstate = conn->capwap_prevstate;
-		result = mavl_get(conn->msgset->state_machine,&search);
-		
-		cw_dbg(DBG_STATE,"State transition: [%s -> %s]",
-			cw_strstate(conn->capwap_prevstate),
-			cw_strstate(conn->capwap_state)
-			);
-		if (result == NULL){
-			cw_log(LOG_ERR,"State not found");
+		result = mavl_get(conn->msgset->statemachine_states, &search);
+
+		cw_dbg(DBG_STATE, "State transition: [%s -> %s]",
+		       cw_strstate(conn->capwap_prevstate),
+		       cw_strstate(conn->capwap_state)
+		    );
+		if (result == NULL) {
+			cw_log(LOG_ERR, "State not found");
 			return 0;
 		}
-		if (result->jump_state){
+		if (result->jump_state) {
 			conn->capwap_state = result->jump_state;
 			conn->capwap_prevstate = result->jump_prevstate;
-			
-			cw_dbg(DBG_STATE,"Jump to state: [%s->%s]",
-				cw_strstate(conn->capwap_prevstate),
-				cw_strstate(conn->capwap_state));
+
+			cw_dbg(DBG_STATE, "Jump to state: [%s->%s]",
+			       cw_strstate(conn->capwap_prevstate),
+			       cw_strstate(conn->capwap_state));
 			continue;
 		}
-		
-		if (result->dbgmsg){
-			cw_dbg(DBG_STATE,"%s",result->dbgmsg);
+
+		if (result->dbgmsg) {
+			cw_dbg(DBG_STATE, "%s", result->dbgmsg);
 		}
-		
-		if (result->timer_key){
-			timerval = cw_ktv_get_word(conn->local_cfg,result->timer_key,result->timer_default);
+
+		if (result->timer_key) {
+			timerval =
+			    cw_cfg_get_word(conn->local_cfg, result->timer_key,
+					    result->timer_default);
 			*timer = cw_timer_start(timerval);
-			cw_dbg(DBG_STATE,"Starting timer: [%s] - %d seconds.",result->timer_key,timerval);
+			cw_dbg(DBG_STATE, "Starting timer: [%s] - %d seconds.",
+			       result->timer_key, timerval);
 		}
 		return result->retval;
 	}
@@ -309,26 +298,25 @@ int cw_run_state_machine(struct conn * conn, time_t *timer)
 
 /*#define CW_TRANSITION(prestate,state) (prestate<<16|state)*/
 
-static void * wtpman_main(void *arg)
+static void *wtpman_main(void *arg)
 {
-	mavl_t r;
-	int rc ;
+	//mavl_t r;
+	int rc;
 	time_t timer;
-	char sock_buf[SOCK_ADDR_BUFSIZE];
-	struct conn *conn;
-	int last_state;
-
+	//char sock_buf[SOCK_ADDR_BUFSIZE];
+	struct cw_Conn *conn;
+//	int last_state;
 	struct wtpman *wtpman = (struct wtpman *) arg;
 
 	wtpman->conn->seqnum = 0;
 	conn = wtpman->conn;
 
-	wtpman->conn->remote_cfg = cw_ktv_create(); 
-	
+//	wtpman->conn->remote_cfg = cw_cfg_create();
 
-	/* We were invoked with an unencrypted packet, 
-	 * so assume, it is a discovery request */
-	if (!wtpman->dtlsmode){
+
+	if (!wtpman->dtlsmode) {
+		/* We were invoked with an unencrypted packet, 
+		 * so assume, it is a discovery request */
 		wtpman_run_discovery(arg);
 		wtpman_remove(wtpman);
 		return NULL;
@@ -337,65 +325,41 @@ static void * wtpman_main(void *arg)
 
 	/* reject connections to our multi- or broadcast sockets */
 	if (socklist[wtpman->socklistindex].type != SOCKLIST_UNICAST_SOCKET) {
-		cw_dbg(DBG_DTLS,"Reject multi");
+		cw_dbg(DBG_DTLS, "Reject multi");
 		wtpman_remove(wtpman);
 		return NULL;
 	}
-	
+
 	conn->capwap_state = CAPWAP_STATE_DTLS_SETUP;
 	/* establish dtls session */
 	if (!wtpman_dtls_setup(wtpman)) {
 		wtpman_remove(wtpman);
 		return NULL;
 	}
-	
+
 	/*last_state = conn->capwap_state;
-	conn->capwap_state = CAPWAP_STATE_JOIN;
-*/
+	   conn->capwap_state = CAPWAP_STATE_JOIN;
+	 */
 	conn->capwap_prevstate = CAPWAP_STATE_DTLS_SETUP;
 	conn->capwap_state = CAPWAP_STATE_JOIN;
 	rc = 0;
-	
-	while (1){
-	
-		int wait_join;
-		int wait_change_state;
-		
-		
-		
-		if (!cw_run_state_machine(conn, &timer)){
-			cw_dbg(DBG_INFO,"WTP died");
-					wtpman_remove(wtpman);
-				return NULL;		
+
+	while (1) {
+
+		//int wait_join;
+		//int wait_change_state;
+
+
+
+		if (!cw_run_state_machine(conn, &timer)) {
+			cw_dbg(DBG_INFO, "WTP died");
+			wtpman_remove(wtpman);
+			return NULL;
 		};
-		
-		
+
+
 		while (!cw_timer_timeout(timer)) {
-			if (conn->update_cfg != NULL){
-				mavl_t tmp;
-		
 
-				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)
@@ -403,37 +367,37 @@ static void * wtpman_main(void *arg)
 			}
 			break;
 		}
-		
-		if(rc<0){
+
+		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);
@@ -443,198 +407,128 @@ static void * wtpman_main(void *arg)
 
 
 	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));
+	       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. 
-	 */
+	exit(0);
 
-	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)
 {
 	if (wtpman->conn)
 		conn_destroy(wtpman->conn);
+	
+	if (wtpman->wtp_cfg)
+		cw_cfg_destroy(wtpman->wtp_cfg);
+
 	free(wtpman);
 }
 
 
+static void copy(struct cw_ElemHandlerParams * params)
+{
+//	struct wtpman * wtpman;
+	//struct cw_Conn * conn;
+	//wtpman = (struct wtpman*)params->conn->data;
+	//conn = (struct cw_Conn*)params->conn;
 
-struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr, int dtlsmode)
+
+//	cw_dbg(DBG_X,"-------------  Here is the config we ve got from WTP ---------------- ");
+//	cw_cfg_dump(params->cfg);
+//	cw_dbg(DBG_X,"-------------  This was the config we ve got from WTP ---------------- ");
+//	cw_dbg(DBG_X,"Now copying:");
+//	cw_cfg_copy(params->cfg,conn->local_cfg,0,"");
+        cw_cfg_copy(params->cfg, params->conn->remote_cfg,DBG_CFG_UPDATES,"GlobalCfg");
+
+//	cw_dbg(DBG_X,"Copying done.");
+}
+
+static int discovery_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
+{
+	struct cw_Conn * conn = (struct cw_Conn*)params->conn;
+	char filename[200];
+
+	cw_dbg(DBG_X,"DISCOVERY Callback");
+	copy(params);
+
+	const char * wtpname = cw_cfg_get(conn->remote_cfg,"capwap/wtp-name","default");
+	sprintf(filename,"wtp-discovery-%s.ckv",wtpname);
+	cw_cfg_save(filename,params->cfg,NULL);
+	cw_cfg_clear(params->cfg);
+		
+	return 0;
+}
+
+static int join_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
+{
+	struct cw_Conn * conn = (struct cw_Conn*)params->conn;
+	char filename[200];
+
+	cw_dbg(DBG_X,"JOIN Callback");
+	copy(params);
+	const char * wtpname = cw_cfg_get(conn->remote_cfg,"capwap/wtp-name","default");
+	sprintf(filename,"wtp-join-%s.ckv",wtpname);
+	cw_cfg_save(filename,params->cfg,NULL);
+	cw_cfg_clear(params->cfg);
+	return 0;
+}
+
+static int update_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
+{
+	struct cw_Conn * conn = (struct cw_Conn*)params->conn;
+	char filename[200];
+
+
+	
+	cw_dbg(DBG_X,"UPDATE Callback");
+	copy(params);
+
+	const char * wtpname = cw_cfg_get(conn->remote_cfg,"capwap/wtp-name","default");
+	sprintf(filename,"wtp-status-%s.ckv",wtpname);
+	cw_cfg_save(filename,params->cfg,NULL);
+//stop();	
+	return 0;
+}
+
+static int event_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
+{
+	struct cw_Conn * conn = (struct cw_Conn*)params->conn;
+	char filename[200];
+
+
+	
+	cw_dbg(DBG_X,"WTP EVENT Callback");
+	copy(params);
+
+	const char * wtpname = cw_cfg_get(conn->remote_cfg,"capwap/wtp-name","default");
+	sprintf(filename,"wtp-event-%s.ckv",wtpname);
+	cw_cfg_save(filename,conn->remote_cfg,NULL);
+//stop();	
+	return 0;
+}
+
+
+
+
+
+struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
+			     int dtlsmode, cw_Cfg_t * global_cfg)
 {
 	struct sockaddr dbgaddr;
 	socklen_t dbgaddrl;
 	int sockfd, replyfd;
 	char sock_buf[SOCK_ADDR_BUFSIZE];
-	
+
 	struct wtpman *wtpman;
 	wtpman = malloc(sizeof(struct wtpman));
 	if (!wtpman)
 		return 0;
-	memset(wtpman, 0, sizeof(struct wtpman));
 
 	if (socklist[socklistindex].type != SOCKLIST_UNICAST_SOCKET) {
 
@@ -642,8 +536,9 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr, int dt
 		replyfd = socklist_find_reply_socket(srcaddr, port);
 
 		if (replyfd == -1) {
-			cw_log(LOG_ERR, "Can't find reply socket for request from %s",
-			       sock_addr2str(srcaddr,sock_buf));
+			cw_log(LOG_ERR,
+			       "Can't find reply socket for request from %s",
+			       sock_addr2str(srcaddr, sock_buf));
 			free(wtpman);
 			return NULL;
 		}
@@ -651,43 +546,69 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr, int dt
 		replyfd = socklist[socklistindex].sockfd;
 	}
 
-	sockfd = replyfd;	/*//socklist[socklistindex].reply_sockfd;*/
-	
-	
-	
-	
-	
+	sockfd = replyfd;	/*//socklist[socklistindex].reply_sockfd; */
 
 
 	dbgaddrl = sizeof(dbgaddr);
 	getsockname(sockfd, &dbgaddr, &dbgaddrl);
 
 	cw_dbg(DBG_INFO, "Creating wtpman on socket %d, %s:%d", sockfd,
-	       sock_addr2str(&dbgaddr,sock_buf), sock_getport(&dbgaddr));
+	       sock_addr2str(&dbgaddr, sock_buf), sock_getport(&dbgaddr));
 
 
+	memset(wtpman, 0, sizeof(struct wtpman));
 
-	wtpman->conn = conn_create(sockfd, srcaddr, 100);
-	wtpman->conn->role = CW_ROLE_AC;
-
-	wtpman->conn->data_sock = socklist[socklistindex].data_sockfd;
-	sock_copyaddr(&wtpman->conn->data_addr, (struct sockaddr *) &wtpman->conn->addr);
+	wtpman->global_cfg = global_cfg;
 
+	wtpman->conn = cw_conn_create(sockfd, srcaddr, 100);
 	if (!wtpman->conn) {
 		wtpman_destroy(wtpman);
 		return NULL;
 	}
+	wtpman->conn->global_cfg = global_cfg;
+	wtpman->conn->local_cfg = cw_cfg_create();
+	wtpman->wtp_cfg = cw_cfg_create();
+
+
+	wtpman->conn->role = CW_ROLE_AC;
+	wtpman->conn->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);
+
+	cw_conn_set_msg_cb(wtpman->conn,
+			CAPWAP_MSG_WTP_EVENT_REQUEST,
+			event_cb);
 
 
 
 
-
-
-
-	wtpman->conn->mods = conf_mods;
+//	wtpman->conn->mods = conf_mods;
 
 	wtpman->conn->strict_capwap = conf_strict_capwap;
 	wtpman->conn->strict_hdr = conf_strict_headers;
+
+//	wtpman->conn->setup_complete = setup_complete;
 /*
 //	wtpman->conn->radios = mbag_i_create();
 //	wtpman->conn->radios_upd = mbag_i_create();
@@ -698,45 +619,46 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr, int dt
 */
 
 
-	wtpman->conn->local_cfg = cw_ktv_create();
-	wtpman->conn->global_cfg = actube_global_cfg;
-	wtpman->conn->local_cfg = actube_global_cfg;
 
 	/* when created caused by a packet in DTLS mode, we try
 	 * to find out the modules to load, for detected connection 
 	 * from discovery request */
-	if (dtlsmode){
+	if (dtlsmode) {
 		int rc;
 		struct cw_Mod *cmod, *bmod;
-		
-		rc = discovery_cache_get(discovery_cache,srcaddr,&cmod,&bmod);
-		if (rc){
-			cw_dbg(DBG_INFO, "Initializing with mod %s %s",cmod->name,bmod->name);
-			wtpman->conn->msgset = cw_mod_get_msg_set(wtpman->conn,cmod,bmod);
-			wtpman->conn->detected=1;
+
+		rc = discovery_cache_get(discovery_cache, srcaddr, &cmod,
+					 &bmod);
+		if (rc) {
+			cw_dbg(DBG_INFO, "Initializing with mod %s %s",
+			       cmod->name, bmod->name);
+			wtpman->conn->msgset =
+			    cw_mod_get_msg_set(wtpman->conn, cmod, bmod);
+			wtpman->conn->detected = 1;
 			cmod->setup_cfg(wtpman->conn);
+//	               if (wtpman->conn->setup_complete)
+//        	                wtpman->conn->setup_complete(wtpman->conn);
+
+
 		}
 	}
 
+	cw_dbg(DBG_X,"WTPMAN_CREATED: %p",wtpman);
+
 	return wtpman;
 }
 
 
 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);
 }
 
 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);
+	cw_dbg(DBG_INFO, "Starting wtpman, DTLS mode = %d", dtlsmode);
+	wtpman->dtlsmode = dtlsmode;
+	pthread_create(&wtpman->thread, NULL, wtpman_main, (void *) wtpman);
 	return;
 }
-
-
-
-
-

src/ac/wtpman.h

@@ -8,19 +8,21 @@
 #include "cw/capwap.h"
 #include "cw/fragman.h"
 #include "cw/timer.h"
+#include "cw/cfg.h"
+#include "cw/capwap.h"
 
 #define WTPMAN_QSIZE 1024
 
-struct wtpman{
+struct wtpman {
 	pthread_t thread;
 
-	struct conn * conn;
+	struct cw_Conn *conn;
 
 
 	/* wtp data */
-	uint8_t * wtp_name;
-	uint8_t * wtp_location;
-	uint8_t * session_id;
+	uint8_t *wtp_name;
+	uint8_t *wtp_location;
+	uint8_t *session_id;
 	uint8_t wtp_mactype;
 
 	int socklistindex;
@@ -28,8 +30,17 @@ struct wtpman{
 
 	int dtlsmode;
 
-	cw_timer_t echointerval_timer; 
+	cw_timer_t echointerval_timer;
 
+	cw_Cfg_t * global_cfg; /**< contains the cfg of AC, 
+				 visible to all wtpman threads.  
+				 The global cfg was initally read
+				 from a .ckv file on startup.
+				 */
+
+	cw_Cfg_t * wtp_cfg;
+
+	
 
 };
 
@@ -43,13 +54,14 @@ struct wtp{
 //extern void wtpman_run(void *arg);
 */
 
-struct wtpman * wtpman_create();
+struct wtpman *wtpman_create();
 
-struct wtpman * wtpman_create(int socklistindex,struct sockaddr * srcaddr, int dtlsmode);
+struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
+			     int dtlsmode, cw_Cfg_t * global_cfg);
 
-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);
+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);
 
 
 

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/Doxyfile

@@ -1743,7 +1743,7 @@ RTF_EXTENSIONS_FILE    =
 # classes and files.
 # The default value is: NO.
 
-GENERATE_MAN           = NO
+GENERATE_MAN           = YES
 
 # The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -1770,7 +1770,7 @@ MAN_EXTENSION          = .3
 # The default value is: NO.
 # This tag requires that the tag GENERATE_MAN is set to YES.
 
-MAN_LINKS              = NO
+MAN_LINKS              = YES
 
 #---------------------------------------------------------------------------
 # Configuration options related to the XML output

src/cw/Makefile

@@ -3,6 +3,7 @@ MFDEPS=../Defs.mak
 
 
 CWSRC=\
+	cw.c\
 	cw_check_missing_mand.c\
 	cw_clock_lap.c\
 	cw_dbg_elem.c\
@@ -16,15 +17,7 @@ CWSRC=\
 	cw_in_ac_name_with_priority.c\
 	cw_in_capwap_local_ipv4_address.c\
 	cw_in_capwap_local_ipv6_address.c\
-	cw_in_check_cfg_update_req.c\
-	cw_in_check_disc_req.c\
-	cw_in_check_img_data_req_ac.c\
-	cw_in_check_img_data_req_wtp.c\
-	cw_in_check_join_req.c\
-	cw_in_check_join_resp.c\
-	cw_in_generic.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\
@@ -38,15 +31,12 @@ CWSRC=\
 	cw_in_wtp_reboot_statistics.c\
 	cw_is_printable.c\
 	cw_load_file.c\
-	cw_out_generic.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_put_msg.c\
 	cw_radio_set_admin_state.c\
 	cw_rand.c\
 	cw_randint.c\
@@ -68,44 +58,63 @@ CWSRC=\
 	cw_type_bool.c\
 	cw_type_str.c\
 	cw_type_dword.c\
+	cw_type_struct.c\
 	cw_type_ipaddress.c\
 	cw_type_word.c\
 	cw_type_sysptr.c\
 	cw_write_descriptor_subelem.c\
-	cw_read_from.c \
 	cw_write_radio_element.c\
 	cw_detect_nat.c\
+	cw_read_from.c \
+	cw_in_generic_struct.c\
+
+#	cw_in_check_disc_req.c\
+#	cw_in_check_img_data_req_ac.c\
+#	cw_in_check_img_data_req_wtp.c\
+#	cw_in_check_join_req.c\
+#	cw_in_check_join_resp.c\
+#	cw_in_generic.c\
+#	cw_out_generic.c\
+#	
+#	cw_process_element.c\
 
 KTVSRC=\
-	cw_ktv_add.c\
-	cw_ktv_cast.c\
-	cw_ktv_replace.c\
+	cfg.c\
+
+
+#	cw_ktv_add.c\
+	cw_ktv_idx_get.c\
+	cw_ktv_mavlcmp.c\
+	cw_ktv_mavlcmp_type_by_name.c\
+	cw_ktv_mavldel.c\
+
+
+#	cw_ktv_parser.c\
+#	cw_ktv_del_sub.c\
+#	cw_ktv_base_exists.c\
 	cw_ktv_add_from_str.c\
-	cw_ktv_get_byte.c\
+	cw_ktv_read_file.c\
+	cw_ktv_readline.c\
+	cw_ktv_save.c\
+	cw_ktv_std_types.c\
+	cw_ktv_read_struct.c\
+	cw_ktv_write_struct.c\
+
+#	cw_ktv_get_byte.c\
 	cw_ktv_get_bool.c\
 	cw_ktv_get_bstr16.c\
 	cw_ktv_set_byte.c\
 	cw_ktv_set_word.c\
 	cw_ktv_set_dword.c\
-	cw_ktv_get.c\
-	cw_ktv_get_word.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_base_exists.c\
-	cw_ktv_save.c\
-	cw_ktv_del_sub.c\
-	cw_ktv_parser.c\
-	cfg.c\
+
+#	cw_ktv_cast.c\
+	cw_ktv_replace.c\
+	cw_ktv_get.c\
 
 
 LWSRC=\
@@ -176,35 +185,43 @@ MISCSRC=\
 	capwap_strings_result.c\
 	capwap_strings_state.c\
 	capwap_strings_vendor.c\
-	conn_create.c\
 	conn_create_noq.c\
-	conn_destroy.c\
-	conn_init.c\
 	connlist.c\
 	conn_prepare_image_data_request.c\
-	conn_process_packet.c\
-	cw_decode_msg.c \
 	conn_q_add_packet.c\
 	conn_q_get_packet.c\
-	conn_q_wait_packet.c\
 	conn_q_recv_packet.c\
 	conn_recv_packet.c\
 	conn_send_data_packet.c\
 	conn_send_msg.c\
 	conn_send_packet.c\
-	conn_send_request.c\
 	dot11.c\
 	dot11_inline.c\
 	format.c\
 	format_is_utf8.c\
 	fragman.c\
-	intavltree.c\
 	md5sum.c\
 	mod.c\
 	msgset.c\
-	netconn.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\
+#	conn_send_request.c\
+#	cw_put_msg.c\
+#	conn_process_packet.c\
+#	conn_destroy.c\
 
 DTLSSRC+=\
 	dtls_bio.c\
@@ -212,9 +229,9 @@ DTLSSRC+=\
 
 
 RADIOSRC=\
-	cw_out_radio_generic.c\
-	cw_out_radio_generic_struct.c\
-	cw_read_radio_generic.c\
+	
+#	cw_in_radio_generic.c\
+#	cw_out_radio_generic.c\
 
 MAVLSRC=\
 	mavl_get_ptr.c\
@@ -265,3 +282,6 @@ dynamic: $(DNAME)
 	
 include ../lib.mk
 
+depend:
+	mkdep -c ${CFLAGS} ${SOURCES}
+

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/bstr.h

@@ -140,7 +140,7 @@ static inline int bstr16_ncpy(uint8_t *dst,uint8_t*src,uint16_t len)
 
 
 bstr16_t bstr16_create(const uint8_t *data, uint16_t len);
-uint8_t * bstr16_create_from_str(const char *s);
+bstr16_t bstr16_create_from_str(const char *s);
 extern uint8_t * bstr16_create_from_cfgstr(const char * s);
 
 #define bstr16_replace bstr_replace

src/cw/bstr16_create_from_str.c

@@ -2,7 +2,7 @@
 #include "format.h"
 
 
-uint8_t * bstr16_create_from_str(const char *s)
+bstr16_t bstr16_create_from_str(const char *s)
 {
 	uint8_t * mem;
 	int msize;

src/cw/bstrv_create.c

@@ -1,18 +0,0 @@
-#include "bstr.h"
-
-/*
-uint8_t * bstrv_create(uint32_t vendor_id, uint8_t *data, uint8_t len)
-{
-	uint8_t * str = malloc(bstrv_size(len));
-	if (!str)	
-		return 0;
-
-	bstrv_set_vendor_id(str,vendor_id);
-	bstrv_set_len(str,len);
-	memcpy(bstrv_data(str),data,len);
-	*(bstrv_data(str)+bstrv_len(str))=0;
-	return str;
-
-}
-
-*/

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
@@ -641,14 +641,10 @@ struct cw_ac_status {
  */
 enum capwap_states {
 	CW_STATE_NONE = 0,
-	/** Discovery State */
-	CAPWAP_STATE_DISCOVERY,
-	/** Join State */
-	CAPWAP_STATE_JOIN,
-	CAPWAP_STATE_JOIN_COMPLETE,
-	
-	/** Config State */
-	CAPWAP_STATE_CONFIGURE,
+	CAPWAP_STATE_DISCOVERY,		/**< Discovery State */
+	CAPWAP_STATE_JOIN,		/**< Join State */
+	CAPWAP_STATE_JOIN_COMPLETE,	
+	CAPWAP_STATE_CONFIGURE,	 	/**< Config State */
 	CAPWAP_STATE_DTLS_SETUP, /**< DTLS Setup */
 	/** Image Data Upload */
 	CW_STATE_IMAGE_DATA,

src/cw/capwap80211.h

@@ -83,10 +83,17 @@ 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 Radio Information Message Element */
+#define CAPWAP80211_ELEM_WTP_RADIO_INFORMATION		1048
+/** IEEE 802.11 Antenna Message element */
+#define CAPWAP80211_ELEM_ANTENNA			1025
+
+
+
+
 /**
  *@}
  */

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

@@ -2,15 +2,15 @@
 #include "capwap.h"
 
 struct cw_StrListElem capwap_strings_state[] = {
-{ CAPWAP_STATE_DISCOVERY, "Discovery" },
-{ CAPWAP_STATE_JOIN,"Join" },
-{ CAPWAP_STATE_RUN,"Run" },
-{ CAPWAP_STATE_CONFIGURE,"Configure" },
-{ CW_STATE_IMAGE_DATA,"Image Data" },
-{ CAPWAP_STATE_DTLS_SETUP, "DTLS Setup" },
-{ CAPWAP_STATE_DATA_CHECK, "Data Check" },
-{ CAPWAP_STATE_TIMEOUT, "Timeout"},
-{ CW_STR_STOP,"Undefined" },
-
+	{ CW_STATE_NONE, "None"},	
+	{ CAPWAP_STATE_DISCOVERY, "Discovery" },
+	{ CAPWAP_STATE_JOIN,"Join" },
+	{ CAPWAP_STATE_RUN,"Run" },
+	{ CAPWAP_STATE_CONFIGURE,"Configure" },
+	{ CW_STATE_IMAGE_DATA,"Image Data" },
+	{ CAPWAP_STATE_DTLS_SETUP, "DTLS Setup" },
+	{ CAPWAP_STATE_DATA_CHECK, "Data Check" },
+	{ CAPWAP_STATE_TIMEOUT, "Timeout"},
+	{ CW_STR_STOP,"Undefined" },
 };
 

src/cw/cfg.c

@@ -3,33 +3,103 @@
 
 #include <mavl.h>
 
-#include "cw.h"
-#include "cfg.h"
 #include "val.h"
+#include "cfg.h"
 
-static int cmp(const void *k1,const void*k2){
-	struct cw_Cfg_entry * e1,*e2;
-	e1=(struct cw_Cfg_entry *)k1;
-	e2=(struct cw_Cfg_entry *)k2;
-	return strcmp(e1->key,e2->key);
+
+#include "dbg.h"
+#include "log.h"
+#include "cw.h"
+
+static const char *nextc(const char *s)
+{
+	while (isdigit(*s))
+		s++;
+	return s;
+}
+
+static int cmp0(const char *s1, const char *s2)
+{
+
+	const char *d1, *d2;
+	int i1, i2, i;
+
+	d1 = strchr(s1, '.');
+	if (d1 == NULL)
+		return strcmp(s1, s2);
+
+	d2 = strchr(s2, '.');
+	if (d2 == NULL)
+		return strcmp(s1, s2);
+
+	if ((d1 - s1) != (d2 - s2))
+		return strcmp(s1, s2);
+
+	if (strncmp(s1, s2, (d1 - s1)) != 0)
+		return strcmp(s1, s2);
+
+
+
+	if (isdigit(d1[1])) {
+		i1 = atoi(d1 + 1);
+	} else {
+		return cmp0(d1 + 1, d2 + 1);
+	}
+
+	if (isdigit(d2[1])) {
+		i2 = atoi(d2 + 1);
+	} else {
+		return cmp0(d1 + 1, d2 + 1);
+	}
+
+	i = i1 - i2;
+	if (i == 0) {
+		return cmp0(nextc(d1 + 1), nextc(d2 + 1));
+	}
+	return i;
+
+
+}
+
+static int cmp(const void *k1, const void *k2)
+{
+	struct cw_Cfg_entry *e1, *e2;
+	e1 = (struct cw_Cfg_entry *) k1;
+	e2 = (struct cw_Cfg_entry *) k2;
+
+
+	return cmp0(e1->key, e2->key);
+/*	return strcmp(e1->key,e2->key);*/
 }
 
 static void del(void *ptr)
 {
-	struct cw_Cfg_entry * e;
-	e=(struct cw_Cfg_entry *)ptr;
-	free(e->key);
-	free(e->val);
+	struct cw_Cfg_entry *e;
+	e = (struct cw_Cfg_entry *) ptr;
+	free((void *) e->key);
+	free((void *) e->val);
 }
 
 
-cw_Cfg_t * cw_cfg_create()
+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->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)
+int cw_cfg_set(cw_Cfg_t * cfg, const char *key, const char *val)
 {
+	cw_dbg(cfg->dbg_level, "%s%s: %s",cfg->dbg_prefix,key,val);
+
 	struct cw_Cfg_entry e;
 	int replaced;
 
@@ -37,12 +107,12 @@ int cw_cfg_set(cw_Cfg_t * cfg,const char *key, const char *val)
 	if (!e.key)
 		return 0;
 	e.val = cw_strdup(val);
-	if (!e.val){
-		free(e.key);
+	if (!e.val) {
+		free((void *) e.key);
 		return 0;
 	}
-	void * rc = mavl_replace(cfg,&e,&replaced);
-	if (!rc){
+	void *rc = mavl_replace(cfg->cfg, &e, &replaced);
+	if (!rc) {
 		del(&e);
 		return 0;
 	}
@@ -52,36 +122,84 @@ int cw_cfg_set(cw_Cfg_t * cfg,const char *key, const char *val)
 	return -1;
 }
 
-char * cw_cfg_get(cw_Cfg_t * cfg, char *key)
+const char *cw_cfg_get(cw_Cfg_t * cfg, const char *key, const char *def)
 {
-	struct cw_Cfg_entry e,*r;
+	struct cw_Cfg_entry e, *r;
 	e.key = key;
-	r = mavl_get(cfg,&e);
+	r = mavl_get(cfg->cfg, &e);
 	if (!r)
-		return NULL;
+		return def;
 	return r->val;
 }
 
-
-uint16_t cw_cfg_get_word(cw_Cfg_t * cfg, char *key)
+const char *cw_cfg_get_l(cw_Cfg_t ** cfg, const char * key, const char *def)
 {
-
+	int i;
+	struct cw_Cfg_entry e, *r;
+	for(i=0; cfg[i]!=NULL; i++){
+//		cw_dbg(DBG_X,"GET_L IN: %p",cfg[i]);
+		e.key = key;
+		r = mavl_get(cfg[i]->cfg, &e);
+		if (r!=NULL)
+			return r->val;
+	}
+	return def;
 }
 
 
-void cw_cfg_dump(cw_Cfg_t *cfg)
+const char *cw_cfg_get2(cw_Cfg_t *cfg1, cw_Cfg_t *cfg2, const char *key, const char *def)
+{
+	return cw_cfg_get(cfg1, key, cw_cfg_get(cfg2,key,def));
+}
+
+
+
+bstr16_t cw_cfg_get_bstr16(cw_Cfg_t * cfg, const char * key, const char *def)
+{
+	const char *s;
+
+	s = cw_cfg_get(cfg,key,def);
+	if(s==NULL)
+		return NULL;
+
+	return bstr16_create_from_str(s);
+}
+
+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);
+	return 0;
+}
+
+
+
+void cw_cfg_dump(cw_Cfg_t * cfg)
 {
 	mavliter_t it;
 	struct cw_Cfg_entry *e;
-	mavliter_init(&it,cfg);
-	mavliter_foreach(&it){
-		
+	mavliter_init(&it, cfg->cfg);
+	mavliter_foreach(&it) {
+
 		e = mavliter_get(&it);
-		printf("%s: '%s'\n",e->key,e->val);
+		printf("%s: '%s'\n", e->key, e->val);
 		//cw_dbg(dbglevel,"%s%s :%s: %s",prefix,data->key,type->get_type_name(data), value);
 	}
 }
 
+void cw_cfg_fdump(FILE *f, cw_Cfg_t * cfg)
+{
+	mavliter_t it;
+	struct cw_Cfg_entry *e;
+	mavliter_init(&it, cfg->cfg);
+	mavliter_foreach(&it) {
+
+		e = mavliter_get(&it);
+		fprintf(f,"%s: '%s'\n", e->key, e->val);
+	}
+}
+
+
+
 
 struct parser {
 	int line;
@@ -97,23 +215,23 @@ struct parser {
 static int get_char(struct parser *p)
 {
 	int c;
-	c = fgetc (p->f);
+	c = fgetc(p->f);
 	p->pos++;
-	if (c=='\n'){
-		p->prevpos=p->pos;
-		p->line ++;
-		p->pos=0;
+	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'){
+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 = p->prevpos;
+	} else
 		p->pos--;
 }
 
@@ -123,67 +241,67 @@ static int get_char_q(struct parser *p)
 {
 	int c;
 
-	while(1) {
+	while (1) {
 		c = get_char(p);
-		if (c==EOF || c=='\n')
+		if (c == EOF || c == '\n')
 			return c;
-	
-		if(c=='"' && !p->quote){
-			p->quote=1;
+
+		if (c == '"' && !p->quote) {
+			p->quote = 1;
 			continue;
 		}
-		if(c=='"' && p->quote){
-			p->quote=0;
+		if (c == '"' && p->quote) {
+			p->quote = 0;
 			continue;
 		}
 		break;
 	}
-	
-	
+
+
 	if (!p->quote)
 		return c;
-			
-	if (c!='\\')
+
+	if (c != '\\')
 		return c;
-			
+
 	c = get_char(p);
-	switch(c){
+	switch (c) {
 		case EOF:
 			return c;
 		case 'n':
 			return '\n';
-			
+
 		case '\\':
 			return '\\';
 		case '"':
 			return '"';
 		default:
-			unget_char(p,c);
+			unget_char(p, c);
 			return '\\';
 	}
-			
+
 	/* We will never reach here */
-	/* return c;*/
+	/* return c; */
 }
 
-static int skip_chars (struct parser *p, const char * chars)
+static int skip_chars(struct parser *p, const char *chars)
 {
 	int c;
-	
-	while ( (c = get_char (p)) != EOF) {
-		if (strchr (chars, 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)
+static int skip_to_chars(struct parser *p, const char *chars)
 {
 	int c;
-	
-	while ( (c = get_char (p)) != EOF) {
-		if (strchr (chars, c))
+
+	while ((c = get_char(p)) != EOF) {
+		if (strchr(chars, c))
 			return c;
 	}
 	return c;
@@ -191,52 +309,56 @@ static int skip_to_chars (struct parser *p, const char *chars)
 
 
 
-static int read_key (struct parser *p, char *key, int max_len)
+static int read_key(struct parser *p, char *key, int max_len)
 {
-	int c,n;
+	int c, n;
 
 	do {
-		c = skip_chars (p, " \t\n\a\v");
+		c = skip_chars(p, " \t\n\a\v");
 		if (c == '#') {
-			c = skip_to_chars (p, "\n\a");
-			
+			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);
+	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;
+		key[n] = c;
 
-		c=get_char_q(p);
+		c = get_char_q(p);
 		n++;
 
 	}
-	key[n]=0;
+	key[n] = 0;
 	return n;
 }
 
 
-static int skip_to_colon(FILE *f,struct parser * p)
+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);
+	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);
+		sprintf(p->error, "Error at line %d, pos %d: Collon expected.",
+			p->line, p->pos);
 		return 0;
 	}
 	return 1;
@@ -244,58 +366,58 @@ static int skip_to_colon(FILE *f,struct parser * p)
 
 
 
-static int read_val(struct parser *p, char *val, int max_len){
-	int c,n,quote;
-	if (!skip_to_colon(p->f,p))
+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);
+	c = skip_chars(p, " \t");
+	if (c == '"') {
+		quote = 1;
+		c = get_char(p);
+	} else {
+		quote = 0;
 	}
-	else{
-		quote=0;
-	}
-	n=0;
-	while(c!=EOF && n<max_len){
-		if (quote && c=='"'){
+	n = 0;
+	while (c != EOF && n < max_len) {
+		if (quote && c == '"') {
 			break;
 		}
-		if (c=='\n'){
+		if (c == '\n') {
 			break;
 		}
-		if (quote){
-			if (c=='\\'){
+		if (quote) {
+			if (c == '\\') {
 				c = get_char(p);
-				switch(c){
+				switch (c) {
 					case 'n':
-						c='\n';
+						c = '\n';
 						break;
 					case '\\':
 						break;
 					case '"':
 						break;
 					default:
-						unget_char(p,c);
-						c='\\';
+						unget_char(p, c);
+						c = '\\';
 				}
 			}
 		}
-		val[n++]=c;
-		c=get_char(p);
+		val[n++] = c;
+		c = get_char(p);
 	}
-	
-	
-	if(!quote && n>0){
-		while(n>0){
-			if (isspace(val[n-1]))
+
+
+	if (!quote && n > 0) {
+		while (n > 0) {
+			if (isspace(val[n - 1]))
 				n--;
 			else
 				break;
 		}
 	}
-	
-	val[n]=0;
+
+	val[n] = 0;
 
 	return n;
 
@@ -303,20 +425,20 @@ static int read_val(struct parser *p, char *val, int max_len){
 
 
 
-int cw_cfg_read_line (FILE *f, struct parser *p, char * key, char *val)
+int cw_cfg_read_line(FILE * f, struct parser *p, char *key, char *val)
 {
 	int n;
 
-	
-	n = read_key (p,key,CW_CFG_MAX_KEY_LEN);
-	if (n==0)
+
+	n = read_key(p, key, CW_CFG_MAX_KEY_LEN);
+	if (n == 0)
 		return 1;
-	if (n==-1){
+	if (n == -1) {
 		return -1;
 	}
 
-	n = read_val (p,val,CW_CFG_MAX_KEY_LEN);
-	if (n==-1){
+	n = read_val(p, val, CW_CFG_MAX_KEY_LEN);
+	if (n == -1) {
 		return -1;
 	}
 	return 0;
@@ -328,45 +450,406 @@ int cw_cfg_read_from_file(FILE * f, cw_Cfg_t * cfg)
 	char val[2048];
 	struct parser p;
 
-	p.line=1;
-	p.pos=0;
-	p.prevpos=0;
-	p.quote=0;
-	p.f=f;
-	
-	int rc;
-	int errs=0;
+	p.line = 1;
+	p.pos = 0;
+	p.prevpos = 0;
+	p.quote = 0;
+	p.f = f;
+
+	int rc;
+	int errs = 0;
+
 
-	
 	do {
 
-		rc = cw_cfg_read_line(f,&p,key,val);
-		if (rc==-1){
-			fprintf(stderr,"Error: %s\n",p.error);
+		rc = cw_cfg_read_line(f, &p, key, val);
+		if (rc == -1) {
+			fprintf(stderr, "Error: %s\n", p.error);
 			errs++;
 		}
 
 
-		if (rc != 0){
+		if (rc != 0) {
 			continue;
 		}
 
-		cw_cfg_set(cfg,key,val);
-	
+		cw_cfg_set(cfg, key, val);
+
+
+	} while (rc == 0);
 
-	}while(rc==0);
-	
 	return errs;
 }
 
-
-int cw_cfg_load(const char *filename,cw_Cfg_t * cfg)
+int cw_cfg_load(const char *filename, cw_Cfg_t * cfg)
 {
 	int errs;
-	FILE *f = fopen(filename,"rb");
+	FILE *f = fopen(filename, "rb");
 	if (!f)
 		return errno;
-	errs = cw_cfg_read_from_file(f,cfg);
+	errs = cw_cfg_read_from_file(f, cfg);
 	fclose(f);
-	return errs;
+
+	if (errs)
+		errno = EINVAL;
+	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->cfg);
+	mavliter_seek(&(cfi->it), &search, 0);
+	cfi->base = base;
+}
+
+
+struct cw_Cfg_entry *cw_cfg_iter_next(struct cw_Cfg_iter *cfi, const char *nnkey)
+{
+	struct cw_Cfg_entry *e;
+	int bl, kl;
+	const char *d;
+
+	e = mavliter_get(&(cfi->it));
+	if (e == NULL)
+		return NULL;
+
+
+	bl = strlen(cfi->base);
+	kl = strlen(e->key);
+
+	if (bl > kl)
+		return NULL;
+
+	if (bl == kl) {
+		if (strcmp(cfi->base, e->key) != 0)
+			return NULL;
+		else {
+			mavliter_next(&(cfi->it));
+			return e;
+		}
+
+	}
+	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;
+
+	mavliter_next(&(cfi->it));
+	return e;
+}
+
+
+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,NULL);
+	if (s==NULL)
+		return def;
+	CW_TYPE_BOOL->from_str(&v,s);
+	return v.val.boolean;
+}
+
+
+uint8_t cw_cfg_get_byte(cw_Cfg_t * cfg, char *key, uint8_t def)
+{
+	struct cw_Val v;
+	memset(&v,0,sizeof(struct cw_Val));
+	const char *s = cw_cfg_get(cfg,key,NULL);
+	if (s==NULL)
+		return def;
+	CW_TYPE_BYTE->from_str(&v,s);
+	return v.val.byte;
+}
+
+uint8_t cw_cfg_get_byte_l(cw_Cfg_t ** cfgs, char *key, uint8_t def)
+{
+	struct cw_Val v;
+	memset(&v,0,sizeof(struct cw_Val));
+	const char *s = cw_cfg_get_l(cfgs,key,NULL);
+	if (s==NULL)
+		return def;
+	CW_TYPE_BYTE->from_str(&v,s);
+	return v.val.byte;
+}
+
+
+
+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);
+	if (s==NULL)
+		return def;
+	CW_TYPE_WORD->from_str(&v,s);
+	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)
+{
+	const char *s;
+	s=cw_cfg_get(cfg,key,def);
+	if (s==NULL)
+		return 0;
+
+}
+*/
+
+void cw_cfg_set_int(cw_Cfg_t * cfg, const char * key, int val)
+{
+	char a[128];
+	sprintf(a,"%d",val);
+	cw_cfg_set(cfg,key,a);
+}
+
+
+
+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;
+	char *d;
+	
+	sprintf(ikey,"%s.%d",key,65536);
+		
+	search.key=ikey;
+	/*//result = ktvn(ktv,&search);*/
+	
+	result = mavl_get_last(cfg->cfg,&search);
+	if (result == NULL){
+		return 0;
+	}
+	
+	d = strchr(result->key,'.');
+	if (d==NULL){
+		return 0;
+	}
+	
+	if (strncmp(result->key,ikey,d-result->key)!=0)
+		return 0;
+	
+	return atoi(d+1)+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;
+	char str[2048];
+	memset(&mdata,0,sizeof(cw_Val_t));
+	mdata.type=type;
+	mdata.valguard=valguard;
+	mresult = type->get(&mdata,data,len);
+	if (!mresult){
+		cw_log(LOG_ERR, "Can't create cfg element for key %s of type %s: %s",
+				key,type->name, strerror(errno));
+		free(mdata.key);
+		return 0;
+	}
+	type->to_str(&mdata,str,2048);
+	cw_cfg_set(cfg,key,str);
+
+	if (type->del)	
+		type->del(&mdata);
+	return 1;
+}
+
+//int cw_cfg_put(cw_Cfg_t *cfg, const char *key, const struct cw_Type *type,const void
+
+
+
+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->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);
+
+/*		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_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_level, "%s: %s -> %s",new_elem.key,old_elem->val,new_elem.val);
+//		cw_dbg(DBG_X, "Replace: %s: %s (old: %s)",new_elem.key, new_elem.val, old_elem->val);
+		if(dst->cfg->del){
+			dst->cfg->del(old_elem);
+		}
+		memcpy(old_elem,&new_elem,dst->cfg->data_size);
+	}
+
+}
+
+
+void cw_cfg_destroy(cw_Cfg_t *cfg)
+{
+	if (cfg->cfg)
+		mavl_destroy(cfg->cfg);
+	free(cfg);
+}
+
+
+void cw_cfg_clear(cw_Cfg_t *cfg)
+{
+	mavl_del_all(cfg->cfg);
+}
+
+
+int cw_cfg_base_exists(cw_Cfg_t * cfg, const char *key)
+{
+        struct cw_Cfg_entry e, *result;
+//cw_dbg(DBG_X,"LOOX FOR: %s",key);
+        e.key=key;
+        result = mavl_get_first(cfg->cfg,&e);
+        if (result == NULL)
+                return 0;
+//cw_dbg(DBG_X,"BASEXXX: %s",result->key);
+
+	if (strlen(result->key)<strlen(key))
+		return 0;		
+//cw_dbg(DBG_X,"BASEXXX1: %d",strlen(key));
+	if (result->key[strlen(key)]!='/' && result->key[strlen(key)]!='.')
+		return 0;
+//cw_dbg(DBG_X,"BASEXXX2: ");
+	if (strncmp(result->key,key,strlen(key))==0)
+		return 1;
+cw_dbg(DBG_X,"BASEXXX3: ");
+
+	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

@@ -2,10 +2,19 @@
 #define _CFG_H
 
 #include <mavl.h>
+#include "val.h"
+#include "bstr.h"
 
 #define CW_CFG_MAX_KEY_LEN 1024
 
-typedef struct mavl cw_Cfg_t;
+struct cw_Cfg {
+	struct mavl * cfg;
+	const char *name;
+	int dbg_level;
+	const char *dbg_prefix;
+};
+
+typedef struct cw_Cfg cw_Cfg_t;
 
 cw_Cfg_t * cw_cfg_create();
 int cw_cfg_set(cw_Cfg_t *cfg,const char *key, const char *val);
@@ -14,11 +23,53 @@ 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{
-	char *key;
-	char *val;
+	const char *key;
+	const char *val;
 };
 
-char * cw_cfg_get(cw_Cfg_t * cfg, char *key);
+
+struct cw_Cfg_iter{
+	struct mavliter it;
+	const char *base;
+};
+
+const char * cw_cfg_get(cw_Cfg_t * cfg, const char *key, const char *def);
+
+struct cw_Cfg_entry *cw_cfg_iter_next(struct cw_Cfg_iter *cfi, const char *key);
+void cw_cfg_iter_init(cw_Cfg_t * cfg, struct cw_Cfg_iter *cfi, const char *base);
+
+int cw_cfg_get_bool(cw_Cfg_t * cfg, const char * key, int def);
+uint16_t cw_cfg_get_word(cw_Cfg_t * cfg, 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);
+const char *cw_cfg_get_l(cw_Cfg_t ** cfg, const char * key, const char *def);
+void cw_cfg_copy(cw_Cfg_t *src, cw_Cfg_t *dst,int dbg_level,const char *dbg_prefix);
+void cw_cfg_destroy(cw_Cfg_t *cfg);
+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);
+int cw_cfg_read_from_string(const char *str, cw_Cfg_t *cfg);
+
+
+
+
+
+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);
+
+#define cw_cfg_get_word2(cfg1,cfg2,key,def) \
+	cw_cfg_get_word(cfg1,key,cw_cfg_get_word(cfg2,key,def))
+
+#define cw_dget(fun,cfg1,cfg2,key,def)\
+	fun(cfg1,key,fun(cfg2,key,def))
 
 
 #endif

src/cw/conn.c

@@ -1,39 +1,162 @@
-/*
-    This file is part of libcapwap.
+#include <string.h>
+#include <stdint.h>
 
-    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 "conn.h"
+#include "capwap.h"
+#include "cw.h"
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
-#include "cw.h"
-#include "dbg.h"
-
 #include "log.h"
-#include "cw_util.h"
-
+#include "capwap.h"
 #include "conn.h"
 #include "sock.h"
 
-/*#include "stravltree.h"*/
-#include "mod.h"
 #include "msgset.h"
+#include "cw.h"
 
-#include "val.h"
 
+#include "dbg.h"
+#include "msgset.h"
+#include "mavltypes.h"
+
+#include "dtls.h"
+
+
+
+struct msg_callback{
+	int type; /**< message type */
+	cw_MsgCallbackFun fun;
+};
+
+int msg_callback_cmp(const void *v1,const void *v2)
+{
+	struct msg_callback *t1,*t2;
+	t1=(struct msg_callback*)v1;
+	t2=(struct msg_callback*)v2;
+	return t1->type - t2->type;
+}
+
+/**
+ * Basic initialization of a conn object 
+ * @param conn conn object to initialize
+ */ 
+void cw_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->strict_capwap=1;
+
+	conn->process_packet=conn_process_packet;
+	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;
+}
+
+int cw_conn_set_msg_cb(struct cw_Conn *conn, int type, cw_MsgCallbackFun fun)
+{
+	struct msg_callback cb;
+	int exists;
+
+	cb.type = type;
+	cb.fun = fun;
+	mavl_insert(conn->msg_callbacks,&cb,&exists);
+	return 1;
+}
+
+cw_MsgCallbackFun cw_conn_get_msg_cb(struct cw_Conn *conn, int type)
+{
+	struct msg_callback cb,*result;
+	cb.type=type;
+	result = mavl_get(conn->msg_callbacks,&cb);
+	if (result == NULL)
+		return NULL;
+	return result->fun;
+}
+
+/**
+ * Create a conn object
+ * @param sock a socket
+ * @param addr the address associated
+ * @param qsize size of packet queue
+ * @return A pointer to the created object
+ * This function creates a conn obnject with queueing functionality
+ * for asynchronous operation. 
+ * To create a conn object without queue functionallity use  #conn_create_noq.
+ */
+struct cw_Conn * cw_conn_create(int sock, struct sockaddr * addr, int qsize)
+{
+	struct cw_Conn * conn; 
+	conn = malloc(sizeof (struct cw_Conn ));
+	if (!conn)
+		return NULL;
+
+	cw_conn_init(conn);
+
+	conn->sock=sock;
+
+	if (addr)
+		sock_copyaddr(&conn->addr,addr);
+
+
+	conn->fragman = fragman_create();
+	if (conn->fragman==NULL){
+		conn_destroy(conn);
+		return NULL;
+	}
+
+	conn->qsize=qsize;
+	if (qsize != 0){
+		if (!(conn->q=malloc( sizeof(uint8_t *) * qsize))){
+			conn_destroy(conn);
+			return NULL;
+		}
+		conn->qrpos=-1;
+		if (sem_init(&conn->q_sem,0,0)!=0){
+			cw_log(LOG_ERR,"Fatal- Can't init semaphore for conn object: %s",strerror(errno));
+			conn_destroy(conn);
+			return NULL;
+		};
+		conn->recv_packet=conn_q_recv_packet;
+		conn->recv_packet_peek=conn_q_recv_packet_peek;
+	}
+	else{
+		conn->recv_packet = conn_recv_packet;
+		conn->recv_packet_peek = conn_recv_packet_peek;
+	}
+
+	conn->send_packet = conn_send_packet;
+/*	conn->send_data_packet = conn_send_data_packet;*/
+
+	conn->last_seqnum_received=-1;
+	conn->mtu=1480;
+
+
+	conn->cur_packet=0;
+	conn->recv_timeout=1;
+
+	conn->seqnum=-1;
+	conn->write = conn->send_packet;
+	conn->read = conn->recv_packet;
+
+	conn->dtls_mtu = 1480;
+
+
+
+
+	return conn;
+}
 
 
 
@@ -42,15 +165,15 @@
 /**
  * Init response message header
  */
-void cw_init_response(struct conn *conn, uint8_t * req)
+void cw_init_response(struct cw_Conn *conn, uint8_t * req)
 {
 	uint8_t *buffer;
 	int shbytes, dhbytes;
 	uint8_t *msgptr, *dmsgptr;
-	
+
 	buffer = conn->resp_buffer;
 	shbytes = cw_get_hdr_msg_offset(req);
-	
+
 	memcpy(buffer, req, shbytes);
 
 	cw_set_hdr_rmac(buffer, conn->base_rmac);
@@ -69,11 +192,11 @@ void cw_init_response(struct conn *conn, uint8_t * req)
 	cw_set_msg_flags(dmsgptr, 0);
 }
 
-void cw_init_request(struct conn *conn, int msg_id)
+void cw_init_request(struct cw_Conn *conn, int msg_id)
 {
 	uint8_t *buffer = conn->req_buffer;
 	uint8_t *msgptr;
-	
+
 	/* zero the first 8 bytes */
 	cw_set_dword(buffer + 0, 0);
 	cw_set_dword(buffer + 4, 0);
@@ -97,7 +220,7 @@ void cw_init_request(struct conn *conn, int msg_id)
 	cw_set_msg_elems_len(msgptr, 0);
 }
 
-void cw_init_data_msg(struct conn *conn)
+void cw_init_data_msg(struct cw_Conn *conn)
 {
 	uint8_t *buffer = conn->req_buffer;
 	cw_set_dword(buffer + 0, 0);
@@ -114,11 +237,11 @@ void cw_init_data_msg(struct conn *conn)
 /**
  * send a response 
  */
-int cw_send_response(struct conn *conn, uint8_t * rawmsg, int len)
+int cw_send_response(struct cw_Conn *conn, uint8_t * rawmsg, int len)
 {
 	int rc;
 	cw_init_response(conn, rawmsg);
-	rc = cw_put_msg(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);
@@ -135,11 +258,12 @@ int cw_send_response(struct conn *conn, uint8_t * rawmsg, int len)
  * @param result_code result code to send
  * @return 1
  */
-int cw_send_error_response(struct conn *conn, uint8_t * rawmsg, uint32_t result_code)
+int cw_send_error_response(struct cw_Conn *conn, uint8_t * rawmsg,
+			   uint32_t result_code)
 {
-	uint8_t *out,*dst;
+	uint8_t *out, *dst;
 	int l;
-	
+
 	cw_init_response(conn, rawmsg);
 
 	out = conn->resp_buffer;
@@ -155,36 +279,39 @@ int cw_send_error_response(struct conn *conn, uint8_t * rawmsg, uint32_t result_
 }
 
 
-static struct cw_MsgSet *load_msg_set(struct conn *conn, uint8_t * rawmsg, int len,
-				      int elems_len, struct sockaddr *from)
+static struct cw_MsgSet *load_msg_set(struct cw_Conn *conn, uint8_t * rawmsg,
+				      int len, int elems_len,
+				      struct sockaddr *from)
 {
 	char sock_buf[SOCK_ADDR_BUFSIZE];
 	struct cw_Mod *cmod, *bmod;
-	
+
 	cmod =
-	    cw_mod_detect(conn, rawmsg, len, elems_len, from, CW_MOD_MODE_CAPWAP);
+	    cw_mod_detect(conn, rawmsg, len, elems_len, from,
+			  CW_MOD_MODE_CAPWAP);
 	if (cmod == MOD_NULL) {
 		cw_dbg(DBG_MSG_ERR,
 		       "Can't find mod to handle connection from %s, discarding message",
-		       sock_addr2str_p(from,sock_buf));
+		       sock_addr2str_p(from, sock_buf));
 		return NULL;
 	}
 
-	bmod = 
-	    cw_mod_detect(conn, rawmsg, len, elems_len, from, CW_MOD_MODE_BINDINGS);
+	bmod =
+	    cw_mod_detect(conn, rawmsg, len, elems_len, from,
+			  CW_MOD_MODE_BINDINGS);
+
 
-	
 	cw_dbg(DBG_INFO, "Mods deteced: %s,%s", cmod->name, bmod->name);
 
 	conn->cmod = cmod;
 	conn->bmod = bmod;
 
-	return cw_mod_get_msg_set(conn,cmod,bmod);
+	return cw_mod_get_msg_set(conn, cmod, bmod);
 
 }
 
 /*
-int cw_in_check_generic(struct conn *conn, struct cw_action_in *a, uint8_t * data,
+int cw_in_check_generic(struct cw_Conn *conn, struct cw_action_in *a, uint8_t * data,
 			 int len,struct sockaddr *from)
 {
 //	if (cw_is_request(a->msg_id)){
@@ -196,37 +323,21 @@ int cw_in_check_generic(struct conn *conn, struct cw_action_in *a, uint8_t * dat
 }
 */
 
-/*
-void cw_read_elem(struct cw_ElemHandler * handler, struct conn * conn, 
-		uint8_t * elem_data, int elem_len, struct sockaddr * from){
-	mavldata_t data, *result;
-	char str[30];
-		
-	result = handler->type->get(&data,elem_data,elem_len);
-	
-	handler->type->to_str(result,str,30);
-	printf("Read %d-%s: %s %s\n", handler->id, handler->name, handler->key, str);
-	//mavl_insert(conn->remote_cfg
-}
-*/
 
-
-static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
+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;
+	struct cw_MsgData *message;
 	int result_code;
 	cw_State_t *ui;
 
 	uint8_t *elems_ptr;
-	uint8_t *elem;
-	
+	struct cw_ElemHandlerParams params;
+
 	char sock_buf[SOCK_ADDR_BUFSIZE]; /**< to hold str from sockaddr2str */
-	
-	/*struct cw_action_in as, *af, *afm;*/
+
+	/*struct cw_action_in as, *af, *afm; */
 
 	int offset = cw_get_hdr_msg_offset(rawmsg);
 
@@ -239,11 +350,13 @@ static int process_elements(struct 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) ",
-			       sock_addr2str(&conn->addr,sock_buf), elems_len, payloadlen - 8);
+			       sock_addr2str(&conn->addr, sock_buf), elems_len,
+			       payloadlen - 8);
 			errno = EAGAIN;
 			return -1;
 		}
@@ -252,34 +365,41 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
 		if (elems_len < payloadlen - 8) {
 			cw_dbg(DBG_RFC,
 			       "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;
+			       sock_addr2str(&conn->addr, sock_buf),
+			       payloadlen - 8 - elems_len);
+			//elems_len = len - 8;
 		}
 
 		if (elems_len > payloadlen - 8) {
 
 			cw_dbg(DBG_RFC,
 			       "Packet from from %s has msgelems len of %d bytes, but has only %d bytes of data, truncating.",
-			       sock_addr2str(&conn->addr, sock_buf), elems_len, payloadlen - 8);
+			       sock_addr2str(&conn->addr, sock_buf), elems_len,
+			       payloadlen - 8);
 			elems_len = payloadlen - 8;
 		}
 	}
 
 
-	/* Detect the connecting AC type */
+	/* Detect the connecting WTP type */
 	if (!conn->detected) {
 
-		struct cw_MsgSet *set = load_msg_set(conn, rawmsg, len, elems_len, from);
+		struct cw_MsgSet *set =
+		    load_msg_set(conn, rawmsg, len, elems_len, from);
 		if (!set) {
 /*
 			//cw_log(LOG_ERR, "Error");
-*/ 
+*/
 			errno = EAGAIN;
 			return -1;
 		}
 		conn->cmod->setup_cfg(conn);
-		conn->msgset= set;
+		conn->msgset = set;
 		conn->detected = 1;
+
+		if (conn->setup_complete)
+			conn->setup_complete(conn);
+
 	}
 
 	/** debug the received message */
@@ -287,30 +407,30 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
 
 	/* prepare struct for search operation */
 	search.type = cw_get_msg_id(msg_ptr);
-	
+
 	/* Search message */
-	
-	message = mavl_get(conn->msgset->msgdata,&search);
-		
+
+	message = mavl_get(conn->msgset->msgdata, &search);
+
 	result_code = 0;
-	
-	if (!message){
+
+	if (!message) {
 		/* Message is unknown */
-		if (search.type & 1){
-			cw_dbg(DBG_MSG_ERR, 
-				"Message type %d [%s] unrecognized, sending response.",
-				search.type, cw_strmsg(search.type),
-				cw_strstate(conn->capwap_state));
-				
+		if (search.type & 1) {
+			cw_dbg(DBG_MSG_ERR,
+			       "Message type %d [%s] unrecognized, sending response.",
+			       search.type, cw_strmsg(search.type),
+			       cw_strstate(conn->capwap_state));
+
 			result_code = CAPWAP_RESULT_MSG_UNRECOGNIZED;
 			cw_send_error_response(conn, rawmsg, result_code);
 			errno = EAGAIN;
 			return -1;
 		}
-		cw_dbg(DBG_MSG_ERR, 
-			"Message type %d [%s] unrecognized, discarding.",
-		search.type, cw_strmsg(search.type),
-		cw_strstate(conn->capwap_state));
+		cw_dbg(DBG_MSG_ERR,
+		       "Message type %d [%s] unrecognized, discarding.",
+		       search.type, cw_strmsg(search.type),
+		       cw_strstate(conn->capwap_state));
 		errno = EAGAIN;
 		return -1;
 
@@ -332,18 +452,18 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
 	/* Check if current state is in state of message */
 	ui = message->states;
 
-	for (ui=message->states; ui->state; ui++){
+	for (ui = message->states; ui->state; ui++) {
 /*		printf("Comparing %d and %d\n", conn->capwap_state, ui->state);*/
-		if(ui->state==conn->capwap_state){
+		if (ui->state == conn->capwap_state) {
 			break;
 		}
 	}
-	
-	if (!ui->state){
+
+	if (!ui->state) {
 		/* Message found, but it was in wrong state */
 		cw_dbg(DBG_MSG_ERR,
-		       "Message type %d (%s) not allowed in %s State, sending response.", 
-		       search.type,cw_strmsg(search.type), 
+		       "Message type %d (%s) not allowed in %s State, sending response.",
+		       search.type, cw_strmsg(search.type),
 		       cw_strstate(conn->capwap_state));
 		result_code = CAPWAP_RESULT_MSG_INVALID_IN_CURRENT_STATE;
 		cw_send_error_response(conn, rawmsg, result_code);
@@ -352,100 +472,59 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
 	}
 
 
-	
-/*	if (conn->msg_start){
-		conn->msg_start(conn, afm, rawmsg, len, from);
-	}
-*/
-	/* Execute start processor for message */
-/*
-//	if (afm->start) {
-//		afm->start(conn, afm, rawmsg, len, from);
-//	}
-*/
 
 
 	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);
+	}*/
 
-	/* Create an avltree to catch the found mandatory elements */
-/*	//conn->mand = stravltree_create();*/
-
-	mand_found = mavl_create_conststr();
-	unrecognized = mlist_create(NULL,NULL,sizeof(uint8_t*));
-
-	cw_dbg(DBG_MSG_PARSING ,"*** Parsing message of type %d - (%s) ***",
-			message->type,message->name);
-	/* iterate through message elements */
-	cw_foreach_elem(elem, elems_ptr, elems_len) {
-		int rc;
-
-		struct cw_ElemHandlerParams params;
-		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);
-		}
+	memset(&params,0,sizeof(struct cw_ElemHandlerParams));
 	
+	params.mand_found = mavl_create_conststr();
+	params.unrecognized = mlist_create(NULL, NULL, sizeof(uint8_t *));
 
-		
-/*		params.conn=conn;*/
+	params.cfg = cw_cfg_create();
+	params.cfg->dbg_level = DBG_ELEM_DETAIL_IN;
+	params.cfg->dbg_prefix = "    ";
 
-                params.local_cfg=conn->local_cfg;
-                params.remote_cfg=conn->remote_cfg;
-                params.default_cfg=conn->default_cfg;
-                params.global_cfg=conn->global_cfg;
-                params.msgset=conn->msgset;
+	params.cfg_list=conn->cfg_list;
 
-		params.from=from;
-		params.msgdata=message;
-		params.mand_found=mand_found;
-		
-		rc = cw_process_element(&params,0,0,elem_id,elem_data,elem_len); 
-		
+	params.from = from;
+	params.msgdata = message;
+	params.msgset=conn->msgset;
+	params.conn = conn;
+	params.dbg_level = DBG_ELEM_IN;
 
-		if (cw_result_is_ok(rc))
-			continue;
-		
-		if (rc == CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT){
-			mlist_append(unrecognized,&elem);
-			continue;
-		}
-		
-		if (rc < 0 ){
-			continue;
-		}
-
-	}
+	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);
-	
-	cw_dbg(DBG_MSG_PARSING," *** Done parsing message of type %d (%s) ***", 
-				message->type,message->name);
-	
-	mavl_destroy(mand_found);
-	
-/*	cw_dbg_ktv_dump(conn->remote_cfg,DBG_CFG_DMP,
-		" *** Remote CFG dump ***", "CFG:", " *** End of remote CFG dump");
-*/
 
+	if (params.mand_found)
+		cw_check_missing_mand(message, params.mand_found,conn->msgset->handlers_by_key);
 
-	if (message->postprocess){
-		message->postprocess(conn);
+//	cw_dbg(DBG_MSG_PARSING, "*** End parsing message of type %d (%s) ***",
+//	       message->type, message->name);
+
+	if (params.mand_found)
+		mavl_destroy(params.mand_found);
+
+	if (message->postprocess) {
+		message->postprocess(&params,elems_ptr, elems_len);
 	}
 
+	cw_MsgCallbackFun cb_fun = cw_conn_get_msg_cb(conn,message->type);
+	if (cb_fun != NULL){
+		result_code = cb_fun(&params,elems_ptr, elems_len);
+	}
+	else{
+		cw_cfg_clear(conn->update_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) {
@@ -455,12 +534,13 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
 
 			cw_send_error_response(conn, rawmsg, result_code);
 		} else if (result_code == 0) {
-			cw_ktv_set_dword(conn->local_cfg,"result-code",result_code);
-			if (ui->next){
+			cw_cfg_set_int(conn->update_cfg, "capwap/result-code",
+					 result_code);
+			if (ui->next) {
 				conn->capwap_prevstate = conn->capwap_state;
 				conn->capwap_state = ui->next;
 			}
-				
+
 			/* All is ok, send regular response message */
 			cw_send_response(conn, rawmsg, len);
 		} else {
@@ -475,7 +555,10 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
 		 */
 	}
 
-	/*stravltree_destroy(conn->mand);*/
+	if (params.unrecognized)
+		mlist_destroy(params.unrecognized);
+	cw_cfg_destroy(params.cfg);
+//	conn->remote_cfg=NULL;
 
 	return result_code;
 
@@ -486,12 +569,12 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
 
 
 
-int process_message(struct conn *conn, uint8_t * rawmsg, int rawlen,
+int process_message(struct cw_Conn *conn, uint8_t * rawmsg, int rawlen,
 		    struct sockaddr *from)
 {
 	char sock_buf[SOCK_ADDR_BUFSIZE];
 	uint8_t seqnum;
-	int s1,s2,sd;
+	int s1, s2, sd;
 
 	uint8_t *msgptr = rawmsg + cw_get_hdr_msg_offset(rawmsg);
 
@@ -522,7 +605,7 @@ int process_message(struct conn *conn, uint8_t * rawmsg, int rawlen,
 	if (sd != 0) {
 		cw_dbg(DBG_MSG_ERR,
 		       "Discarding message from %s, old seqnum, seqnum = %d, last seqnum=%d",
-		       sock_addr2str(&conn->addr,sock_buf), s2, s1);
+		       sock_addr2str(&conn->addr, sock_buf), s2, s1);
 		errno = EAGAIN;
 		return -1;
 	}
@@ -533,13 +616,13 @@ int process_message(struct conn *conn, uint8_t * rawmsg, int rawlen,
 
 	cw_dbg(DBG_MSG_ERR,
 	       "Retransmitted request message from %s detected, seqnum=%d, type=%d",
-	       sock_addr2str(&conn->addr,sock_buf), s2, type);
+	       sock_addr2str(&conn->addr, sock_buf), s2, type);
 
 
 	if (cw_get_hdr_msg_type(conn->resp_buffer) - 1 != type) {
-		cw_dbg(DBG_MSG_ERR,
+/*		cw_dbg(DBG_MSG_ERR,
 		       "No cached response for retransmission, request seqnum=%d,in cache=%d",
-		       s2, conn->resp_msg.type);
+		       s2, conn->resp_msg.type);*/
 		errno = EAGAIN;
 		return -1;
 	}
@@ -547,7 +630,7 @@ int process_message(struct conn *conn, uint8_t * rawmsg, int rawlen,
 	cw_dbg(DBG_MSG_ERR, "Retransmitting response message to %s, seqnum=%d",
 	       sock_addr2str(&conn->addr, sock_buf), s2);
 
-	/*// XXX untested*/
+	/*// XXX untested */
 	conn_send_msg(conn, conn->resp_buffer);
 	errno = EAGAIN;
 	return -1;
@@ -560,14 +643,14 @@ int process_message(struct conn *conn, uint8_t * rawmsg, int rawlen,
  * @param packet pointer to packet data
  * @param len lenght of packet data
  */
-int conn_process_packet2(struct conn *conn, uint8_t * packet, int len,
-			struct sockaddr *from)
+int conn_process_packet2(struct cw_Conn *conn, uint8_t * packet, int len,
+			 struct sockaddr *from)
 {
 	char sock_buf[SOCK_ADDR_BUFSIZE];
 	int preamble;
 	int offs;
 	int payloadlen;
-	
+
 	if (len < 8) {
 		/* packet too short */
 		cw_dbg(DBG_PKT_ERR,
@@ -583,8 +666,8 @@ int conn_process_packet2(struct conn *conn, uint8_t * packet, int len,
 		/* wrong version */
 		cw_dbg(DBG_PKT_ERR,
 		       "Discarding packet from %s, wrong version, version=%d, version %d expected.",
-		       sock_addr2str(&conn->addr,sock_buf), (preamble & 0xf0) >> 4,
-		       CAPWAP_VERSION);
+		       sock_addr2str(&conn->addr, sock_buf),
+		       (preamble & 0xf0) >> 4, CAPWAP_VERSION);
 		errno = EAGAIN;
 		return -1;
 	}
@@ -593,7 +676,7 @@ int conn_process_packet2(struct conn *conn, uint8_t * packet, int len,
 		/* Encrypted data, this shuold never happen here */
 		cw_dbg(DBG_PKT_ERR,
 		       "Discarding packet from %s, encrypted data after decryption ...",
-		       sock_addr2str(&conn->addr,sock_buf));
+		       sock_addr2str(&conn->addr, sock_buf));
 		errno = EAGAIN;
 		return -1;
 	}
@@ -607,7 +690,7 @@ int conn_process_packet2(struct conn *conn, uint8_t * packet, int len,
 		/* Eleminate messages with wrong header size */
 		cw_dbg(DBG_PKT_ERR,
 		       "Discarding packet from %s, header length (%d) greater than packet len (%d).",
-		       sock_addr2str(&conn->addr,sock_buf), offs, len);
+		       sock_addr2str(&conn->addr, sock_buf), offs, len);
 		errno = EAGAIN;
 		return -1;
 	}
@@ -619,7 +702,8 @@ int conn_process_packet2(struct conn *conn, uint8_t * packet, int len,
 			/* wrong rmac size */
 			cw_dbg(DBG_PKT_ERR,
 			       "Discarding packet from %s, wrong R-MAC size, size=%d",
-			       sock_addr2str(&conn->addr,sock_buf), *(packet + 8));
+			       sock_addr2str(&conn->addr, sock_buf),
+			       *(packet + 8));
 			errno = EAGAIN;
 			return -1;
 		}
@@ -631,7 +715,7 @@ int conn_process_packet2(struct conn *conn, uint8_t * packet, int len,
 		/* fragmented, add the packet to fragman */
 		uint8_t *f;
 		int rc;
-		
+
 		f = fragman_add(conn->fragman, packet, offs, payloadlen);
 		if (f == NULL) {
 			errno = EAGAIN;
@@ -655,23 +739,25 @@ int conn_process_packet2(struct conn *conn, uint8_t * packet, int len,
 	return conn->process_message(conn, packet, len, from);
 }
 
-int conn_process_packet(struct conn *conn, uint8_t * packet, int len,
-			struct sockaddr *from){
+int conn_process_packet(struct cw_Conn *conn, uint8_t * packet, int len,
+			struct sockaddr *from)
+{
 
 	/* show this packet in debug output */
 	cw_dbg_pkt(DBG_PKT_IN, conn, packet, len, from);
 
-	return conn_process_packet2(conn,packet,len,from);
+	return conn_process_packet2(conn, packet, len, from);
 }
 
 
-int conn_process_data_packet(struct conn *conn, uint8_t * packet, int len,
-			struct sockaddr *from){
+int conn_process_data_packet(struct cw_Conn *conn, uint8_t * packet, int len,
+			     struct sockaddr *from)
+{
 
 	/* show this packet in debug output */
 	cw_dbg_pkt(DBG_PKT_IN, conn, packet, len, from);
 
-	return conn_process_packet2(conn,packet,len,from);
+	return conn_process_packet2(conn, packet, len, from);
 }
 
 
@@ -689,7 +775,7 @@ int conn_process_data_packet(struct conn *conn, uint8_t * packet, int len,
 /**
  * Used as main message loop
  */
-int cw_read_messages(struct conn *conn)
+int cw_read_messages(struct cw_Conn *conn)
 {
 	uint8_t buf[2024];
 	int len = 2024;
@@ -706,3 +792,35 @@ int cw_read_messages(struct conn *conn)
 	return -1;
 }
 
+
+
+/**
+ * Destroy a conn object
+ * @param object to destroy
+ */
+void conn_destroy(struct cw_Conn * conn)
+{
+	dtls_shutdown(conn);
+	if (conn->fragman)
+		fragman_destroy(conn->fragman);
+	if (conn->q)
+		free (conn->q);
+
+	if (conn->msg_callbacks)
+		mavl_destroy(conn->msg_callbacks);
+
+	if (conn->base_rmac)
+		free(conn->base_rmac);
+
+	if (conn->remote_cfg)
+		cw_cfg_destroy(conn->remote_cfg);
+
+	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

@@ -30,7 +30,7 @@
 #include <sys/socket.h>
 
 #include "fragman.h"
-#include "cwmsg.h"
+//#include "cwmsg.h"
 
 
 
@@ -38,7 +38,6 @@
 
 /*#include "mbag.h"*/
 
-#include "intavltree.h"
 #include "bstr.h"
 #include "msgset.h"
 
@@ -56,7 +55,7 @@ struct cw_action_in;
 /**
  * Connection Object
  */ 
-struct conn {
+struct cw_Conn {
 	int sock;
 	struct sockaddr_storage addr;
 
@@ -70,29 +69,26 @@ struct conn {
 
 
 	int recv_timeout;
-	
-	
-	mavl_t remote_cfg;
-	mavl_t default_cfg;
-	mavl_t update_cfg;
-	mavl_t local_cfg;
-	mavl_t global_cfg;
-	
-	int (*write_header)(struct cw_ElemHandler * handler, uint8_t * dst, int len);
-	int (*header_len)(struct cw_ElemHandler *handler);
 
-/*	mbag_t outgoing;
-	mbag_t incomming;
-	mbag_t remote;
-	mbag_t local;
 
-	mbag_t radios;
-	mbag_t radios_upd;
-	mbag_t config;
-	mbag_t config_upd;
-*/
+	cw_Cfg_t * global_cfg;	/**< This should set the global cfg of the program
+				     which is using this conn object.
+				     Teh global_cfg has to be treated read-only. */
 
-/*	uint8_t session_id[16];*/
+	cw_Cfg_t * local_cfg;	/**< local_cfg contains overrides for global_cfg 
+				     wich are related to this conn object. */
+	
+	cw_Cfg_t * remote_cfg;	/**< contains the configuration we now from the 
+				     device this conn object ist connected to.
+				     Typically this is what we have got from discovery
+				     response or join response in WTP mode. 
+				     And in AC mode this contains date receive from 
+				     configuration status request.  */
+
+	cw_Cfg_t * update_cfg;
+
+	cw_Cfg_t * cfg_list[10];
+	
 	bstr16_t session_id;
 
 
@@ -105,16 +101,12 @@ struct 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
 	    of the protocoll */
 
 
-	struct cw_MsgSet * msgset;
 
 
 	uint8_t capwap_prevstate;
@@ -135,10 +127,6 @@ struct 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];
 
@@ -154,20 +142,13 @@ struct conn {
 
 	/* receive and send methods */
 
-	int (*recv_packet) (struct conn *, uint8_t *, int);
-	int (*recv_packet_peek) (struct conn *, uint8_t *, int);
-	int (*send_packet) (struct conn *, const uint8_t *, int);
-/*
-//	int (*recv_data_packet) (struct conn *, uint8_t *,int);
-//	int (*send_data_packet) (struct conn *, const uint8_t *, int);
-*/	
+	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 (*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 (*readfrom) (struct conn *, uint8_t *, int, struct sockaddr_storage *);
-	int (*read) (struct conn *, uint8_t *, int);
-	int (*write) (struct conn *, const uint8_t *, int);
-/*
-//	int (*write_data) (struct conn *, const uint8_t *, int);
-*/
 	/* optional packet queue */
 	uint8_t **q;
 	int qsize;
@@ -179,23 +160,23 @@ struct conn {
 	int cur_packet_pos;
 
 	/* dtls stuff */
-	int (*dtls_start) (struct conn *);
-	int (*dtls_accept) (struct conn *);
+	int (*dtls_start) (struct cw_Conn*);
+	int (*dtls_accept) (struct cw_Conn*);
 
 	bstr16_t dtls_psk;
 	int dtls_psk_enable;
 
 	int dtls_dhbits;
-	int (*dtls_get_psk)(struct conn *,const char *user,uint8_t**psk, int *len);
+	int (*dtls_get_psk)(struct cw_Conn*,const char *user,uint8_t**psk, int *len);
 
 	struct cw_Mod *cmod, *bmod;
 
-	char *dtls_cert_file;
-	char *dtls_key_file;
-	char *dtls_key_pass;
+	const char *dtls_cert_file;
+	const char *dtls_key_file;
+	const char *dtls_key_pass;
 
 	void *dtls_data;
-	char *dtls_cipher;
+	const char *dtls_cipher;
 	int dtls_error;
 
 	uint8_t dtls_cookie[8];
@@ -219,7 +200,7 @@ struct conn {
 	void *data;
 
 	/** Mode */
-	int capwap_mode;
+//	int capwap_mode;
 	
 	/** CAWAP mode for outgoing messages */
 	int capwap_mode_out;
@@ -229,25 +210,27 @@ struct conn {
 	int strict_hdr;
 
 
-	int (*process_packet)(struct conn *conn, uint8_t * packet, int len,struct sockaddr *from);
-	int (*process_message)(struct conn *conn, uint8_t * rawmsg, int rawlen,
+	int (*process_packet)(struct cw_Conn*conn, uint8_t * packet, int len,struct sockaddr *from);
+	int (*process_message)(struct cw_Conn*conn, uint8_t * rawmsg, int rawlen,
 			   struct sockaddr *from);
 
 	
 	int detected;
-	void  * mods;
+	struct cw_MsgSet * msgset;
+	void (*setup_complete)(struct cw_Conn *conn);
 
+	struct mavl * msg_callbacks;
 
-	int (*msg_start)(struct conn *conn,struct cw_action_in *a,uint8_t*data,int len,struct sockaddr *from);
-	int (*msg_end)(struct conn *conn,struct cw_action_in *a,uint8_t*elem,int len,struct sockaddr *from);
-
-	int (*elem_end)(struct conn *conn,struct cw_action_in *a,int afrc,uint8_t*elem,int len,struct sockaddr *from);
 
 /*
-//	void (*actions_registered)(struct conn *conn);
-*/
+	int (*msg_start)(struct cw_Conn*conn,struct cw_action_in *a,uint8_t*data,int len,struct sockaddr *from);
+	int (*msg_end)(struct cw_Conn*conn,struct cw_action_in *a,uint8_t*elem,int len,struct sockaddr *from);
+
+	int (*elem_end)(struct cw_Conn*conn,struct cw_action_in *a,int afrc,uint8_t*elem,int len,struct sockaddr *from);
+	*/
 
 };
+typedef struct cw_Conn cw_Conn_t;
 
 
 
@@ -255,76 +238,86 @@ struct conn {
 
 
 
-struct conn *conn_create(int sock, struct sockaddr *addr, int qsize);
-struct conn *conn_create_noq(int sock, struct sockaddr *addr);
+struct cw_Conn* cw_conn_create(int sock, struct sockaddr *addr, int qsize);
+struct cw_Conn* conn_create_noq(int sock, struct sockaddr *addr);
 
 
-extern int conn_send_cwmsg(struct conn *conn, struct cwmsg *cwmsg);
+//extern int conn_send_cwmsg(struct cw_Conn*conn, struct cwmsg *cwmsg);
 
 /*
-//extern int conn_process_packet(struct conn *conn, uint8_t * packet, int len,
+//extern int conn_process_packet(struct cw_Conn*conn, uint8_t * packet, int len,
 //				int (*cb) (void *, uint8_t *,int len), void *cbarg);
 */
 
-extern int conn_process_packet(struct conn *conn, uint8_t * packet, int len,struct sockaddr *from);
-extern int process_message(struct conn *conn, uint8_t * rawmsg, int rawlen,
+extern int conn_process_packet(struct cw_Conn*conn, uint8_t * packet, int len,struct sockaddr *from);
+extern int process_message(struct cw_Conn*conn, uint8_t * rawmsg, int rawlen,
 			   struct sockaddr *from);
 
-extern uint8_t *conn_get_message(struct conn *conn);
+extern uint8_t *conn_get_message(struct cw_Conn*conn);
 
-extern int conn_send_packet(struct conn *conn, const uint8_t * buffer, int len);
-extern int conn_send_data_packet(struct conn * conn, const uint8_t * buffer, int len);
+extern int conn_send_packet(struct cw_Conn*conn, const uint8_t * buffer, int len);
+extern int conn_send_data_packet(struct cw_Conn* conn, const uint8_t * buffer, int len);
 
-extern void conn_destroy(struct conn *conn);
+extern void conn_destroy(struct cw_Conn*conn);
 
-uint8_t *conn_q_get_packet(struct conn *conn);
-extern int conn_q_recv_packet(struct conn *conn, uint8_t * buffer, int len);
-extern int conn_q_recv_packet_peek(struct conn *conn, uint8_t * buffer, int len);
+uint8_t *conn_q_get_packet(struct cw_Conn*conn);
+extern int conn_q_recv_packet(struct cw_Conn*conn, uint8_t * buffer, int len);
+extern int conn_q_recv_packet_peek(struct cw_Conn*conn, uint8_t * buffer, int len);
 
-extern int conn_recv_packet(struct conn *conn, uint8_t * buf, int len);
-extern int conn_recv_packet_peek(struct conn *conn, uint8_t * buf, int len);
+extern int conn_recv_packet(struct cw_Conn*conn, uint8_t * buf, int len);
+extern int conn_recv_packet_peek(struct cw_Conn*conn, uint8_t * buf, int len);
 
-extern int conn_send_response(struct conn *conn, struct cwmsg *cwmsg, int seqnum);
-extern struct cwrmsg *conn_get_response(struct conn *conn);
+//extern int conn_send_response(struct cw_Conn*conn, struct cwmsg *cwmsg, int seqnum);
+extern struct cwrmsg *conn_get_response(struct cw_Conn*conn);
 
 
 #define conn_get_next_seqnum(conn) (conn->seqnum=((conn->seqnum+1)&0xff))
 #define conn_get_last_seqnum(conn) (conn->seqnum&0xff)
 
 
-void conn_q_add_packet(struct conn *conn, uint8_t * packet, int len);
+void conn_q_add_packet(struct cw_Conn*conn, uint8_t * packet, int len);
 
 struct image_identifier;
 struct cwimage_data;
 
-extern void conn_prepare_request(struct conn *conn, int type);
-extern int conn_prepare_image_data_request(struct conn *conn, struct cwimage_data *,
+extern void conn_prepare_request(struct cw_Conn*conn, int type);
+extern int conn_prepare_image_data_request(struct cw_Conn*conn, struct cwimage_data *,
 					   struct image_identifier *id);
 /*
-//extern void conn_detect_capwap(struct conn *conn, struct wtpinfo *wtpinfo);
+//extern void conn_detect_capwap(struct cw_Conn*conn, struct wtpinfo *wtpinfo);
 */
 
-struct cwrmsg *conn_send_request(struct conn *conn);
-struct cwrmsg *conn_wait_for_message(struct conn *conn, time_t timer);
+struct cwrmsg *conn_send_request(struct cw_Conn*conn);
+struct cwrmsg *conn_wait_for_message(struct cw_Conn*conn, time_t timer);
 
-struct cwrmsg *conn_wait_for_request(struct conn *conn, int *msglist, time_t timer);
+struct cwrmsg *conn_wait_for_request(struct cw_Conn*conn, int *msglist, time_t timer);
 
-int conn_q_wait_packet(struct conn * conn, int seconds);
+//int conn_q_wait_packet(struct cw_Conn* conn, int seconds);
 
 #define conn_is_error(conn) (conn->dtls_error)
 
-void conn_init(struct conn *conn);
+void cw_conn_init(struct cw_Conn*conn);
 
-extern int cw_read_messages(struct conn *conn);
+extern int cw_read_messages(struct cw_Conn*conn);
 
-extern int conn_recvfrom_packet(struct conn *conn, uint8_t * buf, int len,
+extern int conn_recvfrom_packet(struct cw_Conn*conn, uint8_t * buf, int len,
 			 struct sockaddr_storage *from);
 
-int conn_send_msg(struct conn * conn, uint8_t *rawmsg);
-int cw_read_from(struct conn * conn, struct sockaddr_storage * from);
+int conn_send_msg(struct cw_Conn* conn, uint8_t *rawmsg);
+int cw_read_from(struct cw_Conn* conn, struct sockaddr_storage * from);
 
-int conn_send_msg(struct conn *conn, uint8_t * rawmsg);
+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);
+cw_MsgCallbackFun cw_conn_get_msg_cb(struct cw_Conn *conn, int type);
+
+int cw_decode_element(struct cw_ElemHandlerParams *params, int proto,
+		      int vendor, int elem_id, uint8_t * data, int len);
+
+int cw_decode_elements(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len);
 
-void conn_clear_upd(struct conn *conn, int merge);
 
 #endif	/* __CONN_H */

src/cw/conn_create.c

@@ -35,76 +35,4 @@
 
 
 
-/**
- * Create a conn object
- * @param sock a socket
- * @param addr the address associated
- * @param qsize size of packet queue
- * @return A pointer to the created object
- * This function creates a conn obnject with queueing functionality
- * for asynchronous operation. 
- * To create a conn object without queue functionallity use  #conn_create_noq.
- */
-struct conn * conn_create(int sock, struct sockaddr * addr, int qsize)
-{
-	struct conn * conn; 
-	conn = malloc(sizeof (struct conn));
-	if (!conn)
-		return NULL;
-
-	conn_init(conn);
-
-	conn->sock=sock;
-
-	if (addr)
-		sock_copyaddr(&conn->addr,addr);
-
-
-	conn->fragman = fragman_create();
-	if (conn->fragman==NULL){
-		conn_destroy(conn);
-		return NULL;
-	}
-
-	conn->qsize=qsize;
-	if (qsize != 0){
-		if (!(conn->q=malloc( sizeof(uint8_t *) * qsize))){
-			conn_destroy(conn);
-			return NULL;
-		}
-		conn->qrpos=-1;
-		if (sem_init(&conn->q_sem,0,0)!=0){
-			cw_log(LOG_ERR,"Fatal- Can't init semaphore for conn object: %s",strerror(errno));
-			conn_destroy(conn);
-			return NULL;
-		};
-		conn->recv_packet=conn_q_recv_packet;
-		conn->recv_packet_peek=conn_q_recv_packet_peek;
-	}
-	else{
-		conn->recv_packet = conn_recv_packet;
-		conn->recv_packet_peek = conn_recv_packet_peek;
-	}
-
-	conn->send_packet = conn_send_packet;
-/*	conn->send_data_packet = conn_send_data_packet;*/
-
-	conn->last_seqnum_received=-1;
-	conn->mtu=600;
-
-
-	conn->cur_packet=0;
-	conn->recv_timeout=1;
-
-	conn->seqnum=-1;
-	conn->write = conn->send_packet;
-	conn->read = conn->recv_packet;
-
-/*	conn->write_data = conn->send_data_packet; */
-
-	conn->dtls_mtu = 600;
-
-	return conn;
-}
-
 

src/cw/conn_create_noq.c

@@ -36,14 +36,14 @@
  * @retval 1 Success
  * @retval 0 failure, conslt errno for more details
  */
-struct conn * conn_create_noq(int sock, struct sockaddr * addr)
+struct cw_Conn * conn_create_noq(int sock, struct sockaddr * addr)
 {
-	struct conn * conn; 
-	conn = malloc(sizeof (struct conn));
+	struct cw_Conn * conn; 
+	conn = malloc(sizeof (struct cw_Conn ));
 	if (!conn)
 		return NULL;
 
-	conn_init(conn);
+	cw_conn_init(conn);
 
 
 	conn->sock=sock;

src/cw/conn_destroy.c

@@ -1,41 +0,0 @@
-/*
-    This file is part of actube.
-
-    actube is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    libcapwap is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file
- * @brief Implements conn_destroy
- */
-
-#include <stdlib.h>
-
-#include "conn.h"
-
-/**
- * Destroy a conn object
- * @param object to destroy
- */
-void conn_destroy(struct conn * conn)
-{
-	if (conn->fragman)
-		fragman_destroy(conn->fragman);
-	if (conn->q)
-		free (conn->q);
-
-	free(conn);
-}
-
-

src/cw/conn_init.c

@@ -1,72 +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 conn * conn)
-{
-	memset(conn,0,sizeof(struct 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_q_add_packet.c

@@ -25,7 +25,7 @@
 #include "sock.h"
 
 
-void conn_q_add_packet(struct conn * conn,uint8_t *packet,int len)
+void conn_q_add_packet(struct cw_Conn * conn,uint8_t *packet,int len)
 {
 	char sock_buf[SOCK_ADDR_BUFSIZE];
 	int qwpos = conn->qwpos;
@@ -42,7 +42,6 @@ void conn_q_add_packet(struct 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_q_get_packet.c

@@ -19,7 +19,7 @@
 #include <time.h>
 #include "conn.h"
 
-uint8_t * conn_q_get_packet(struct conn * conn)
+uint8_t * conn_q_get_packet(struct cw_Conn * conn)
 {
 	int qrpos;
 	struct timespec timespec;

src/cw/conn_q_recv_packet.c

@@ -22,7 +22,7 @@
 
 #include "conn.h"
 
-static int conn_q_recv_packet_(struct conn * conn, uint8_t * buffer,int len,int peek)
+static int conn_q_recv_packet_(struct cw_Conn * conn, uint8_t * buffer,int len,int peek)
 {
 	if ( !conn->cur_packet)
 	{
@@ -58,12 +58,12 @@ static int conn_q_recv_packet_(struct conn * conn, uint8_t * buffer,int len,int
 	return conn->cur_packet_len;	
 }
 
-int conn_q_recv_packet(struct conn * conn, uint8_t * buffer,int len)
+int conn_q_recv_packet(struct cw_Conn * conn, uint8_t * buffer,int len)
 {
 	return conn_q_recv_packet_(conn,buffer,len,0);
 }
 
-int conn_q_recv_packet_peek(struct conn * conn, uint8_t * buffer,int len)
+int conn_q_recv_packet_peek(struct cw_Conn * conn, uint8_t * buffer,int len)
 {
 	return conn_q_recv_packet_(conn,buffer,len,1);
 }

src/cw/conn_q_wait_packet.c

@@ -3,7 +3,7 @@
 
 #include "conn.h"
 
-int conn_q_wait_packet(struct conn * conn, int seconds)
+int conn_q_wait_packet(struct cw_Conn * conn, int seconds)
 {
 
 	struct timespec timespec;

src/cw/conn_recv_packet.c

@@ -27,8 +27,9 @@
 
 #include "sock.h"
 
-int conn_recv_packet_(struct conn *conn, uint8_t * buf, int len, int flags)
+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) {
@@ -41,7 +42,7 @@ int conn_recv_packet_(struct conn *conn, uint8_t * buf, int len, int flags)
 }
 
 
-int conn_recvfrom_packet(struct conn *conn, uint8_t * buf, int len,
+int conn_recvfrom_packet(struct cw_Conn *conn, uint8_t * buf, int len,
 			 struct sockaddr_storage *from)
 {
 	int n;
@@ -65,7 +66,7 @@ int conn_recvfrom_packet(struct conn *conn, uint8_t * buf, int len,
 
 #include "log.h"
 
-int conn_recv_packet_x(struct conn *conn, uint8_t * buf, int len, int flags)
+int conn_recv_packet_x(struct cw_Conn *conn, uint8_t * buf, int len, int flags)
 {
 	int port;
 	socklen_t al;
@@ -104,12 +105,12 @@ int conn_recv_packet_x(struct conn *conn, uint8_t * buf, int len, int flags)
 
 /* yes, these functions could be better defined as macros in a .h file */
 
-int conn_recv_packet(struct conn *conn, uint8_t * buf, int len)
+int conn_recv_packet(struct cw_Conn *conn, uint8_t * buf, int len)
 {
 	return conn_recv_packet_x(conn, buf, len, 0);
 }
 
-int conn_recv_packet_peek(struct conn *conn, uint8_t * buf, int len)
+int conn_recv_packet_peek(struct cw_Conn *conn, uint8_t * buf, int len)
 {
 	int rc = conn_recv_packet_(conn, buf, len, MSG_PEEK);
 	return rc;

src/cw/conn_send_data_packet.c

@@ -29,7 +29,7 @@
 #include "dbg.h"
 
 
-int conn_send_data_packet(struct conn * conn, const uint8_t * buffer, int len)
+int conn_send_data_packet(struct cw_Conn * conn, const uint8_t * buffer, int len)
 {
 	char sock_buf[SOCK_ADDR_BUFSIZE];
 	int n;

src/cw/conn_send_msg.c

@@ -3,9 +3,9 @@
 #include "dbg.h"
 
 #define CW_MODE_ZYXEL 7
-extern cw_send_msg(struct conn * conn,uint8_t * msg);
+extern int cw_send_msg(struct cw_Conn * conn,uint8_t * msg);
 
-int conn_send_msg(struct conn * conn, uint8_t *rawmsg)
+int conn_send_msg(struct cw_Conn * conn, uint8_t *rawmsg)
 {
 	uint8_t * ptr; 
 	int packetlen;
@@ -14,13 +14,50 @@ int conn_send_msg(struct 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 */
-	if (conn->capwap_mode == CW_MODE_ZYXEL){
+//	if (conn->capwap_mode == CW_MODE_ZYXEL){
 /*		// XXX val-=3; */
-	}
+//	}
 
 
 	ptr = rawmsg;
@@ -34,7 +71,7 @@ mtu = 9440;
 	mtu = mtu >> 3;
 	mtu = mtu << 3;
 	
-	printf("packetlenX = %d (%d)\n",packetlen,hlen);
+//	printf("packetlenX = %d (%d)\n",packetlen,hlen);
 	 int offset = cw_get_hdr_msg_offset(rawmsg);
 	return cw_send_msg(conn,rawmsg+offset);
 

src/cw/conn_send_packet.c

@@ -27,7 +27,7 @@
 
 
 
-int conn_send_packet(struct conn * conn, const uint8_t * buffer, int len)
+int conn_send_packet(struct cw_Conn * conn, const uint8_t * buffer, int len)
 {
 	int n;
 	while((n=sendto( conn->sock, buffer, len, 0, 

src/cw/conn_send_request.c

@@ -1,64 +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_send_request 
- */
-
-#include "capwap.h"
-#include "cw_util.h"
-#include "log.h"
-
-/**
- * Send a request message and wait for its response
- * @param conn the connection
- *
- * The message has to be prepared and put to conn->req_msg
- * 
- */ 
-
-
-/*
-struct cwrmsg * conn_send_request(struct conn * conn)
-{
-	int i;
-
-	struct cwrmsg * cwrmsg;
-	struct cwmsg * cwmsg = &conn->req_msg;
-
-
-        for (i=0; i<conn->max_retransmit; i++) {
-
-                time_t r_timer = cw_timer_start(conn->retransmit_interval);
-		if (i!=0)
-	                cw_dbg(DBG_MSG_ERR,"Retransmitting message, type=%d,seq=%d",cwmsg->type,cwmsg->seqnum);
-
-		conn_send_cwmsg(conn,&conn->req_msg);
-		cwrmsg = conn_wait_for_message(conn,r_timer);
-		if (cwrmsg){
-			if (cwrmsg->type == conn->req_msg.type+1){
-				return cwrmsg;        
-			}
-                                
-		}
-        }
-        cw_dbg(DBG_MSG_ERR,"Max retransmit's reached, message type=%d,seq=%d",cwmsg->type,cwmsg->seqnum);
-        return 0;
-}
-*/

src/cw/connlist.c

@@ -39,24 +39,24 @@
 
 static int cmp_by_addr_p ( const void * d1, const void *d2 )
 {
-	struct conn * c1 = * ( void ** ) d1 ;
-	struct conn * c2 = * ( void ** ) d2 ;
+	struct cw_Conn * c1 = * ( void ** ) d1 ;
+	struct cw_Conn * c2 = * ( void ** ) d2 ;
 	return sock_cmpaddr ( ( struct sockaddr* ) &c1->addr, ( struct sockaddr* ) &c2->addr, 1 );
 }
 
 
 static int cmp_by_addr ( const void * d1, const void *d2 )
 {
-	struct conn * c1 = * ( void ** ) d1 ;
-	struct conn * c2 = * ( void ** ) d2 ;
+	struct cw_Conn * c1 = * ( void ** ) d1 ;
+	struct cw_Conn * c2 = * ( void ** ) d2 ;
 	return sock_cmpaddr ( ( struct sockaddr* ) &c1->addr, ( struct sockaddr* ) &c2->addr, 0 );
 }
 
 
 static int cmp_by_session_id ( const void *d1, const void  *d2 )
 {
-	struct conn * c1 = *( void ** ) d1;
-	struct conn * c2 = *( void ** ) d2;
+	struct cw_Conn * c1 = *( void ** ) d1;
+	struct cw_Conn * c2 = *( void ** ) d2;
 	int len1,len2;
 	
 	if (c1->session_id==NULL && c2->session_id==NULL)
@@ -133,6 +133,9 @@ void connlist_destroy ( struct connlist * cl )
 		
 	if ( cl->by_addr )
 		mavl_destroy ( cl->by_addr );
+	if ( cl->by_session_id)
+		mavl_destroy ( cl->by_session_id );
+
 		
 	pthread_mutex_destroy ( &cl->connlist_mutex );
 	free ( cl );
@@ -140,15 +143,15 @@ void connlist_destroy ( struct connlist * cl )
 }
 
 
-struct conn * connlist_get ( struct connlist * cl, const struct sockaddr * addr )
+struct cw_Conn * connlist_get ( struct connlist * cl, const struct sockaddr * addr )
 {
-	struct conn search;
+	struct cw_Conn search;
 	sock_copyaddr ( &search.addr, addr );
 	return mavl_get_ptr ( cl->by_addr, &search );
 }
 
 
-struct conn * connlist_add ( struct connlist * cl, struct conn * conn )
+struct cw_Conn * connlist_add ( struct connlist * cl, struct cw_Conn * conn )
 {
 	if ( cl->len != 0 )
 		if ( cl->by_addr->count >= cl->len )
@@ -158,17 +161,17 @@ struct conn * connlist_add ( struct connlist * cl, struct conn * conn )
 	return mavl_insert_ptr ( cl->by_addr, conn );
 }
 
-struct conn * connlist_get_by_session_id ( struct connlist *cl, struct conn * conn )
+struct cw_Conn * connlist_get_by_session_id ( struct connlist *cl, struct cw_Conn * conn )
 {
 	return mavl_get_ptr ( cl->by_session_id, conn );
 }
 
-struct conn * connlist_add_by_session_id ( struct connlist * cl, struct conn * conn )
+struct cw_Conn * connlist_add_by_session_id ( struct connlist * cl, struct cw_Conn * conn )
 {
 	return mavl_insert_ptr ( cl->by_session_id, conn );
 }
 
-void connlist_remove ( struct connlist *cl, struct conn * conn )
+void connlist_remove ( struct connlist *cl, struct cw_Conn * conn )
 {
 	void * md;
 	md = conn;

src/cw/connlist.h

@@ -7,7 +7,7 @@
 #include "pthread.h"
 
 struct connlist {
-/*	struct conn ** connlist; */
+/*	struct cw_Conn ** connlist; */
 
 	struct mavl *by_addr;
 	struct mavl *by_session_id;
@@ -22,12 +22,12 @@ struct connlist *connlist_create(int len, int cmpports);
 void connlist_lock(struct connlist *cl);
 void connlist_unlock(struct connlist *cl);
 void conlist_destroy(struct connlist *cl);
-struct conn *connlist_get(struct connlist *cl, const struct sockaddr *addr);
-struct conn *connlist_add(struct connlist *cl, struct conn *conn);
-void connlist_remove(struct connlist *cl, struct conn *conn);
+struct cw_Conn *connlist_get(struct connlist *cl, const struct sockaddr *addr);
+struct cw_Conn *connlist_add(struct connlist *cl, struct cw_Conn *conn);
+void connlist_remove(struct connlist *cl, struct cw_Conn *conn);
 void connlist_destroy(struct connlist *cl);
 
-struct conn * connlist_get_by_session_id(struct connlist *cl,  struct conn * conn);
-struct conn * connlist_add_by_session_id(struct connlist * cl, struct conn * conn);
+struct cw_Conn * connlist_get_by_session_id(struct connlist *cl,  struct cw_Conn * conn);
+struct cw_Conn * connlist_add_by_session_id(struct connlist * cl, struct cw_Conn * conn);
 
 #endif

src/cw/cw.c

@@ -0,0 +1,272 @@
+#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)
+{
+	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;
+}
+
+
+
+int cw_out_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
+			, uint8_t * dst)
+{
+
+	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");
+
+	start = params->msgset->header_len(handler);
+	len = ((const cw_Type_t*)(handler->type))->
+		write(params->cfg_list,handler->key,dst+start,handler->param);
+//	cw_dbg(DBG_X, "Type result is %d",len);
+
+	if (len == -1) {
+		const char *vendor="";
+		if ( handler->vendor ) {
+			vendor=cw_strvendor(handler->vendor);
+		}
+		if ( params->elemdata->mand) {
+			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
+			    );
+		}
+		else{
+/*			cw_dbg(DBG_WARN,"No output for element %s%d -(%s) in %s. Item %s not found.",
+				vendor,
+			       a->elem_id, cw_strelemp(conn->actions, a->elem_id)
+			       , cw_strmsg(a->msg_id),a->item_id);
+*/
+		}
+
+		return 0;
+	} 
+
+	l = params->msgset->write_header(handler,dst,len);
+
+	return l;
+}
+
+
+
+int cw_in_radio_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params,
+		uint8_t * elem_data, int elem_len)
+{
+	char key[CW_CFG_MAX_KEY_LEN];
+	int radio;
+	struct cw_Type *type;
+	type = (struct cw_Type*)handler->type;
+
+	if (!type){
+		cw_log(LOG_ERR,"Can't handle element: %s, no type defined",handler->name);
+		return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
+	}
+
+	
+	
+	radio=cw_get_byte(elem_data);
+	sprintf(key,"radio.%d/%s",radio,handler->key);
+	
+	/*cw_cfg_set_val(params->cfg, key, 
+				handler->type, handler->param, elem_data+1,elem_len-1);*/
+	
+	type->read(params->cfg, key,elem_data+1,elem_len-1,handler->param);
+	return CAPWAP_RESULT_SUCCESS;	
+}
+
+int cw_out_radio_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
+			, uint8_t * dst)
+{
+	char key[CW_CFG_MAX_KEY_LEN];
+	struct cw_Type * type;
+
+	int len,i,l,start;
+	int radios;
+	len =0;
+	
+	radios = cw_cfg_get_byte_l(params->cfg_list,"capwap/wtp-descriptor/max-radios",0);
+	for(i=0;i<radios;i++){
+
+		type = (struct cw_Type*)handler->type;
+		start = params->msgset->header_len(handler)+len;
+
+		sprintf(key,"radio.%d/%s",i,handler->key);
+//printf("RADIO KEY: %s\n",key);
+		
+//		cw_dbg(DBG_X,"KEY: %s",key);
+
+		l = type->write(params->cfg_list, key,dst+start+1,handler->param);
+		if (l==-1)
+			continue;
+
+		l += cw_put_byte(dst+start,i);
+
+		l = params->msgset->write_header(handler,dst+len,l);
+		len+=l;
+
+	}
+	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;
+}

src/cw/cw.h

@@ -327,7 +327,7 @@ int cw_put_elem_result_code(uint8_t * dst, uint32_t code);
 
 
 
-/*extern int cw_put_ac_status(uint8_t * dst, struct cw_ac_status *s, struct conn *conn);*/
+/*extern int cw_put_ac_status(uint8_t * dst, struct cw_ac_status *s, struct cw_Conn *conn);*/
 
 
 struct cw_DescriptorSubelemDef {
@@ -348,43 +348,44 @@ 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);
 
 /*
-int cw_read_wtp_descriptor(mavl_t mbag, struct conn *conn,
+int cw_read_wtp_descriptor(mavl_t mbag, struct cw_Conn *conn,
 				  struct cw_ElemHandler *eh, uint8_t * data, int len,
 				  struct cw_DescriptorSubelemDef *allowed);
 */
 
-int cw_read_wtp_descriptor(mavl_t mbag, struct 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 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 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);
 
 
 
@@ -444,11 +445,11 @@ int cw_out_radio_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerP
 int cw_out_radio_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
 			, uint8_t * dst);
 
-extern int cw_in_wtp_reboot_statistics(struct conn *conn, struct cw_action_in *a,
+extern int cw_in_wtp_reboot_statistics(struct cw_Conn *conn, struct cw_action_in *a,
 				       uint8_t * data, int len, struct sockaddr *from);
 
 
-extern int cw_in_wtp_board_data(struct conn *conn, struct cw_action_in *a, uint8_t * data,
+extern int cw_in_wtp_board_data(struct cw_Conn *conn, struct cw_action_in *a, uint8_t * data,
 				int len, struct sockaddr *from);
 
 /*					 
@@ -457,24 +458,24 @@ int cw_in_vendor_specific_payload(struct cw_ElemHandler *handler,
 				  uint8_t * data, int len);
 */
 
-extern int cw_in_capwap_control_ip_address(struct conn *conn, struct cw_action_in *a,
+extern int cw_in_capwap_control_ip_address(struct cw_Conn *conn, struct cw_action_in *a,
 					   uint8_t * data, int len,
 					   struct sockaddr *from);
 
-extern int cw_in_capwap_local_ipv4_address(struct conn *conn, struct cw_action_in *a,
+extern int cw_in_capwap_local_ipv4_address(struct cw_Conn *conn, struct cw_action_in *a,
 					   uint8_t * data, int len,
 					   struct sockaddr *from);
 
-extern int cw_in_capwap_local_ipv6_address(struct conn *conn, struct cw_action_in *a,
+extern int cw_in_capwap_local_ipv6_address(struct cw_Conn *conn, struct cw_action_in *a,
 					   uint8_t * data, int len,
 					   struct sockaddr *from);
 
-extern int cw_in_radio_operational_state(struct conn *conn, struct cw_action_in *a,
+extern int cw_in_radio_operational_state(struct cw_Conn *conn, struct cw_action_in *a,
 					 uint8_t * data, int len, struct sockaddr *from);
 
 
 /*	
-int cw_process_element(struct conn * conn, 
+int cw_process_element(struct cw_Conn * conn, 
 		struct cw_MsgData * msgdata, int proto, int vendor,
 		uint8_t  * elem, int max_len);
 */
@@ -502,7 +503,7 @@ int cw_process_element(struct cw_ElemHandlerParams *params,
 #define cw_out_capwap_local_ip_address_7 cw_out_wtp_ip_address
 
 
-void cw_init_request(struct conn *conn, int msg_id);
+void cw_init_request(struct cw_Conn *conn, int msg_id);
 
 
 /**
@@ -527,16 +528,16 @@ int cw_put_elem_radio_administrative_state(uint8_t * dst, int rid, int state);
 int cw_put_local_ip_address(uint8_t *dst, int id, int ipv_id, int ipv6_id, 
 				uint8_t *src, int len);
 
-int cw_detect_nat(struct conn *conn);
+int cw_detect_nat(struct cw_ElemHandlerParams  *conn);
 
 uint8_t *cw_init_data_keep_alive_msg(uint8_t * buffer,uint8_t *rmac);
 
-/*int cw_out_radio_generic(struct conn *conn, struct cw_action_out *a, uint8_t * dst);*/
+/*int cw_out_radio_generic(struct cw_Conn *conn, struct cw_action_out *a, uint8_t * dst);*/
 
 int cw_put_elem_session_id(uint8_t *dst, uint8_t *session_id, int len);
 
 int cw_result_is_ok( int rc );
-int cw_put_msg(struct conn *conn, uint8_t * rawout);
+int cw_assemble_message(struct cw_Conn *conn, uint8_t * rawout);
 
 /**
  * @}
@@ -550,6 +551,14 @@ 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);
+
 /**
  *@}
  */

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

@@ -18,9 +18,9 @@ void cw_dbg_set_level (int level, int on)
 			break;
 		default:
 			if (on)
-				cw_dbg_opt_level |= (1 << (level));
+				cw_dbg_opt_level |= (level);
 			else 
-				cw_dbg_opt_level &= (0xffffffff) ^ (1 << (level));
+				cw_dbg_opt_level &= (0xffffffff) ^ (level);
 	}
 }
 

src/cw/cw_dbg_set_level_from_str.c

@@ -9,6 +9,7 @@ int cw_dbg_set_level_from_str(const char *level)
 	switch(*level){
 		case '-':
 		case '!':
+		case '~':
 			on =0;
 			slevel=level+1;
 			break;

src/cw/cw_decode_msg.c

@@ -1,126 +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;
-	}
-
-	printf ("USING HANDLERi TO DECODE: %d %s\n",handler->id,handler->name);
-	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;
-		}
-
-	}
-
-}

src/cw/cw_detect_nat.c

@@ -10,15 +10,13 @@
  * @retval 1 NAT detected
  * @retval 0 no NAT was detected
  */
-int cw_detect_nat(struct conn *conn)
+int cw_detect_nat(struct cw_ElemHandlerParams *params)
 {
-	cw_Val_t * result;
-	
+	const char  * remote_str;
 	char local_str[128];
-	char remote_str[128];
 
-	result = cw_ktv_get(conn->remote_cfg,"capwap-local-ip-address",CW_TYPE_IPADDRESS);
-	if (result == 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;
 	}
@@ -26,8 +24,7 @@ int cw_detect_nat(struct conn *conn)
 	/* convert remote connected and sent ip addresse to 
 	 * strings */
 	 
-	sock_addrtostr((struct sockaddr*)&conn->addr,local_str,128,0);
-	result->type->to_str(result,remote_str,128);
+	sock_addrtostr((struct sockaddr*)&(params->conn->addr),local_str,128,0);
 	
 	
 	/* if connected and sent address is the same, there is 
@@ -37,3 +34,4 @@ int cw_detect_nat(struct conn *conn)
 	/* otherwise ther must be something between AC and WTP */
 	return 1;
 }
+

src/cw/cw_format_version.c

@@ -35,10 +35,6 @@ int cw_format_version(char *s, const uint8_t * version, int len)
 		}
 		rs += sprintf(s + rs, ")");
 	}
-/*
-	vendor = bstrv_get_vendor_id(ver);
-	rs += sprintf(s + rs, ", Vendor Id: %d, %s", vendor, cw_strvendor(vendor));
-*/
 	return rs;
 }
 

src/cw/cw_in_capwap_local_ipv6_address.c

@@ -9,7 +9,7 @@
 
 
 
-int cw_in_capwap_local_ipv6_address(struct conn *conn, struct cw_action_in *a,
+int cw_in_capwap_local_ipv6_address(struct cw_Conn *conn, struct cw_action_in *a,
 				 uint8_t * data, int len,struct sockaddr *from)
 {
 	struct sockaddr_in6 addr;

src/cw/cw_in_check_cfg_update_req.c

@@ -1,32 +0,0 @@
-
-
-#include "capwap.h"
-#include "intavltree.h"
-#include "dbg.h"
-#include "log.h"
-
-
-int cw_in_check_cfg_update_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);
-	}
-*/
-	
-	/* 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_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

@@ -3,19 +3,35 @@
 #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_Val_t * result;
+	cw_Type_t * type;
+	type = (cw_Type_t*)handler->type;
+	char mkey[CW_CFG_MAX_KEY_LEN];
+	const char *key;
 
-	if (!handler->type){
+
+
+	if (!type){
 		cw_log(LOG_ERR,"Can't handle element: %s, no type defined",handler->name);
 		return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
 	}
 
-	result = cw_ktv_add(params->remote_cfg, handler->key, 
-				handler->type,NULL, elem_data,elem_len);
-	params->elem=result;
+	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_enum.c

@@ -17,7 +17,7 @@ int cw_in_generic_enum(struct cw_ElemHandler * handler, struct cw_ElemHandlerPar
 {
 	int val;
 	const cw_ValEnum_t * e;
-	char key[CW_KTV_MAX_KEY_LEN];
+	char key[CW_CFG_MAX_KEY_LEN];
 	struct cw_ElemHandler thandler;
 	
 	val = cw_get_byte(elem_data+1);

src/cw/cw_in_generic_indexed_enum.c

@@ -1,6 +1,8 @@
 
 
 #include "cw.h"
+#include "cfg.h"
+
 
 
 static const cw_ValEnum_t * get_enum(const cw_ValEnum_t * e, int val){
@@ -21,7 +23,7 @@ int cw_in_generic_indexed_enum(struct cw_ElemHandler * handler, struct cw_ElemHa
 	const cw_ValEnum_t * e;
 	const cw_ValIndexed_t * ie;
 	
-	char key[CW_KTV_MAX_KEY_LEN];
+	char key[CW_CFG_MAX_KEY_LEN];
 	struct cw_ElemHandler thandler;
 	
 	ie = handler->type;
@@ -46,8 +48,11 @@ int cw_in_generic_indexed_enum(struct cw_ElemHandler * handler, struct cw_ElemHa
 	}
 	
 	memset(&thandler,0,sizeof(thandler));
-	thandler.type=e->type;
+	
 	thandler.key=key;
+
+	thandler.type=e->type;
+	thandler.param=e->param;
 	return e->fun_in(&thandler,params,elem_data+f,elem_len-l);
 
 }

src/cw/cw_in_generic_struct.c

@@ -3,12 +3,16 @@
 #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)
 {
-	const char * key;
-	char tmpkey[CW_KTV_MAX_KEY_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);
@@ -18,18 +22,15 @@ int cw_in_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHandlerP
 		key = handler->key;
 	}
 
-printf("CW_IN_GENERIC STRUCT: %s\n",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->remote_cfg,handler->type,key,elem_data,elem_len);
-
+	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

@@ -1,14 +1,17 @@
 #include "cw.h"
+#include "dbg.h"
 
 int cw_in_generic_with_index(struct cw_ElemHandler *eh, 
 		struct cw_ElemHandlerParams *params, 
 			uint8_t * data,	 int len)
 {
-	char key[CW_KTV_MAX_KEY_LEN];
+	char key[CW_CFG_MAX_KEY_LEN];
 	int idx;
-	
+	struct cw_Type * type = (struct cw_Type*)eh->type;
+
 	idx = cw_get_byte(data);
 	sprintf(key,"%s.%d",eh->key,idx);
-	cw_ktv_add(params->remote_cfg,key,eh->type,NULL,data+1,len-1);
+//	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.c

@@ -1,9 +1,12 @@
 #include "cw.h"
 #include "log.h"
+#include "dbg.h"
 
 int cw_in_idx_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params,
 		uint8_t * elem_data, int elem_len)
 {
+	stop();
+/*
 	char key[CW_KTV_MAX_KEY_LEN];
 	cw_Val_t * result;
 	int idx;
@@ -16,10 +19,10 @@ int cw_in_idx_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerPara
 	idx=cw_get_byte(elem_data);
 	sprintf(key,handler->key,idx);
 	
-	result = cw_ktv_add(params->remote_cfg, key, 
+	result = cw_ktv_add(params->cfg, key, 
 				handler->type, NULL, elem_data+1,elem_len-1);
 	
-	params->elem=result;
-	
+//	params->elem=result;
+*/	
 	return CAPWAP_RESULT_SUCCESS;	
 }

src/cw/cw_in_idx_generic_struct.c

@@ -4,12 +4,18 @@
 #include "val.h"
 #include "log.h"
 #include "cw.h"
+#include "dbg.h"
+
 
 int cw_in_idx_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params,
 		uint8_t * elem_data, int elem_len)
 {
-	char key[CW_KTV_MAX_KEY_LEN];
+	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);
@@ -19,7 +25,7 @@ int cw_in_idx_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHand
 	idx = cw_get_byte(elem_data);
 	sprintf(key, handler->key, idx);
 
-	cw_ktv_read_struct(params->remote_cfg,handler->type,key,elem_data+1,elem_len-1);
+	cw_ktv_read_struct(params->cfg,handler->type,key,elem_data+1,elem_len-1);
 
 	return CAPWAP_RESULT_SUCCESS;
 }

src/cw/cw_in_radio_generic_struct.c

@@ -5,10 +5,15 @@
 #include "log.h"
 #include "cw.h"
 
+#include "dbg.h"
+
 int cw_in_radio_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params,
 		uint8_t * elem_data, int elem_len)
 {
-	char key[CW_KTV_MAX_KEY_LEN];
+
+	stop();
+
+	char key[CW_CFG_MAX_KEY_LEN];
 	int radio;
 	
 	if (!handler->type){
@@ -19,7 +24,7 @@ int cw_in_radio_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHa
 	radio = cw_get_byte(elem_data);
 	sprintf(key,"radio.%d/%s",radio,handler->key);
 
-	cw_ktv_read_struct(params->remote_cfg,handler->type,key,elem_data+1,elem_len-1);
+	cw_ktv_read_struct(params->cfg,handler->type,key,elem_data+1,elem_len-1);
 
 	/*params->elem=result;*/
 	

src/cw/cw_in_wtp_reboot_statistics.c

@@ -21,7 +21,7 @@
 #include "log.h"
 
 
-int cw_in_wtp_reboot_statistics(struct conn *conn, struct cw_action_in *a, uint8_t * data,
+int cw_in_wtp_reboot_statistics(struct cw_Conn *conn, struct cw_action_in *a, uint8_t * data,
 			 int len, struct sockaddr *from)
 {
 	/*

src/cw/cw_ktv_add.c

@@ -1,44 +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_del_sub.c

@@ -1,22 +0,0 @@
-
-
-#include "val.h"
-
-void cw_ktv_del_sub(mavl_t ktvstore, const char *basekey)
-{
-	cw_Val_t * result, search;
-
-	
-	while (1){
-		search.key=(char*)basekey;
-		result = mavl_get_first(ktvstore,&search);
-	
-		if (result == NULL)
-			return;
-	
-		if (strncmp(result->key,basekey,strlen(basekey))!=0)
-			break;
-		search.key = result->key;
-		mavl_del(ktvstore,&search);
-	}
-}

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,125 +0,0 @@
-#include "val.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_KTV_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_KTV_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"
-
-
-int cw_ktv_read_file(FILE * file, mavl_t ktv, mavl_t types)
-{
-	char key[CW_KTV_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,61 +0,0 @@
-#include "val.h"
-#include "dbg.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_KTV_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,304 +0,0 @@
-#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 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_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;
-}

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;
-}