Removed libwifi dependencies

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

INSTALL

@@ -15,7 +15,6 @@ cd ..
 make
 
 
-
 Ubuntu
 ------
 

README.md

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

src/ac/Makefile

@@ -9,6 +9,7 @@ OBJS = \
 	discovery_cache.o\
 	rpc.o\
 	statemachine.o\
+	#hapd.o
 
 ACTOBJS = \
 	act.o 
@@ -26,8 +27,9 @@ LIBS+=-lnettle
 LIBS+=-lssl
 LIBS+=-lcrypto
 LIBS+=-ledit
+#LIBS+=-l:libhapd.a
 
-INCL_DIRS=-I../ -I/usr/local/include -I./ -I../../include
+INCL_DIRS=-I../ -I/usr/local/include -I./ -I../../include -I../../include/hostapd -I../../include/hostapd/utils
 #FLAGS=-DWITH_IPV6 -DWITH_OPENSSL -DSYS_ARCH="$(ARCH)" -DSYS_ARCH="XXX"
 FLAGS=-DWITH_IPV6 -DUSE_OPENSSL -DSYS_ARCH='"$(KERNEL)/$(ARCH)"'
 

src/ac/ac.h

@@ -20,6 +20,7 @@ enum {
 int start_rpc(cw_Cfg_t *global_cfg);
 int test_shell();
 
+void hapd_run();
 
 #endif
 

src/ac/ac_main.c

@@ -125,11 +125,22 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
 				exit(EXIT_FAILURE);
 			default:
 			case 'h': 
-				printf("%s: -vcmh\n",argv[0]);
+			{
+				FILE *out = stdout;
+				fprintf(out, "Usage:");
+				fprintf(out, "%s [ options ] ",argv[0]);
+				fprintf(out, "\nOptions are:\n");
+				fprintf(out, "  -c <file>:  specify a config file\n");
+				fprintf(out, "  -p <path>:  specify a path where to search for modules\n");
+				fprintf(out, "  -v:         print version information\n");
+				fprintf(out, "  -d <level>: set debug level, multiple -d's are possible\n"); 
+				fprintf(out, "    <level> can be one of these:\n");
+				cw_dbg_print_help(out,"    ");
 				exit(EXIT_SUCCESS);
 				break;
 			}
 		}
+	}
 	return 0;
 }
 
@@ -200,6 +211,7 @@ return 0;
 */
 
 static cw_Cfg_t * global_cfg = NULL;
+void process_wtp_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len, int dta);
 
 
 int main (int argc, char *argv[])
@@ -225,6 +237,8 @@ int main (int argc, char *argv[])
 		goto errX;
 	};
 
+//hapd_run(); // init
+//stop();
 //const char *ttt = cw_cfg_get(global_cfg,"cisco/ssl-cipher",NULL);
 //printf("CFG: %s\n",ttt);
 //stop();
@@ -444,7 +458,7 @@ int ac_run(cw_Cfg_t * cfg)
 				                        (struct sockaddr *) &srcaddr,
 				                        &srcaddrlen);
 				                        
-				process_cw_data_packet (i, (struct sockaddr *) &srcaddr, buffer, len);
+				process_wtp_packet (i, (struct sockaddr *) &srcaddr, buffer, len,1);
 				
 			}
 			
@@ -457,7 +471,7 @@ int ac_run(cw_Cfg_t * cfg)
 				                        (struct sockaddr *) &srcaddr,
 				                        &srcaddrlen);
 				                        
-				process_ctrl_packet (i, (struct sockaddr *) &srcaddr, buffer, len);
+				process_wtp_packet (i, (struct sockaddr *) &srcaddr, buffer, len,0);
 			}
 			
 		}
@@ -471,14 +485,14 @@ int ac_run(cw_Cfg_t * cfg)
 void process_cw_data_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len)
 {
 	char sock_buf[SOCK_ADDR_BUFSIZE];
-	cw_dbg (DBG_X, "There is a data packet now");
+//	cw_dbg (DBG_X, "There is a data packet now");
 	
 	dataman_list_lock();
-	cw_dbg (DBG_X, "Dataman list locked, now getting");
+//	cw_dbg (DBG_X, "Dataman list locked, now getting");
 	struct dataman * dm = dataman_list_get (socklist[index].data_sockfd, addr);
-	cw_dbg (DBG_X, "Dataman list locked, now gotted");
+//	cw_dbg (DBG_X, "Dataman list locked, now gotted");
 	
-	cw_dbg (DBG_INFO, "Packet for dataman %s,%d", sock_addr2str_p (addr, sock_buf), socklist[index].data_sockfd);
+//	cw_dbg (DBG_INFO, "Packet for dataman %s,%d", sock_addr2str_p (addr, sock_buf), socklist[index].data_sockfd);
 	
 	if (!dm) {
 		cw_dbg (DBG_INFO, "No dataman %s,%d", sock_addr2str_p (addr, sock_buf), socklist[index].data_sockfd);
@@ -490,15 +504,12 @@ void process_cw_data_packet (int index, struct sockaddr *addr, uint8_t * buffer,
 		}
 		
 		dataman_list_add (dm);
-		
 		dataman_start (dm);
-		
-		
 	}
 	
 	dataman_list_unlock();
 	
-	//dataman_add_packet (dm, buffer, len);
+	dataman_add_packet (dm, buffer, len);
 	
 	return;
 	
@@ -521,7 +532,7 @@ void process_cw_data_packet (int index, struct sockaddr *addr, uint8_t * buffer,
 }
 
 
-void process_cw_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len)
+void process_wtp_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len, int dta)
 {
 	char sock_buf[SOCK_ADDR_BUFSIZE];
 	
@@ -541,6 +552,10 @@ void process_cw_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer,
 
 
 	if (!wtpman) {
+		if (dta){
+			cw_dbg(DBG_PKT_ERR,"Data packet w/o wtpman received, ignoring");
+			return;
+		}
 	
 		wtpman = wtpman_create (index, addr, preamble & 0xf, global_cfg);
 		
@@ -562,9 +577,12 @@ void process_cw_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer,
 		wtpman_start (wtpman, preamble & 0xf);
 	}
 	
-	//printf("Got Packet with len: %d\n",len);
+	if(!dta)
-
 		wtpman_addpacket (wtpman, buffer, len);
+	else{
+//		cw_dbg(DBG_X,"Data packet received");
+		wtpman_datapacket (wtpman, buffer, len);
+	}
 	wtplist_unlock();
 }
 
@@ -635,7 +653,7 @@ void process_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer, in
 {
 	switch (socklist[index].ac_proto) {
 		case AC_PROTO_CAPWAP:
-			process_cw_ctrl_packet (index, addr, buffer, len);
+//			process_cw_ctrl_packet (index, addr, buffer, len);
 			return;
 			
 		/*case AC_PROTO_LWAPP:

src/ac/dataman.c

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

src/ac/dataman.h

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

src/ac/rpc-macros/activate.ckv

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

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

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

src/ac/rpc-macros/all.ckv

@@ -0,0 +1,60 @@
+
+radio.0/cisco/air-space-capability: 0
+radio.0/cisco/antenna-payload/802-11n-rx-antennas: 3
+radio.0/cisco/antenna-payload/802-11n-tx-antennas: 7
+radio.0/cisco/antenna-payload/antenna-cnt: 2
+radio.0/cisco/antenna-payload/antenna-mode: 3
+radio.0/cisco/antenna-payload/antenna.0: 1 - Internal Antenna
+radio.0/cisco/antenna-payload/antenna.1: 1 - Internal Antenna
+radio.0/cisco/antenna-payload/diversity-selection: 255
+radio.0/cisco/antenna-payload/unknown: 0
+
+radio.0/cisco/channel-power: .x08080d0108221c16100a04fefe0208221c16100a04fefe0308221c16100a04fefe0408221c16100a04fefe0508221c16100a04fefe0608221c16100a04fefe0708221c16100a04fefe0808221c16100a04fefe0908221c16100a04fefe0a08221c16100a04fefe0b08221c16100a04fefe0c08221c16100a04fefe0d08221c16100a04fefe
+
+radio.0/capwap80211/rate-set: .x82848b960c1218243048606c
+radio.0/capwap80211/tx-power/@cisco/cfg-type: 1 - global
+radio.0/capwap80211/tx-power/current-tx-power: 1
+radio.0/capwap80211/wtp-radio-config/beacon-period: 100
+radio.0/capwap80211/wtp-radio-config/bssid: .x04fe7f499b90
+radio.0/capwap80211/wtp-radio-config/cfg-period: 4
+radio.0/capwap80211/wtp-radio-config/cfg-type: 1
+radio.0/capwap80211/wtp-radio-config/cfp-maximum-duration: 60
+radio.0/capwap80211/wtp-radio-config/country-str1: "DE "
+radio.0/capwap80211/wtp-radio-config/country-str2: "DE "
+radio.0/capwap80211/wtp-radio-config/occupancy-limit: 100
+radio.0/capwap80211/wtp-radio-config/reg: 167772416
+radio.0/capwap80211/wtp-radio-information: 1
+
+
+radio.0/cisco/mac-operation/long-retry: 4
+radio.0/cisco/mac-operation/reserved: 1
+radio.0/cisco/mac-operation/rts-threshold: 2347
+radio.0/cisco/mac-operation/rx-msdu-lifetime: 512
+radio.0/cisco/mac-operation/short-retry: 7
+radio.0/cisco/mac-operation/tx-msdu-lifetime: 512
+radio.0/cisco/multi-domain-capability/first-channel: 1
+radio.0/cisco/multi-domain-capability/max-tx-power-level: 65535
+radio.0/cisco/multi-domain-capability/number-of-channels: 13
+radio.0/cisco/multi-domain-capability/reserved: 1
+
+radio.0/cisco/phy-ht-cap/asel-cap: 0
+radio.0/cisco/phy-ht-cap/extended-ht-cap-info: .x0000
+radio.0/cisco/phy-ht-cap/ht-cap-info: 6
+radio.0/cisco/phy-ht-cap/mcsrates-1: .x00000000
+radio.0/cisco/phy-ht-cap/mcsrates-2: .x00000000
+radio.0/cisco/phy-ht-cap/mcsrates-3: .x00000000
+radio.0/cisco/phy-ht-cap/mcsrates-4: .x0000ffff
+radio.0/cisco/phy-ht-cap/tx-bf-cap: .x00000000
+radio.0/cisco/phy-ht-control/cfg-type: 1 - global
+radio.0/cisco/phy-ht-control/channel-width: 20
+radio.0/cisco/phy-ht-control/cur-freq-is-dfs-channel: 0
+radio.0/cisco/phy-ht-control/current-freq: 1
+radio.0/cisco/phy-ht-control/enable-ht: 3
+radio.0/cisco/phy-ht-control/ext-channel: 0
+radio.0/cisco/phy-ht-control/flash-commit: 0
+radio.0/cisco/phy-ht-control/frequency-bands-support: 206
+radio.0/cisco/phy-ht-control/rest: .x00ffffff
+radio.0/cisco/phy-ht-control/ti-threshold: 0
+
+
+

src/ac/rpc-macros/antenna.ckv

@@ -0,0 +1,10 @@
+radio.0/cisco/air-space-capability: 0
+radio.0/cisco/antenna-payload/802-11n-rx-antennas: 3
+radio.0/cisco/antenna-payload/802-11n-tx-antennas: 7
+radio.0/cisco/antenna-payload/antenna-cnt: 2
+radio.0/cisco/antenna-payload/antenna-mode: 3
+radio.0/cisco/antenna-payload/antenna.0: 1 - Internal Antenna
+radio.0/cisco/antenna-payload/antenna.1: 1 - Internal Antenna
+radio.0/cisco/antenna-payload/diversity-selection: 255
+radio.0/cisco/antenna-payload/unknown: 0
+

src/ac/rpc-macros/macopts.ckv

@@ -0,0 +1,8 @@
+radio.0/cisco/mac-operation/fragmentation-threshold: 2346
+radio.0/cisco/mac-operation/long-retry: 4
+radio.0/cisco/mac-operation/reserved: 1
+radio.0/cisco/mac-operation/rts-threshold: 2347
+radio.0/cisco/mac-operation/rx-msdu-lifetime: 512
+radio.0/cisco/mac-operation/short-retry: 7
+radio.0/cisco/mac-operation/tx-msdu-lifetime: 512
+

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

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

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

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

src/ac/rpc-macros/radio.ckv

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

src/ac/rpc-macros/sr.ckv

@@ -0,0 +1,89 @@
+capwap/timers/echo-interval: 30
+capwap/timers/max-discovery-interval: 10
+
+radio.255/capwap/admin-state: 1 - enabled
+radio.0/capwap/admin-state: 1 - enabled
+radio.1/capwap/admin-state: 1 - enabled
+
+radio.0/capwap/decryption-error-report-period: 120
+radio.1/capwap/decryption-error-report-period: 120
+
+capwap/idle-timeout: 300
+
+capwap/wtp-fallback: 1
+
+cisco/spam-domain-secret: .xe1ffd18a8f15b3b59c0a47a7f17a96e7cb36174f00
+
+radio.0/capwap80211/wtp-radio-config/beacon-period: 100
+radio.0/capwap80211/wtp-radio-config/bssid: .x003a9902fac0
+radio.0/capwap80211/wtp-radio-config/cfg-period: 4
+radio.0/capwap80211/wtp-radio-config/cfg-type: 1
+radio.0/capwap80211/wtp-radio-config/cfp-maximum-duration: 60
+radio.0/capwap80211/wtp-radio-config/country-str1: "DE "
+radio.0/capwap80211/wtp-radio-config/country-str2: "DE "
+radio.0/capwap80211/wtp-radio-config/occupancy-limit: 100
+radio.0/capwap80211/wtp-radio-config/reg: 167772416
+radio.0/capwap80211/wtp-radio-information: 1
+
+radio.0/capwap80211/rate-set: .x82848b960c1218243048606c
+
+radio.0/cisco/multi-domain-capability/first-channel: 1
+radio.0/cisco/multi-domain-capability/max-tx-power-level: 65535
+radio.0/cisco/multi-domain-capability/number-of-channels: 13
+radio.0/cisco/multi-domain-capability/reserved: 1
+
+radio.0/cisco/mac-operation/fragmentation-threshold: 2346
+radio.0/cisco/mac-operation/long-retry: 4
+radio.0/cisco/mac-operation/reserved: 1
+radio.0/cisco/mac-operation/rts-threshold: 2347
+radio.0/cisco/mac-operation/rx-msdu-lifetime: 512
+radio.0/cisco/mac-operation/short-retry: 7
+radio.0/cisco/mac-operation/tx-msdu-lifetime: 512
+
+radio.1/capwap80211/tx-power/@cisco/cfg-type: 1 - global
+radio.1/capwap80211/tx-power/current-tx-power: 1
+
+radio.0/cisco/direct-sequence-control/cfg-type: 1 - global
+radio.0/cisco/direct-sequence-control/current-cca-mode: 0
+radio.0/cisco/direct-sequence-control/current-channel: 1
+radio.0/cisco/direct-sequence-control/energy-detect-threshold: -50
+radio.0/cisco/direct-sequence-control/unknown: 1
+
+radio.0/cisco/antenna-payload/802-11n-rx-antennas: 3
+radio.0/cisco/antenna-payload/802-11n-tx-antennas: 7
+radio.0/cisco/antenna-payload/antenna-cnt: 2
+radio.0/cisco/antenna-payload/antenna-mode: 3
+radio.0/cisco/antenna-payload/antenna.0: 1 - Internal Antenna
+radio.0/cisco/antenna-payload/antenna.1: 1 - Internal Antenna
+radio.0/cisco/antenna-payload/diversity-selection: 255
+radio.0/cisco/antenna-payload/unknown: 0
+
+radio.0/cisco/air-space-capability: 0
+
+radio.0/capwap/operational-state/cause: Normal
+radio.0/capwap/operational-state/state: enabled
+
+radio.0/cisco/80211h/count: 0
+radio.0/cisco/80211h/enable: 0
+radio.0/cisco/80211h/mode: 0
+radio.0/cisco/80211h/power: 0
+
+radio.0/cisco/elem153: .x00
+radio.0/cisco/elem156: .x020100
+radio.0/cisco/lwelem48: .x01055a0101a6c405b06432b03232
+radio.1/cisco/lwelem33: .x00
+radio.0/cisco/elem146: .x690f
+
+radio.255/capwap/operational-state/cause: Normal
+radio.255/capwap/operational-state/state: enabled
+
+cisco/bcast-ssid-mode: 1
+capwap/timers/max-discovery-interval: 10
+capwap/timers/echo-interval: 30
+
+cisco/client-auto-handoff: 0
+
+cisco/lwelem14: .x000001000000000000000000000000000000
+
+
+

src/ac/rpc-macros/txp.ckv

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

src/ac/rpc-macros/wlan.ckv

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

src/ac/rpc-macros/wlan1.ckv

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

src/ac/rpc.c

@@ -159,10 +159,6 @@ int list_cmd(struct rpcdata *sd, const char *cmd)
 
 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;
@@ -290,7 +286,6 @@ send_cmd(struct rpcdata * sd, const char *cmd)
 
 		fprintf(sd->out, "Sending update cmd\n");
 
-//		conn->update_cfg=sd->update_cfg;
 	}
 errX:	
 	wtplist_unlock();
@@ -311,8 +306,6 @@ wlan0_cmd(struct rpcdata * sd, const char *cmd)
 	}
 	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();
@@ -395,31 +388,6 @@ int del_cmd(struct rpcdata *sd, const char *str)
 }
 
 
-/*
-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;
@@ -505,62 +473,6 @@ struct cw_Conn * find_ap(const char *name)
 }
 
 
-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;
@@ -585,7 +497,6 @@ 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;
@@ -619,73 +530,8 @@ int execute_cmd (struct rpcdata * sd, const char *str)
 
 	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)
@@ -751,9 +597,6 @@ void * run_rpc_server (void * arg)
 			close (clientsock);
 		}
 		
-		
-		
-		//cw_dbg (DBG_INFO,"Accepting shell session %i, %s", rc, strerror (errno));
 	}	
 	
 	return NULL;
@@ -793,8 +636,6 @@ int create_tcp_fd(const char *name)
 }
 static int create_unix_fd(const char *name)
 {
-        //struct sockaddr_storage client;
-	//socklen_t client_size;
 	struct sockaddr_un addr;
 	int rc,fd;
 
@@ -808,7 +649,6 @@ static int create_unix_fd(const char *name)
 		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;
 }
@@ -817,7 +657,7 @@ int start_rpc(cw_Cfg_t *global_cfg)
 {
 	struct sockdata * sockdata;
 	const char *sockname;
-	int rc; //, type;
+	int rc; 
 	int fd;
 
 	rc = cw_cfg_get_bool(global_cfg,"actube/rpc/enable",1);

src/ac/wtpman.c

@@ -44,6 +44,8 @@
 
 #include "actube.h"
 
+#include "cw/dot11.h"
+
 
 static void wtpman_remove(struct wtpman *wtpman)
 {
@@ -310,6 +312,79 @@ int run_update(struct wtpman *wtpman)
 	return rc;
 }
 
+
+
+static int dataman_process_msg(struct cw_Conn *nc, uint8_t * rawmsg, int len,
+			struct sockaddr *from)
+{
+	char rframe[1000];
+	int offs =  cw_get_hdr_msg_offset(rawmsg);
+	uint8_t * frame = rawmsg + offs;
+	int frame_len = len-offs;
+	cw_dbg_dot11_frame(frame,frame_len);
+
+/*	dot11_init_assoc_resp(frame);
+
+	dot11_copy_mac(dot11_get_sa(dot11frame),dot11_get_da(frame));
+	dot11_copy_mac(dot11_get_bssid(dot11frame),dot11_get_bssid(frame));
+	dot11_copy_mac(dot11_get_da(dot11frame),dot11_get_sa(frame));
+	dot11_set_seq(frame,0);
+*/
+	if ( dot11_get_type_and_subtype(frame) == DOT11_ASSOC_REQ){
+		int l;
+		uint8_t rates[] = {
+			12,0x82,0x84,0x8b,0x96,0x0c,0x12,0x18,0x24,0x30,0x48,0x60,0x6c	
+		}; 
+		cw_dbg(DBG_X, "there is an assoc request!");
+
+		uint8_t  rframe[1000];
+		nc->mtu=800;
+
+
+        	dot11_init_assoc_resp(rframe);
+		dot11_set_duration(rframe,100);
+
+		dot11_copy_mac(dot11_get_sa(frame),dot11_get_da(rframe));
+		dot11_copy_mac(dot11_get_bssid(frame),dot11_get_bssid(rframe));
+		dot11_copy_mac(dot11_get_da(frame),dot11_get_sa(rframe));
+		dot11_set_seq(rframe,dot11_get_seq(frame));
+		dot11_assoc_resp_set_cap(rframe,dot11_assoc_req_get_cap(frame));
+		dot11_assoc_resp_set_status_code(rframe,0);
+		dot11_assoc_resp_set_assoc_id(rframe,17);
+		l=24+6;
+		l+=dot11_put_supported_rates(rframe+l,rates);
+		cw_dbg_dot11_frame(rframe,l);
+
+		uint8_t buf[1024];
+		int hlen;
+		hlen = cw_init_capwap_packet(buf,1,0,NULL,NULL);
+		cw_set_hdr_flags(buf, CAPWAP_FLAG_HDR_T, 1);
+		cw_send_capwap_packet(nc,buf,hlen,rframe,l);
+		
+	}
+	
+
+	return 0;
+}
+
+static void *wtpman_data_main(void *arg)
+{
+	struct wtpman * wtpman = arg;
+	struct cw_Conn * nc = wtpman->dconn;
+	nc->process_packet=conn_process_packet;
+	nc->process_message=dataman_process_msg;
+
+
+	while (1){
+		time_t timer = cw_timer_start(2);
+		while (!cw_timer_timeout(timer)){
+			cw_read_messages(nc);
+		}
+	}
+
+	
+}
+
 static void *wtpman_main(void *arg)
 {
 	//mavl_t r;
@@ -560,7 +635,7 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 {
 	struct sockaddr dbgaddr;
 	socklen_t dbgaddrl;
-	int sockfd, replyfd;
+	int sockfd, replyfd, data_sockfd,data_replyfd;
 	char sock_buf[SOCK_ADDR_BUFSIZE];
 
 	struct wtpman *wtpman;
@@ -574,6 +649,7 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 
 		int port = sock_getport(&socklist[socklistindex].addr);
 		replyfd = socklist_find_reply_socket(srcaddr, port);
+		data_replyfd=replyfd;
 
 		if (replyfd == -1) {
 			cw_log(LOG_ERR,
@@ -584,10 +660,11 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 		}
 	} else {
 		replyfd = socklist[socklistindex].sockfd;
+		data_replyfd = socklist[socklistindex].data_sockfd;
 	}
 
 	sockfd = replyfd;	/*//socklist[socklistindex].reply_sockfd; */
-
+	data_sockfd = data_replyfd;
 
 	dbgaddrl = sizeof(dbgaddr);
 	getsockname(sockfd, &dbgaddr, &dbgaddrl);
@@ -606,6 +683,15 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 		return NULL;
 	}
 
+	wtpman->dconn = cw_conn_create(data_sockfd, srcaddr, 100);
+	if (!wtpman->dconn) {
+		wtpman_destroy(wtpman);
+		return NULL;
+	}
+
+
+
+
 	cw_conn_register_msg_cb(wtpman->conn,
 		CAPWAP_MSG_DISCOVERY_REQUEST,
 		discovery_cb);
@@ -618,6 +704,7 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 
 	wtpman->conn->role = CW_ROLE_AC;
 	wtpman->conn->data=wtpman;
+	wtpman->dconn->data=wtpman;
 
 	wtpman->conn->cfg_list[0]=wtpman->conn->update_cfg;
 	wtpman->conn->cfg_list[1]=wtpman->conn->remote_cfg;
@@ -663,6 +750,8 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 			       cmod->name, bmod->name);
 			wtpman->conn->msgset =
 			    cw_mod_get_msg_set(wtpman->conn, cmod, bmod);
+
+			wtpman->dconn->msgset=wtpman->conn->msgset;
 			wtpman->conn->detected = 1;
 			cmod->setup_cfg(wtpman->conn);
 //	               if (wtpman->conn->setup_complete)
@@ -700,7 +789,6 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 
 void wtpman_addpacket(struct wtpman *wtpman, uint8_t * packet, int len)
 {
-	cw_dbg(DBG_X,"ADD PACKET DETECTED %d",wtpman->conn->detected);
 	conn_q_add_packet(wtpman->conn, packet, len);
 }
 
@@ -709,5 +797,14 @@ void wtpman_start(struct wtpman *wtpman, int dtlsmode)
 	cw_dbg(DBG_INFO, "Starting wtpman, DTLS mode = %d", dtlsmode);
 	wtpman->dtlsmode = dtlsmode;
 	pthread_create(&wtpman->thread, NULL, wtpman_main, (void *) wtpman);
+	pthread_create(&wtpman->thread, NULL, wtpman_data_main, (void *) wtpman);
 	return;
 }
+
+void wtpman_datapacket(struct wtpman *wtpman, uint8_t * packet, int len)
+{
+	conn_q_add_packet(wtpman->dconn, packet, len);
+}
+
+
+

src/ac/wtpman.h

@@ -17,6 +17,7 @@ struct wtpman {
 	pthread_t thread;
 
 	struct cw_Conn *conn;
+	struct cw_Conn *dconn;
 
 
 	/* wtp data */
@@ -67,6 +68,7 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
 extern void wtpman_addpacket(struct wtpman *wtpman, uint8_t * packet, int len);
 extern void wtpman_destroy(struct wtpman *wtpman);
 extern void wtpman_start(struct wtpman *wtpman, int dtlsmode);
+void wtpman_datapacket(struct wtpman *wtpman, uint8_t * packet, int len);
 
 
 

src/contrib/install_hostapd.sh

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

src/cw/Makefile

@@ -6,9 +6,6 @@ CWSRC=\
 	cw.c\
 	cw_check_missing_mand.c\
 	cw_clock_lap.c\
-	cw_dbg_elem.c\
-	cw_dbg_set_level.c\
-	cw_dbg_set_level_from_str.c\
 	cw_filename.c\
 	cw_format_dump.c\
 	cw_format_pkt_hdr.c\
@@ -60,6 +57,7 @@ CWSRC=\
 	cw_type_word.c\
 	cw_type_sysptr.c\
 	cw_type_array.c\
+	cw_type_bits.c\
 	cw_write_descriptor_subelem.c\
 	cw_write_radio_element.c\
 	cw_detect_nat.c\
@@ -78,6 +76,7 @@ CWSRC=\
 	cw_in_radio_generic_struct.c\
 	cw_in_generic_struct.c\
 	cw_radio_set_admin_state.c\
+	cw_dbg_elem.c\
 
 KTVSRC=\
 	cfg.c\
@@ -135,7 +134,8 @@ LOGSRC=\
 	log_errno.c\
 	log_syslog.c\
 	dbg.c\
-	dbg_strings.c\
+
+#	dbg_strings.c\
 
 MISCSRC=\
 	bstr16_create.c\
@@ -171,7 +171,6 @@ MISCSRC=\
 	msgset.c\
 	send.c\
 	strheap.c\
-	netconn.c\
 	conn.c \
 	val.c \
 	discovery.c\
@@ -188,6 +187,7 @@ MISCSRC=\
 #	cw_put_msg.c\
 #	conn_process_packet.c\
 #	conn_destroy.c\
+	netconn.c\
 
 DTLSSRC+=\
 	dtls_bio.c\

src/cw/cfg.c

@@ -665,7 +665,13 @@ int cw_cfg_get_bool(cw_Cfg_t * cfg, const char * key, int def)
 	return v.val.boolean;
 }
 
+/*
+int cw_cfg_set_bool(cw_Cfg_t * cfg, const char * key, int val)
+{
+	return cw_cfg_set(cfg,key,val ? "true":"false");
+}
 
+*/
 uint8_t cw_cfg_get_byte(cw_Cfg_t * cfg, char *key, uint8_t def)
 {
 	struct cw_Val v;

src/cw/cfg.h

@@ -92,6 +92,8 @@ int cw_cfg_get_first_index_l(cw_Cfg_t ** cfgs, const char *key, int n);
 int cw_cfg_get_int(cw_Cfg_t * cfg, const char *key, int def);
 int cw_cfg_write_to_file(FILE *f, cw_Cfg_t * cfg);
 
+#define cw_cfg_set_bool(cfg,key,val) \
+		cw_cfg_set(cfg,key,(val) ? "true":"false")
 
 
 int cw_cfg_set_val(cw_Cfg_t * cfg, const char *key, const struct cw_Type *t, const void * valguard, const uint8_t * data, int len);

src/cw/conn.c

@@ -765,24 +765,22 @@ int conn_process_packet2(struct cw_Conn *conn, uint8_t * packet, int len,
 
 	if (cw_get_hdr_flag_f(packet)) {
 		/* fragmented, add the packet to fragman */
-		uint8_t *f;
+		uint8_t *f,*fp;
 		int rc;
 
-		f = fragman_add(conn->fragman, packet, offs, payloadlen);
+		fp = fragman_add(conn->fragman, packet, offs, payloadlen);
-		if (f == NULL) {
+		if (fp == NULL) {
 			errno = EAGAIN;
 			return -1;
 		}
 
+		f =fp+MAX_PKT_HDR_LEN;
 
-		cw_dbg_pkt(DBG_PKT_IN, conn, f + 4, *(uint32_t *) f, from);
+		cw_dbg_pkt(DBG_PKT_IN, conn, fp, *(uint32_t *) f+MAX_PKT_HDR_LEN, from);
-/*//		cw_dbg_msg(DBG_MSG_IN, conn, f + 4, *(uint32_t *) f, from);*/
-
-/*		// XXX: Modify fragman to not throw away CAPWAP headers*/
 
 		rc = conn->process_message(conn, f + 4, *(uint32_t *) f, from);
 
-		free(f);
+		free(fp);
 		return rc;
 	}
 

src/cw/conn_send_msg.c

@@ -53,10 +53,10 @@ int conn_send_msg(struct cw_Conn * conn, uint8_t *rawmsg)
 
 
 
-	/* Zyxel doesn't count msg element length from
+	//  Zyxel doesn't count msg element length from
-	   behind seqnum */
+//	   behind seqnum * /
 //	if (conn->capwap_mode == CW_MODE_ZYXEL){
-/*		// XXX val-=3; */
+// *		// XXX val-=3; * /
 //	}
 
 
@@ -75,7 +75,7 @@ mtu = 9440;
 	 int offset = cw_get_hdr_msg_offset(rawmsg);
 	return cw_send_msg(conn,rawmsg+offset);
 
-
+/*
 	if (packetlen>mtu){
 		cw_set_hdr_flags(ptr,CAPWAP_FLAG_HDR_F,1);
 		cw_set_dword(ptr+4, conn->fragid<<16 | fragoffset<<3 );
@@ -103,7 +103,7 @@ mtu = 9440;
 		if (conn->write(conn,ptr,mtu)<0)
 			return -1;
 
-/*		// XXX Fragmentation stuff.. */
+/ *		// XXX Fragmentation stuff.. * /
 		ptr +=mtu-hlen;
 		fragoffset+=(mtu-hlen)/8;
 
@@ -122,6 +122,6 @@ mtu = 9440;
 
 	cw_dbg_pkt(DBG_PKT_OUT,conn,ptr,packetlen,(struct sockaddr*)&conn->addr);
 
-	return conn->write(conn,ptr,packetlen-0);
+	return conn->write(conn,ptr,packetlen-0); */
 }
 

src/cw/cw.c

@@ -11,7 +11,7 @@ int cw_in_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams *
 	char mkey[CW_CFG_MAX_KEY_LEN];
 	const char *key;
 
-
+//	cw_dbg(DBG_X,"HK: %s",handler->key,);
 
 	if (!type){
 		cw_log(LOG_ERR,"Can't handle element: %s, no type defined",handler->name);
@@ -25,11 +25,7 @@ int cw_in_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams *
 	else{
 		key = handler->key;
 	}
-
+//	cw_dbg(DBG_X, "READ: %s / %s",type->name,key);
-
-	
-
-/*	cw_dbg(DBG_X, "READ: %s / %s",type->name,key);*/
 	type->read(params->cfg, key,elem_data,elem_len,handler->param);
 	return CAPWAP_RESULT_SUCCESS;
 }

src/cw/cw.h

@@ -146,8 +146,10 @@
 
 
 int cw_get_hdr_ws_len(uint8_t * th);
-uint8_t *cw_get_hdr_ws_data(uint8_t * th);
+int cw_get_hdr_ws_len_7(uint8_t * th);
 
+uint8_t *cw_get_hdr_ws_data(uint8_t * th);
+#define cw_get_hdr_ws_data_7(th) (cw_get_hdr_ws_data(th)+1)
 
 
 #define cw_get_hdr_msg_offset(th) (4*cw_get_hdr_hlen(th))
@@ -217,7 +219,7 @@ void cw_set_hdr_rid(uint8_t * th, int rid);
  * @see #cw_is_request
  */
 
-#define cw_is_response(msg_id) (!is_response(msg_id))
+#define cw_is_response(msg_id) (!cw_is_resquest(msg_id))
 
 
 uint8_t *cw_get_hdr_msg_elems_ptr(uint8_t * m);
@@ -560,6 +562,16 @@ int cw_put_descriptor_subelem (uint8_t *dst, cw_Cfg_t ** cfg_list,
 int cw_send_request(struct cw_Conn *conn,int msg_id);
 int cw_out_generic_walk(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
 			, uint8_t * dst);
+int cw_out_generic0(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
+			, uint8_t * dst,const char *key);
+
+
+
+
+int cw_init_capwap_packet( uint8_t * buf, int wbid ,int rid, bstr_t rmac, bstr_t wd);
+int cw_send_capwap_packet(struct cw_Conn * conn, uint8_t * buf, int hlen, uint8_t * data, int len);
+
+
 
 /**
  *@}

src/cw/cw_80211.h

@@ -1,12 +0,0 @@
-#ifndef __CW_80211_H
-#define __CW_80211_H
-
-/*
-
-int cw_in_80211_mac_operation(struct conn *conn, struct cw_action_in *a, uint8_t * data,
-			 int len, struct sockaddr *from);
-
-int cw_read_80211_mac_operation(uint8_t *data,mbag_t r);
-*/
-
-#endif

src/cw/cw_dbg_set_level.c

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

src/cw/cw_dbg_set_level_from_str.c

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

src/cw/cw_format_pkt_hdr.c

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

src/cw/cw_in_generic.c

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

src/cw/cw_inline.c

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

src/cw/cw_type_bits.c

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

src/cw/cw_type_struct.c

@@ -38,14 +38,12 @@ static int read_struct(cw_Cfg_t * cfg,const cw_ValStruct_t * stru, const char *p
 			default:
 				l = stru[i].len;
 				if (pos+l > len){
-					l = len-pos;
+					l = pos<len ? len-pos : 0 ;
 				}
 			
 		}
-
 		l=stru[i].type->read(cfg,key,data+pos,l,stru[i].valguard);
 
-		
 //		printf("READ STRUCT (%d): %s: %s\n",pos,key,dbstr);
 		
 		if (stru[i].len==-1){
@@ -102,8 +100,9 @@ static int write_struct(cw_Cfg_t ** cfgs,  const cw_ValStruct_t * stru, const ch
 			sprintf(key,"%s",pkey);
 
 	//	result = cw_cfg_get_l(cfgs,key,NULL);
+	
 		rc = cw_cfg_base_exists_l(cfgs,key);
-//		printf("Base? :%s, %d\n",key,rc);
+//		cw_dbg(DBG_X,"Base? :'%s', %d\n",key,rc);
 		if(result) {
 //			char s[2048];
 //			result->type->to_str(result,s,2048);

src/cw/dbg.c

@@ -31,27 +31,121 @@
 #include "format.h"
 #include "ansi_colors.h"
 
+#include "dot11.h"
 
 /**
  *@addtogroup DBG
  *@{
  */
 
- /*
-  * @defgroup DebugFunctions Debug Functions
-  * @{
-  */
-
 uint32_t cw_dbg_opt_display = DBG_DISP_COLORS;
 
 /**
- * Current debug level
+ * Contains all debuglevels currently set
  */
-uint32_t cw_dbg_opt_level = 0;
+static struct mavl * cw_dbg_opt_level = NULL;
 
 
+static int dbg_cmp(const void *a, const void*b)
+{
+	return (*((int*)a)-*((int*)b));
+}
 
 
+struct cw_DbgStr {
+	int level;
+	const char *str;
+	const char ** str_list;
+	const char *descr;
+};
+
+
+static const char * dbg_level_msg[] = {
+	"msg_in", "msg_out", NULL
+};
+
+static const char * dbg_level_pkt[] = {
+	"pkt_in", "pkt_out",  NULL
+};
+
+static const char * dbg_level_elem[]={
+	"elem_in","elem_out",NULL
+};
+
+static const char * dbg_level_elem_detail[] = {
+	"elem_detail_in", "elem_detail_out", NULL
+};
+
+static const char * dbg_level_elem_dmp[] = {
+	"elem_dmp_in", "elem_dmp_out", NULL
+};
+	
+static const char * dbg_level_elem_all[] = {
+	"elem", "elem_dmp", "elem_detail",NULL
+};
+
+static const char * dbg_level_std[] = {
+	"msg","elem","msg_err", "elem_err", "pkt_err", "rfc", "warn", "state", "info", NULL
+};
+
+
+/**
+ * Debug strings
+ */
+struct cw_DbgStr cw_dbg_strings[] = {
+	{ 0, 			"std", dbg_level_std, "some useful standard options to debug CAPWAP"},
+	{ 0,			"msg", dbg_level_msg, "messages headers" },
+	{ 0,			"pkt", dbg_level_pkt, "packet headers" },
+	{ 0,			"elem", dbg_level_elem, "message elemenst" },
+	{ 0, 			"elem_detail", dbg_level_elem_detail, "details for message elements"},
+	{ 0, 			"elem_dmp", dbg_level_elem_dmp,"hexdump element"},
+	{ 0, 			"elem_all", dbg_level_elem_all,"all possible elem options"},
+
+	{ DBG_WARN,		"warn", NULL, "warnings" },
+
+	{ DBG_ELEM_ERR, 	"elem_err", NULL, "errors in elements" },
+	{ DBG_PKT_ERR,		"pkt_err", NULL, "packets with errors which are usually would be discard" },
+	{ DBG_MSG_ERR,		"msg_err", NULL, "message errors"},
+	{ DBG_RFC,		"rfc", NULL, "errors related to RFC5415/RFC5416 viloations" },
+	{ DBG_CFG_UPDATES, 	"cfg_updates",NULL, "show configuration aupdates" },
+	{ DBG_MOD,		"mod",NULL, "module related"},
+	{ DBG_MOD_DETAIL,	"mod_detail",NULL, "module related details"},
+	{ DBG_STATE,		"state",NULL, "CAWPAP states" },
+	{ DBG_MSG_COMPOSE,	"msg_compose",NULL,"message composing details" },
+
+
+	{ DBG_INFO,		"info", NULL, "several infos are displayed" },
+	{ DBG_PKT_IN,		"pkt_in",NULL, "headers of incomming packets."  },
+	{ DBG_PKT_OUT,		"pkt_out",NULL, "headers out outgoing packets." },
+	{ DBG_PKT_DMP_IN,	"pkt_dmp_in",NULL, "hex-dump incomming packets" },
+	{ DBG_PKT_DMP_OUT,	"pkt_dmp_out",NULL, "hex-dump outgoing packets"  },
+
+	{ DBG_MSG_IN,		"msg_in", NULL, "incomming messages" },
+	{ DBG_MSG_OUT,		"msg_out", NULL, "outgoing messages" },
+	{ DBG_MSG_DMP_IN,	"msg_dmp_in", NULL, "hex-dump incomming messages" },
+	{ DBG_MSG_DMP_OUT,	"msg_dmp_out", NULL,"hex-dump of outgong messages"  },
+	
+
+	{ DBG_ELEM_IN,  	"elem_in", NULL, "elements of incomming messages"},
+	{ DBG_ELEM_OUT, 	"elem_out", NULL, "elements of outgoing messages"},
+	{ DBG_ELEM_DETAIL_IN, 	"elem_detail_in", NULL, "details of incomming message elements" },
+	{ DBG_ELEM_DETAIL_OUT, 	"elem_detail_out",NULL, "details of outgoing message elememnts" },
+	{ DBG_ELEM_DMP_IN, 	"elem_dmp_in", NULL, "hex-dump of incoming elements"},
+	{ DBG_ELEM_DMP_OUT, 	"elem_dmp_out", NULL, "hex-dump of outgoing elements"},
+	{ DBG_ELEM_VNDR,	"elem_vndr", NULL, "expand vendor specific payloads"},	
+	
+	{ DBG_DTLS, 		"dtls",NULL, "DTLS related stuff"},
+	{ DBG_DTLS_BIO,		"dtls_bio",NULL, "DTLS BIO releated" },
+	{ DBG_DTLS_BIO_DMP,	"dtls_bio_dmp",NULL, "hex-dump dtls packets" },
+	{ DBG_DTLS_DETAIL, 	"dtls_detail",NULL, "DTLS detailed messages"},
+
+	{ DBG_X,		"x", NULL, "only for developers" },
+
+	{ DBG_ALL, 		"all", NULL, "all debug levels at once"},
+
+	
+	{ 0, NULL } 
+};
 
 
 
@@ -103,7 +197,6 @@ static struct cw_StrListElem * color_on = theme0;
 
 struct cw_StrListElem color_ontext[] = {
 
-/*	{DBG_ELEM_DMP, "\x1b[37m"},*/
 	{DBG_ELEM_DMP_OUT, ANSI_BBLACK ANSI_ITALIC},
 	{DBG_ELEM_DMP_IN,  ANSI_BBLACK},
 
@@ -182,16 +275,36 @@ const char *get_dbg_color_ontext(int level)
  * @param level Level to check
  * @return 0 if leveln is not set, otherwise level is set
  */
-
 int cw_dbg_is_level(int level)
 {
-	if (level > 1 && (level &1))
+	if (cw_dbg_opt_level == NULL)
-		return 1;
+		return 0;
 
-/*	if (level >= DBG_ALL ){
+	return mavl_get(cw_dbg_opt_level,&level) == NULL ? 0:1;
-		return 1;
+}
-	}*/
+
-	return (cw_dbg_opt_level & (level));
+/**
+  * Set debug level
+  * @param level debug level to set, allowed values are enumberated in #cw_dbg_levels structure.
+  * @param on 1: turns the specified debug level on, 0: turns the specified debug level off.
+  *
+  * To check if a specific debug level is set, call #cw_dbg_is_level.
+  */
+void cw_dbg_set_level (int level, int on)
+{
+	int exists;
+
+	if (cw_dbg_opt_level == NULL){
+		cw_dbg_opt_level = mavl_create(dbg_cmp,NULL,sizeof(int));
+		if (cw_dbg_opt_level == NULL)
+			return;
+	}
+
+	if (on){
+		mavl_insert(cw_dbg_opt_level,&level,&exists);
+	}
+	else 
+		mavl_del(cw_dbg_opt_level,&level);
 }
 
 
@@ -211,63 +324,37 @@ static void cw_dbg_vlog_line(struct cw_LogWriter * writer,
 				
 	}
 	writer->write(LOG_DEBUG,fbuf,args,writer);
-
 }
 
 
 
 /**
- * Put a list of missing mandatory message elements to debug output
+ * Display a packet on debugger
- */
-void cw_dbg_missing_mand(int level, struct cw_Conn *conn, int ** ml, int n,
-			 int  * a)
-{
-	/*
-//      if (!cw_dbg_is_level(DBG_MSG_ERR) || n == 0)
-//              return;
-*/
-
-
-	char buffer[2000];
-/*	char *p = buffer; */
-	int i;
-/*	char *delim = "";*/
-	
-	if (!cw_dbg_is_level(level) || n == 0)
-		return;
-	
-/*
-	// TODO XXXX
-*/
-	for (i = 0; i < n; i++) {
-/*		p += sprintf(p, "%s", delim);
-		delim = ", ";
-		p += sprintf(p, "%s", cw_strelemp(conn->actions, ml[i]->elem_id));
-*/
-	}
-	cw_dbg(level, "Missing mandatory elements: [%s]", buffer);
-}
-
-
-
-
-/**
- * Display a packet on for debugger
  */
 void cw_dbg_pkt(int level, struct cw_Conn *conn, uint8_t * packet, int len,
 		struct sockaddr *from)
 {
 
-/*	int hlen;*/
 	char buf[1024];
+	int (*fmt_pkt_hdr)(char *dst, int incomming, uint8_t * packet, int len,
+		      struct sockaddr *from);
+	fmt_pkt_hdr = NULL;
+	if (conn){
+		if (conn->msgset)
+			fmt_pkt_hdr = conn->msgset->format_pkt_hdr;
+	}
+	if (fmt_pkt_hdr==NULL){
+		fmt_pkt_hdr = cw_format_pkt_hdr;
+	}
+
 
 	if (!cw_dbg_is_level(level))
 		return;
 	
 	if (level == DBG_PKT_IN)
-		cw_format_pkt_hdr(buf, 1,  packet, len, from);
+		fmt_pkt_hdr(buf, 1,  packet, len, from);
 	else
-		cw_format_pkt_hdr(buf, 0,  packet, len, from);
+		fmt_pkt_hdr(buf, 0,  packet, len, from);
 		
 /*	hlen = cw_get_hdr_msg_offset(packet);*/
 
@@ -414,7 +501,7 @@ void cw_dbg_elem(int level, struct cw_Conn *conn, int msg,
 	cw_dbg(level,"%s %d (%s), len=%d ",vendorname,handler->id,
 			handler->name,len);
 	
-	if (cw_dbg_is_level(DBG_ELEM_DMP)) {
+	if (cw_dbg_is_level(DBG_ELEM_DMP_OUT) || cw_dbg_is_level(DBG_ELEM_DMP_IN)) {
 		if (level == DBG_ELEM_OUT)
 			cw_dbg_dmp(DBG_ELEM_DMP_OUT,msgbuf,len,"");
 		else 
@@ -429,36 +516,132 @@ void cw_dbg_elem(int level, struct cw_Conn *conn, int msg,
 
 
 
-
+int cw_dbg_set_level_from_str0(const char *level,int on)
-
-
-
-/*
-void dbg_istore_dmp(mbag_t s)
 {
-	DEFINE_AVLITER(it,s);
+	int i,all;
-	avliter_foreach(&it) {
+	all = strcmp(level,"all")==0 ? 1: 0;
 	
-		mbag_item_t *i = avliter_get(&it);
+	for(i=0; cw_dbg_strings[i].str != NULL; i++){
-
+		if (strcmp(cw_dbg_strings[i].str,level)==0 || all){
-		char buffer[1000];
+			if (cw_dbg_strings[i].str_list==NULL)
-
+				cw_dbg_set_level(cw_dbg_strings[i].level,on);
-		struct cw_str * strings = cw_item_strings;
+			else {
-		
+				const char **l;
-		const char * in = cw_strlist_get_str(strings,i->id);
+				for (l=cw_dbg_strings[i].str_list; *l; l++){
-		
+					if (!cw_dbg_set_level_from_str0(*l,on)){
-		cw_format_item(buffer,i);
+						stop();
-		printf("Item ID %d-%s: %s\n",i->id,in,buffer);
+					}
+				}
+			}
+			if (!all)
+				return 1;
+		}
+	}	
+	if (all)
+		return 1;
+/*	blevel = cw_strlist_get_id(cw_dbg_strings, slevel);
+	if (blevel==-1)
+		return 0;
+*/		
+//	cw_dbg_set_level(blevel,on);
+//	return 1;
+	return 0;
+}
 
 
+int cw_dbg_set_level_from_str(const char *level)
+{
+	int on;
+	const char *slevel;
+	
+	switch(*level){
+		case '-':
+		case '!':
+		case '~':
+			on =0;
+			slevel=level+1;
+			break;
+		case '+':
+			slevel=level+1;
+			on=1;
+			break;
+		default:
+			slevel=level;
+			on=1;
+	}
+	return cw_dbg_set_level_from_str0(slevel,on);
+}
+
+
+
+
+void cw_dbg_print_help(FILE *out, const char * prefix)
+{
+	struct cw_DbgStr *s;
+	for (s=cw_dbg_strings; s->str != NULL; s++){
+		const char * descr = s->descr!=NULL ? s->descr : "";
+		fprintf(out,"%s%s: %s",prefix,s->str,descr);
+		if (s->str_list != NULL){
+			const char **l;
+			char *sp="";
+			fprintf(out," (");
+			for(l = s->str_list; *l!=NULL; l++){
+				fprintf(out,"%s%s",sp,*l);
+				sp=" ";
+			}
+			fprintf(out,")");
+		}
+		fprintf(out,"\n");
+	}
+}
+
+
+
+void cw_dbg_dot11_elems(const uint8_t *src,int len)
+{
+	uint8_t id,l;
+	int p;
+	char str[1024];
+
+	for(p=0; p<len; p+=l+2){
+		if (len-p<3){
+			cw_dbg(DBG_X,"Error in dot11 element");
+			return;
+		}
+		id=src[p];
+		l=src[p+1];
+		cw_format_dot11_elem(str,id,src+p+2,l);
+		cw_dbg_dmp(DBG_X,src+p+2,l,"");
+		cw_dbg(DBG_X,str);
 	}
 
-
 }
-*/
+
+void cw_dbg_dot11_frame(uint8_t * frame,int len)
+{
+	char hdr[1024];
+	cw_format_dot11_hdr(hdr, frame, len);
+	cw_dbg(DBG_X,"%s",hdr);
+
+	int type =dot11_get_type_and_subtype(frame);
+
+	switch (type){
+		case DOT11_ASSOC_REQ:
+			cw_dbg_dot11_elems(frame+28,len-28);
+			break;
+		case DOT11_ASSOC_RESP:
+			cw_dbg(DBG_X,"  Capapility info: %04X",dot11_assoc_resp_get_cap(frame)); 
+			cw_dbg(DBG_X,"  Status CodeCapapility info: %04X",dot11_assoc_resp_get_status_code(frame));
+			cw_dbg(DBG_X,"  Assoc ID: %04X",dot11_assoc_resp_get_assoc_id(frame)); 
+
+			cw_dbg_dot11_elems((frame+DOT11_BODY_POS+DOT11_ASSOC_RESP_BODY_LEN),
+					len-DOT11_BODY_POS-DOT11_ASSOC_RESP_BODY_LEN);
+			break;
+			
+	}
+}
 
 
 /**@}*/
 
 
-/**@}*/

src/cw/dbg.h

@@ -39,7 +39,7 @@
 
 
 /**
- *@addtogroup LOGDBG
+ *@addtogroup DBG
  *@{
  */
 
@@ -48,92 +48,91 @@
  */ 
 enum cw_dbg_levels{
 	/** Show headers of incomming/outgoing CAPWAP packets */
-	DBG_PKT_IN 	= (1<<0), 
+	DBG_PKT_IN 	= 1, 
-	DBG_PKT_OUT 	= (1<<1),	
+	DBG_PKT_OUT,	
 
 	/** Hex-dump incomming/outgoing CAPWAP packets */
-	DBG_PKT_DMP_IN	= (1<<3),
+	DBG_PKT_DMP_IN,
-	DBG_PKT_DMP_OUT = (1<<4),
+	DBG_PKT_DMP_OUT,
 
 	/** Incomming CAPWAP packets with errors, wich would
 	    usually silently discarded */ 
-	DBG_PKT_ERR	= (1<<5),
+	DBG_PKT_ERR,
 	
 
 	/** Display incomming/outgoing CAPWAP/LWAPP messages */
-	DBG_MSG_IN	= (1<<6),
+	DBG_MSG_IN,
-	DBG_MSG_OUT	= (1<<7),
+	DBG_MSG_OUT,
 
 	/** Show hex-dump of messages */
-	DBG_MSG_DMP_IN	= (1<<8),
+	DBG_MSG_DMP_IN,
-	DBG_MSG_DMP_OUT	= (1<<9),
+	DBG_MSG_DMP_OUT,
 
 	/** Message errors */
-	DBG_MSG_ERR	= (1<<10),
+	DBG_MSG_ERR,
 
 	/** Show message elements in incomming/outgoing messages */
-	DBG_ELEM_IN	= (1<<11),
+	DBG_ELEM_IN,
-	DBG_ELEM_OUT	= (1<<12),
+	DBG_ELEM_OUT,
 
 	/** Show message element details  */
-	DBG_ELEM_DETAIL_IN = (1<<13),
+	DBG_ELEM_DETAIL_IN,
-	DBG_ELEM_DETAIL_OUT = (1<<14),
+	DBG_ELEM_DETAIL_OUT,
 
 	/** Error in msg elements */
-	DBG_ELEM_ERR	= (1<<15),
+	DBG_ELEM_ERR,
-
-	/** hex dump elements */	
-	DBG_ELEM_DMP	= (1<<16),
 
 	/** General infos, like CAPWAP state */
-	DBG_INFO	= (1<<17),	
+	DBG_INFO,	
 
 	/** Misc. warnings */
-	DBG_WARN	= (1<<18),
+	DBG_WARN,
 
 	/** RFC related */
-	DBG_RFC		= (1<<19),
+	DBG_RFC,
 
 	/** DTLS related messages */
-	DBG_DTLS	= (1<<20),
+	DBG_DTLS,
 
 	/** DTLS BIOs in/out */
-	DBG_DTLS_BIO	= (1<<21),
+	DBG_DTLS_BIO,
 
 	/** Dump DTLS BIO i/o */
-	DBG_DTLS_BIO_DMP = (1<<22),
+	DBG_DTLS_BIO_DMP,
 
 	/** Show DTLS Details */
-	DBG_DTLS_DETAIL	= (1<<23),
+	DBG_DTLS_DETAIL,
 	
-//	DBG_CFG_DMP	= (1<<20),
+//	DBG_CFG_DMP,
 
-//	DBG_CFG_SET	= (1<<21),
+//	DBG_CFG_SET,
 
 	/** Debug Mods */
-	DBG_MOD		= (1<<24),
+	DBG_MOD,
 	
        	/**Debug State machine */
-	DBG_STATE	= (1<<25),
+	DBG_STATE,
+	
+	/** Infos about nessage composing */	
+	DBG_MSG_COMPOSE,
+
+	/** Debug Configuration updates */
+	DBG_CFG_UPDATES,
+
+	/** Debug Vendor elements */
+	DBG_ELEM_VNDR,
 	
 	
-	DBG_MSG_COMPOSE	= (1<<26),
+	DBG_X,
 
-	DBG_CFG_UPDATES	= (1<<27),
+	DBG_MOD_DETAIL,
 
-	DBG_ELEM_VNDR	= (1<<28),
+	DBG_ALL,
-	
-
-	DBG_X		= (1<<30),
-
-	DBG_MOD_DETAIL	= (1<<31),
-
-	DBG_ALL 	= (0x7fffffff),
-
-
-	DBG_ELEM_DMP_IN	= 7,
-	DBG_ELEM_DMP_OUT = 9,
 
+	/** Hexdump incoming msg elemenets */
+	DBG_ELEM_DMP_IN,
+	/** Hexdump outgoing msg elemenst */
+	DBG_ELEM_DMP_OUT,
 
 };
 
@@ -192,8 +191,8 @@ void cw_dbg_dmp(int level, const uint8_t * data, int len, const char *format, ..
 
 
 extern uint32_t cw_dbg_opt_display;
-extern uint32_t cw_dbg_opt_level;
+//extern uint32_t cw_dbg_opt_level;
-extern struct cw_StrListElem cw_dbg_strings[];
+//extern struct cw_StrListElem cw_dbg_strings[];
 
 /*
 #define cw_dbg cw_dbg_colored
@@ -220,8 +219,6 @@ void cw_dbg_msg(int level,struct cw_Conn *conn, uint8_t * packet, int len,struct
 char * cw_dbg_mkdmp(const uint8_t * data, int len);
 //void cw_dbg_version_subelem(int level, const char *context, int subtype, 
 //		uint32_t vendor_id, const uint8_t * vstr, int len);
-void cw_dbg_ktv_dump(mavl_t ktv, uint32_t dbglevel, 
-		const char *header, const char *prefix, const char *footer );
 
 /**
   * Set debug level
@@ -243,6 +240,10 @@ void cw_dbg_ktv_dump(mavl_t ktv, uint32_t dbglevel,
 */
 int cw_dbg_is_level(int level);
 
+void cw_dbg_print_help(FILE *out, const char * prefix);
+void cw_dbg_dot11_frame(uint8_t * frame,int len);
+
+
 
 #define stop() printf("STOP IN %s:%d - %s\n", __FILE__, __LINE__, __FUNCTION__); exit(1)
 

src/cw/dbg_strings.c

@@ -1,137 +0,0 @@
-/*
-    This file is part of actube.
-
-    actube is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    libcapwap is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-/**
- *@file
- *@brief 
- */
-
-
-
-#include "dbg.h"
-
-/**
- *@addtogroup DbgOptions 
- *@{
- */
-
-
-/**
- * Debug strings
- */
-struct cw_StrListElem cw_dbg_strings[] = {
-	{ DBG_INFO,		"info",  },
-	{ DBG_PKT_IN,		"pkt_in"  },
-	{ DBG_PKT_OUT,		"pkt_out" },
-	{ DBG_PKT_ERR,		"pkt_err" },
-	{ DBG_PKT_DMP_IN,	"pkt_dmp_in" },
-	{ DBG_PKT_DMP_OUT,	"pkt_dmp_out" },
-
-	{ DBG_MSG_IN,		"msg_in"  },
-	{ DBG_MSG_OUT,		"msg_out" },
-	{ DBG_MSG_DMP_IN,	"msg_dmp_in"  },
-	{ DBG_MSG_DMP_OUT,	"msg_dmp_out" },
-	
-	{ DBG_MSG_ERR,		"msg_err"},
-
-	{ DBG_RFC,		"rfc", 	 },
-
-	{ DBG_ELEM_IN,  	"elem_in"},
-	{ DBG_ELEM_OUT, 	"elem_out"},
-	{ DBG_ELEM_DMP, 	"elem_dmp"},
-	{ DBG_ELEM_ERR, 	"elem_err" },
-	{ DBG_ELEM_DETAIL_IN, 	"elem_detail_in" },
-	{ DBG_ELEM_DETAIL_OUT, 	"elem_detail_out" },
-	{ DBG_ELEM_VNDR,	"elem_vndr"},	
-	
-	{ DBG_DTLS, 		"dtls" },
-	{ DBG_DTLS_BIO,		"dtls_bio" },
-	{ DBG_DTLS_BIO_DMP,	"dtls_bio_dmp"},
-	{ DBG_DTLS_DETAIL, 	"dtls_detail"},
-
-	{ DBG_CFG_UPDATES, 	"cfg_updates" },
-	{ DBG_X,		"x" },
-
-	
-//	{DBG_CFG_DMP, "cfg_dmp" },
-	
-	{ DBG_WARN,		"warn" },
-		
-	{ DBG_MOD,		"mod"},
-	{ DBG_STATE,		"state" },
-	{ DBG_MSG_COMPOSE,	"msg_compose" },
-
-	{ (DBG_MSG_IN | DBG_MSG_OUT), "msg" },
-	{ (DBG_PKT_IN | DBG_PKT_OUT), "pkt" },
-	{ (DBG_ELEM_IN | DBG_ELEM_OUT), "elem" },
-	{ (DBG_ELEM_DETAIL_IN | DBG_ELEM_DETAIL_OUT), "elem_detail" },
-	{ (DBG_ELEM_IN | DBG_ELEM_OUT | DBG_ELEM_DMP | DBG_ELEM_DETAIL_IN | DBG_ELEM_DETAIL_OUT), "elem_all" },
-
-	{ (	DBG_MSG_IN | DBG_MSG_OUT | 
-		DBG_ELEM_IN | DBG_ELEM_OUT |
-		DBG_MSG_ERR | DBG_ELEM_ERR |
-		DBG_PKT_ERR | DBG_RFC | DBG_WARN
-
-
-		| DBG_STATE), 			"std" },
-
-	{ DBG_ALL, 		"all"},
-
-	
-	{ CW_STR_STOP, NULL } 
-};
-
-/**
- *@}
- */
-
-
-
-
-/*
-struct cw_dbg_cfgstrs cw_dbg_cfgstrs[] = {
-
-	{"info",DBG_CW_INFO},
-	{"msg",DBG_MSG},
-	{"elem",DBG_ELEM},
-	{"elem_dmp",DBG_ELEM_DMP},
-	{"rfc",DBG_CW_RFC},
-	{"pkt_in",DBG_CW_PKT_IN},
-	{"pkt_out",DBG_CW_PKT_OUT},
-	{"pkt_dtl",DBG_CW_PKT_DTL},
-	{"pkt",(DBG_CW_PKT_IN | DBG_CW_PKT_OUT)},
-	{"pkt_dmp",DBG_CW_PKT_DMP},
-	{"pkt_err",DBG_CW_PKT_ERR},
-	{"msg_err",DBG_MSG_ERR},
-	{"img_dtl",DBG_CW_IMG_DTL},
-	{"elem_err",DBG_ELEM_ERR},
-
-	{"dtls",DBG_DTLS},
-	{"dtls_detail",DBG_DTLS_DETAIL},
-	{"dtls_bio",DBG_DTLS_BIO},
-	{"dtls_bio_dmp",DBG_DTLS_BIO_DMP},
-
-
-	{"all",DBG_ALL},
-	{"err",DBG_ERR},
-	{0,0}
-
-};
-*/
-
-

src/cw/dot11.c

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

src/cw/dot11.h

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

src/cw/dot11_inline.c

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

src/cw/format.c

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

src/cw/format.h

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

src/cw/fragman.c

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

src/cw/fragman.h

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

src/cw/lwapp.h

@@ -137,7 +137,7 @@
 #define LW_ELEM_DIRECT_SEQUENCE_CONTROL			14
 
 #define LW_ELEM_CHANGE_STATE_EVENT			26
-#define LW_ELEM_80211_DELETE_WLAN			28
+#define LWAPP_ELEM_80211_DELETE_WLAN			28
 
 #define LW_ELEM_AC_NAME					31
 #define LW_ELEM_LOCATION_DATA				35

src/cw/msgset.h

@@ -72,6 +72,9 @@ struct cw_MsgSet {
 	mavl_t statemachine_states;
 	int (*write_header)(struct cw_ElemHandler * handler, uint8_t * dst, int len);
 	int (*header_len)(struct cw_ElemHandler *handler);
+	int (*format_pkt_hdr)(char *dst, int incomming, uint8_t * packet, int len,
+		      struct sockaddr *from);
+	
 };
 
 

src/cw/send.c

@@ -90,10 +90,143 @@ int conn_send_data_msg(struct cw_Conn * conn, uint8_t *rawmsg,int len)
 	return 0;
 }
 
-
 #define MAX_MTU 9500
+
+
+/**
+ * Initialize a capwap header
+ *
+ * @param buf	Buffer to be initialized
+ * @param wbid  Wireless Binding ID 
+ * @param rid 	Radio ID
+ * @param rmac	Radio MAC, NULL if not present
+ * @param wd	Wireless Data, NULL if not present
+ *
+ * @return Length of the header that was initialized
+ */
+int 
+cw_init_capwap_packet( uint8_t * buf, int wbid ,int rid, bstr_t rmac, bstr_t wd)
+{
+	int len,hlen;
+
+	/* header len */
+	len = 8;
+
+	/* zero the first 8 bytes */
+	cw_set_dword(buf + 0, 0);
+	cw_set_dword(buf + 4, 0);
+
+	/* capwap version/unencrypted */
+	#if CAPWAP_VERSION != 0 
+		cw_set_hdr_preamble(buf, CAPWAP_VERSION << 4 | 0);
+	#endif
+
+	/* set wbid and rid */
+	cw_set_hdr_wbid(buf, wbid);
+	cw_set_hdr_rid(buf, rid);
+
+	/* add rmac if present */
+	if (rmac != NULL){
+		int rmac_len = bstr_len(rmac);
+		memcpy(cw_get_hdr_rmac(buf), rmac, rmac_len + 1);
+		cw_set_hdr_flags(buf, CAPWAP_FLAG_HDR_M, 1);
+		len+=rmac_len+1;
+	}
+
+	/* Add wireless data if present */
+	if (wd!=NULL){
+		int wd_len = bstr_len(wd);
+		memcpy(buf+len, wd, wd_len + 1);
+		cw_set_hdr_flags(buf, CAPWAP_FLAG_HDR_M, 1);
+		len+=wd_len;
+	}
+	
+	hlen = len / 4;
+	if (len % 4 != 0) {
+		hlen++;
+	}
+	cw_set_hdr_hlen(buf, hlen);
+
+	return hlen*4;
+}
+
+/**
+ * Send a CAPWAP packet and fragment it if nececerry
+ * @param conn connection where to send packet over
+ * @param buf pointer to a buffer initialized with #cw_init_capwap_packet
+ * @param hlen length of header, which is the value returned by #cw_init_capwap_packet
+ * @param data payload
+ * @param len length of payload 
+ */
+int cw_send_capwap_packet(struct cw_Conn * conn, uint8_t * buf, int hlen, uint8_t * data, int len)
+{
+	int fragoffset,mtu;
+	int fragid;
+
+	/* get mtu and align it to 8 */
+	mtu = conn->mtu;
+	mtu &= ~3;
+
+	/* initialize fragid and fragoffset */
+	fragoffset = 0;
+	if (len + hlen > mtu)
+		fragid = conn->fragid++;
+	else
+		fragid = 0;
+
+	/* create all fragments */
+	while (len + hlen > mtu){
+		memcpy(buf+hlen,data+(fragoffset*8),mtu-hlen);
+		len -= (mtu - hlen);
+
+		cw_set_hdr_flags(buf,CAPWAP_FLAG_HDR_F,1);
+		cw_set_dword(buf+4, fragid<<16 | fragoffset<<3 );
+
+		cw_dbg_pkt(DBG_PKT_OUT,conn,buf,mtu,(struct sockaddr*)&conn->addr);
+		if (conn->write(conn,buf,mtu)<0)
+			return -1;
+	
+		fragoffset+=(mtu-hlen)/8;
+
+		/* put rmac and wireless data only into the 1st fragment */
+		if (hlen!=8){
+			cw_set_hdr_flags(buf,CAPWAP_FLAG_HDR_M,0);
+			cw_set_hdr_flags(buf,CAPWAP_FLAG_HDR_W,0);
+			hlen = 8;
+			cw_set_hdr_hlen(buf,hlen/4);
+		}
+	}
+
+	if (fragoffset)
+		cw_set_hdr_flags(buf,CAPWAP_FLAG_HDR_F | CAPWAP_FLAG_HDR_L,1);
+	else
+		cw_set_hdr_flags(buf,CAPWAP_FLAG_HDR_F,0);
+
+	memcpy(buf+hlen,data+(fragoffset*8),len);
+
+	cw_set_dword(buf+4, fragid<<16 | fragoffset<<3 );
+
+	cw_dbg_pkt(DBG_PKT_OUT,conn,buf,len+hlen,(struct sockaddr*)&conn->addr);
+
+	return conn->write(conn,buf,len + hlen);
+}
+
 int 
 cw_send_msg( struct cw_Conn * conn, uint8_t *msg)
+{
+	uint8_t buf[MAX_MTU];
+	int hlen,msglen;
+	hlen = cw_init_capwap_packet(buf,1,0,NULL,NULL);
+	msglen = cw_get_msg_elems_len(msg) + 8;
+	return cw_send_capwap_packet(conn,buf,hlen,msg,msglen);
+}
+
+
+
+
+
+int 
+cw_send_msg_old( struct cw_Conn * conn, uint8_t *msg)
 {
 	uint8_t buf[MAX_MTU];
 	int fragoffset,hlen,mtu;

src/cw/val.h

@@ -52,6 +52,7 @@ typedef struct cw_Val cw_Val_t;
 
 
 
+
 /**
  * @class cw_Type
  * @author 7u83
@@ -117,7 +118,10 @@ struct cw_ValStruct {
 typedef struct cw_ValStruct cw_ValStruct_t;
 
 
-
+struct cw_ValBit {
+	uint16_t bit;
+	const char *key;
+};
 
 
 
@@ -147,6 +151,7 @@ struct cw_ValIndexed{
 typedef struct cw_ValIndexed cw_ValIndexed_t;
 
 
+extern const struct cw_Type cw_type_bits;
 extern const struct cw_Type cw_type_byte;
 extern const struct cw_Type cw_type_word;
 extern const struct cw_Type cw_type_dword;
@@ -159,6 +164,7 @@ extern const struct cw_Type cw_type_bool;
 extern const struct cw_Type cw_type_struct;
 extern const struct cw_Type cw_type_array;
 
+#define CW_TYPE_BITS (&cw_type_bits)
 #define CW_TYPE_BYTE (&cw_type_byte)
 #define CW_TYPE_WORD (&cw_type_word)
 #define CW_TYPE_DWORD (&cw_type_dword)

src/mod/capwap/capwap_actions.c

@@ -24,6 +24,7 @@
 
 #include "cw/msgset.h"
 #include "cw/keys.h"
+#include "cw/format.h"
 
 #include "mod_capwap.h"
 
@@ -85,7 +86,26 @@ static cw_ValValRange_t mac_types[]={
 	{0,0,NULL}
 };
 
-
+/*
+struct cw_ValBit xx[] = {
+                {0,"ess"},
+                {1,"ibss"},
+                {2,"cf-pollable"},
+                {3,"cf-poll-request"},
+                {4,"privacy"},
+                {5,"short-preamble"},
+                {2,"pbcc"},
+                {3,"cf-poll-request"},
+                {2,NULL}        
+        };
+*/
+struct cw_ValBit frame_tunnel_bits[] = {
+	{3,"native"},
+	{2,"802-3"},
+	{1,"local-bridging"},
+	{0,"reserved"},
+	{1, NULL}        
+};
 
 
 static cw_ValStruct_t radio_admin_state[] = {
@@ -151,10 +171,13 @@ static struct cw_ElemHandler handlers[] = {
 		CAPWAP_ELEM_WTP_FRAME_TUNNEL_MODE,	/* Element ID */
 		0,0,					/* Vendor / Proto */
 		1,1,					/* min/max length */
-		CW_TYPE_BYTE,				/* type */
+		CW_TYPE_BITS,				/* type */
 		"capwap/wtp-frame-tunnel-mode",		/* Key */
 		cw_in_generic,				/* get */
-		cw_out_generic				/* put */
+		cw_out_generic,				/* put */
+		NULL,
+		NULL,
+		frame_tunnel_bits
 	}
 	,
 	{ 
@@ -919,6 +942,7 @@ struct cw_MsgSet * capwap_register_msg_set(struct cw_MsgSet * set, int mode){
 	
 	set->write_header = write_header;
 	set->header_len = header_len;
+	set->format_pkt_hdr = cw_format_pkt_hdr;
 
 	cw_dbg(DBG_INFO,"CAPWAP: Done register messages");
 	return set;

src/mod/cisco/capwap_cisco.h

@@ -56,8 +56,8 @@
 
 #define CISCO_ELEM_RRM_LOAD			25					/* 25 */
 
+#define CISCO_ELEM_DELETE_WLAN			LWAPP_ELEM_80211_DELETE_WLAN		/* 28 */
 
-#define CW_CISCO_80211_DELETE_WLAN		LW_ELEM_80211_DELETE_WLAN		/* 28 */
 
 #define CW_CISCO_MWAR_NAME			LW_ELEM_AC_NAME				/* 31 */
 #define CISCO_ELEM_33				33
@@ -77,6 +77,7 @@
 
 #define CISCO_ELEM_WTP_BOARD_DATA		LW_ELEM_WTP_BOARD_DATA			/* 50 */
 #define CISCO_ELEM_BCAST_SSID_MODE		LWAPP_ELEM_BCAST_SSID_MODE		/* 51 */
+
 #define CISCO_ELEM_AP_MODE_AND_TYPE		LW_ELEM_80211_WTP_MODE_AND_TYPE		/* 54 */
 #define CISCO_ELEM_AP_QOS			LW_ELEM_QOS				/* 57 */
 

src/mod/cisco/cisco_out_lw_path_mtu.c

@@ -24,7 +24,7 @@ int cisco_out_lw_path_mtu(struct cw_ElemHandler * eh,
 
 	int wl = 1400-cl-hl;
 
-printf("HL:%d CL:%d WL: %d\n",hl,cl,wl);
+//printf("HL:%d CL:%d WL: %d\n",hl,cl,wl);
 	if (wl<=40)
 		return 0;
 

src/mod/cisco/lwapp_cisco.h

@@ -31,6 +31,7 @@
 #define CISCO_LWELEM_9				9
 #define CISCO_LWELEM_AP_MFP_CAP_SUBTYPE		11
 #define CISCO_LWELEM_AP_MFP_CONFIG_SUBTYPE	14
+#define CISCO_LWELEM_15				15
 #define CISCO_LWELEM_AP_USERNAME_PASSWORD	18
 #define LW_CISCO_MANAGER_IP_ADDR		19
 #define CISCO_LWELEM_DISCOVERY_PROTOCOL		20
@@ -43,6 +44,7 @@
 #define CISCO_LWELEM_33				33
 #define CISCO_LWELEM_AP_ETHERNET_PORT_SUBTYPE	34
 #define CISCO_LWELEM_AP_LOGHOST_CONFIG		36
+#define CISCO_LWELEM_37				37
 #define CISCO_LWELEM_MCAST_MGID_INFO		39
 
 #define CISCO_LWELEM_AP_TELNET_SSH		44

src/mod/cisco/mod_cisco.c

@@ -48,6 +48,16 @@ int cisco_out_radio_info(struct cw_ElemHandler * handler, struct cw_ElemHandlerP
 			, uint8_t * dst);
 
 
+
+
+struct cw_ValBit frame_tunnel_bits_draft7[] = {
+	{2,"native"},
+	{1,"802-3"},
+	{0,"local-bridging"},
+	{1, NULL}        
+};
+
+
 static cw_ValValRange_t cfg_type[]={
 	{1,1,"1 - global"},
 	{2,2,"2 - custom"},
@@ -220,7 +230,7 @@ static cw_ValStruct_t cisco_ap_static_domain[]={
 
 
 
-static cw_ValStruct_t cisco_ap_regulatory_domain4[]={
+static cw_ValStruct_t cisco_ap_regulatory_domain70[]={
 	{CW_TYPE_BOOL,"set",1,-1},
 	{CW_TYPE_BYTE,"slot",1,-1},
 	{CW_TYPE_BYTE,"code0",1,-1},
@@ -228,7 +238,14 @@ static cw_ValStruct_t cisco_ap_regulatory_domain4[]={
 	{NULL,NULL,0,0}
 };
 
-static cw_ValStruct_t cisco_ap_regulatory_domain5[]={
+static int mkkey_domain70(const char *pkey, uint8_t*data, int len, char *dst)
+{
+	sprintf(dst,"radio.%d/%s",cw_get_byte(data+1),pkey);
+	return 0;
+}
+
+
+static cw_ValStruct_t cisco_ap_regulatory_domain75[]={
 	{CW_TYPE_BYTE,"band-id",1,-1},
 	{CW_TYPE_BOOL,"set",1,-1},
 	{CW_TYPE_BYTE,"slot",1,-1},
@@ -237,6 +254,12 @@ static cw_ValStruct_t cisco_ap_regulatory_domain5[]={
 	{NULL,NULL,0,0}
 };
 
+static int mkkey_domain75(const char *pkey, uint8_t*data, int len, char *dst)
+{
+	sprintf(dst,"radio.%d/%s",cw_get_byte(data+2),pkey);
+	return 0;
+}
+
 
 static cw_ValStruct_t cisco_mac_operation70[]={
 	{CW_TYPE_BYTE,"reserved",1,-1},
@@ -277,7 +300,7 @@ static cw_ValStruct_t cisco_ap_dot11h[]={
 };
 
 
-
+/*
 int cisco_in_ap_regulatory_domain(struct cw_ElemHandler *eh, 
 		struct cw_ElemHandlerParams *params, 
 			uint8_t * data,	 int len)
@@ -300,81 +323,29 @@ int cisco_in_ap_regulatory_domain(struct cw_ElemHandler *eh,
 	return 1;
 }
 
+*/
+
+
 
 int cisco_out_ap_regulatory_domain(struct cw_ElemHandler * eh, 
 		struct cw_ElemHandlerParams * params, uint8_t * dst)
 
 {
 	char key[CW_CFG_MAX_KEY_LEN];
-//	char testkey[CW_CFG_MAX_KEY_LEN];
+	int l,i;
-	int idx;
+	int len=0;
-	void * type;
+	for (i=0; (i=cw_cfg_get_first_index_l(params->cfg_list,"radio",i))!=-1; i++){
-	cw_Val_t * result;
+		if (i==255)
-	int len,start;
+			continue;
-	uint8_t * ob;
+		sprintf(key,"radio.%d/%s",i,eh->key);
-
+		l=cw_out_generic0(eh,params,dst+len,key);
-
+		if (l>0)
-
+			len+=l;
-	idx = 0;
-	ob = dst;
-	
-
-	type = NULL;
-	result = cw_cfg_get_val_l(params->cfg_list,"capwap/wtp-descriptor/software/version",CW_TYPE_BSTR16);
-	if (result!=NULL){
-		if(result->type->len(result)==4){
-			uint32_t rv;
-			rv = cw_get_dword(result->type->data(result));
-cw_dbg(DBG_X,"Version is %08X",rv);			
-//stop();
-//			if (rv >= 0x07056600){
-			if (rv > 0x07036500){
-				type = cisco_ap_regulatory_domain5;
 	}
-			else{
+	return len;
-				type = cisco_ap_regulatory_domain4;
-			}
-		}
-		
-	}
-	else {
-		stop();
-	}
-
-	cw_val_destroy(result);
-
-	do {
-		sprintf(key,"%s.%d",eh->key,idx);
-		if (!cw_cfg_base_exists_l(params->cfg_list,key))
-			break;
-	
-		if(type == NULL){
-//			sprintf(testkey,"%s/%s",key,"band-id");
-			stop();
-//			result = cw_ktv_get_val_l(params->cfg_list,key,CW_TYPE_BYTE);
-			if (result==NULL){
-				type = cisco_ap_regulatory_domain4;
-			}
-			else{
-				type = cisco_ap_regulatory_domain5;
-				cw_val_destroy(result);
-			}
-		}
-		
-		start = params->msgset->header_len(eh);
-		len = CW_TYPE_STRUCT->write(params->cfg_list,key,ob+start,type);
-//		len = cw_ktv_write_struct(params->cfg,NULL,type,key,ob+start);
-		ob += params->msgset->write_header(eh,ob,len);
-		
-		idx++;
-		
-	}while(1);
-
-
-	sprintf(key,"%s.%d",eh->key,idx+1);
-	return ob-dst;
 }
 
+
 static cw_ValStruct_t cisco_ap_model[]={
 	{CW_TYPE_STR,"model",30,-1},
 	{CW_TYPE_STR,"image",30,30},
@@ -473,7 +444,7 @@ static cw_ValStruct_t cisco_wtp_radio_config73[]={
 	{CW_TYPE_WORD,"@cisco/occupancy-limit",2,-1},
 	{CW_TYPE_BYTE,"@cisco/cfg-period",1,-1},
 	{CW_TYPE_WORD,"@cisco/cfp-maximum-duration",2,-1},
-	{CW_TYPE_BSTR16,"bssid",6,-1},
+	{CW_TYPE_BSTR16,"capwap80211/bssid",6,-1},
 	{CW_TYPE_WORD,"beacon-period",2,-1},
 	{CW_TYPE_STR,"@cisco/country-string",3,-1},
 	{CW_TYPE_STR,"country-string",2,-1},
@@ -574,6 +545,53 @@ static cw_ValStruct_t cisco_station_cfg_stru[]={
 
 
 
+static cw_ValStruct_t cisco_ap_qos73[]={
+	{CW_TYPE_BYTE,"tag-packets",1,-1},
+
+	{CW_TYPE_BYTE,"uranium-queue-depth",1,-1},
+	{CW_TYPE_WORD,"uranium-cwmin",2,-1},
+	{CW_TYPE_WORD,"uranium-cwmax",2,-1},
+	{CW_TYPE_BYTE,"uranium-aifs",1,-1},
+	{CW_TYPE_WORD,"uranium-cbr",2,-1},
+	{CW_TYPE_BYTE,"uranium-dot1p-tag",1,-1},
+	{CW_TYPE_BYTE,"uranium-dscp-tag",1,-1},
+	
+	{CW_TYPE_BYTE,"platinum-queue-depth",1,-1},
+	{CW_TYPE_WORD,"platinum-cwmin",2,-1},
+	{CW_TYPE_WORD,"platinum-cwmax",2,-1},
+	{CW_TYPE_BYTE,"platinum-aifs",1,-1},
+	{CW_TYPE_WORD,"platinum-cbr",2,-1},
+	{CW_TYPE_BYTE,"platinum-dot1p-tag",1,-1},
+	{CW_TYPE_BYTE,"platinum-dscp-tag",1,-1},
+
+	{CW_TYPE_BYTE,"gold-queue-depth",1,-1},
+	{CW_TYPE_WORD,"gold-cwmin",2,-1},
+	{CW_TYPE_WORD,"gold-cwmax",2,-1},
+	{CW_TYPE_BYTE,"gold-aifs",1,-1},
+	{CW_TYPE_WORD,"gold-cbr",2,-1},
+	{CW_TYPE_BYTE,"gold-dot1p-tag",1,-1},
+	{CW_TYPE_BYTE,"gold-dscp-tag",1,-1},
+
+	{CW_TYPE_BYTE,"silver-queue-depth",1,-1},
+	{CW_TYPE_WORD,"silver-cwmin",2,-1},
+	{CW_TYPE_WORD,"silver-cwmax",2,-1},
+	{CW_TYPE_BYTE,"silver-aifs",1,-1},
+	{CW_TYPE_WORD,"silver-cbr",2,-1},
+	{CW_TYPE_BYTE,"silver-dot1p-tag",1,-1},
+	{CW_TYPE_BYTE,"silver-dscp-tag",1,-1},
+
+	{CW_TYPE_BYTE,"bronze-queue-depth",1,-1},
+	{CW_TYPE_WORD,"bronze-cwmin",2,-1},
+	{CW_TYPE_WORD,"bronze-cwmax",2,-1},
+	{CW_TYPE_BYTE,"bronze-aifs",1,-1},
+	{CW_TYPE_WORD,"bronze-cbr",2,-1},
+	{CW_TYPE_BYTE,"bronze-dot1p-tag",1,-1},
+	{CW_TYPE_BYTE,"bronze-dscp-tag",1,-1},
+
+	{CW_TYPE_BSTR16, "rest", -1, -1},
+	{NULL,NULL,0,0}
+};
+
 static cw_ValStruct_t cisco_ap_qos[]={
 	{CW_TYPE_BYTE,"tag-packets",1,-1},
 	{CW_TYPE_BYTE,"uranium-queue-depth",1,-1},
@@ -619,6 +637,12 @@ static cw_ValStruct_t cisco_ap_qos[]={
 	{NULL,NULL,0,0}
 };
 
+
+
+
+
+
+
 static cw_ValStruct_t cisco_ap_core_dump[]={
 	{CW_TYPE_IPADDRESS,"tftp-server",4,-1},
 	{CW_TYPE_BOOL,"compression",1,16},
@@ -653,6 +677,9 @@ static cw_ValStruct_t cisco_rouge_detections[]={
 	{NULL,NULL,0,0}
 };
 
+
+
+
 static cw_ValStruct_t cisco_ap_venue_settings[]={
 	{CW_TYPE_WORD,"group",2,-1},
 	{CW_TYPE_BYTE,"type",1,-1},
@@ -662,8 +689,19 @@ static cw_ValStruct_t cisco_ap_venue_settings[]={
 	
 };
 
+
+static cw_ValValRange_t cisco_ap_modes[]={
+	{0,0,"0 - local"},
+	{1,1,"1 - monitor"},
+	{2,2,"2 - FlexConnect"},
+	{3,3,"3 - Rouge Detector"},
+	{4,4,"4 - Sniffer"},
+	{5,5,"5 - Bridge"},
+	{0,0,NULL}
+};
+
 static cw_ValStruct_t cisco_ap_mode_and_type[]={
-	{CW_TYPE_BYTE,"mode",1,-1},
+	{CW_TYPE_BYTE,"mode",1,-1,cisco_ap_modes},
 	{CW_TYPE_BYTE,"type",1,-1},
 	{NULL,NULL,0,0}
 };
@@ -679,26 +717,6 @@ static cw_ValStruct_t dtls_data_cfg[]={
 
 
 
-static cw_ValStruct_t cisco_add_wlan[]={
-	{CW_TYPE_BYTE,"radio-id",1,-1},
-	{CW_TYPE_WORD,"capwap80211/capability",2,-1},
-	{CW_TYPE_BYTE,"wlan-id",1,-1},
-	{CW_TYPE_DWORD,"cisco/encryption-policy",4,-1},
-
-	{CW_TYPE_BSTR16,"cisco/wep-key",13,9},
-	{CW_TYPE_BYTE,"cisco/wep-encryption",1,42},
-	
-	{CW_TYPE_BOOL,"cisco/broadcast-ssid",1,426},
-	{CW_TYPE_WORD,"cisco/session-timout",2,475},
-	{CW_TYPE_BYTE, "cisco/dtim-period",1,541},
-	{CW_TYPE_STR, "cisco/ssid-a",30,545},
-	{CW_TYPE_BYTE, "cisco/allow-aaa-override",1,578},
-	{CW_TYPE_BYTE, "cisco/max-stations",1,580},
-	
-	{NULL,NULL,0,0}
-};
-
-
 static cw_ValStruct_t cisco_add_wlan70[]={
 	{CW_TYPE_BYTE,"radio-id",1,-1},
 	{CW_TYPE_WORD,"capwap80211/capability",2,-1},
@@ -721,29 +739,59 @@ static cw_ValStruct_t cisco_add_wlan70[]={
 	{CW_TYPE_STR,"cisco/profile-name",30,441},
 	{CW_TYPE_STR, "capwap80211/ssid",33,474},
 	
-	
 	{NULL,NULL,0,0}
 };
+static int cisco_add_wlan_mkkey70(const char *pkey, uint8_t*data, int len, char *dst)
+{
+        int wlan_id,radio_id;
+        radio_id = cw_get_byte(data);
+        wlan_id = cw_get_byte(data+4);
+        sprintf(dst,"radio.%d/wlan.%d",radio_id,wlan_id);
+        return 1;
+}
 
 
+static cw_ValStruct_t cisco_add_wlan73[]={
+	{CW_TYPE_BYTE,"radio-id",1,-1},
+	{CW_TYPE_WORD,"capwap80211/capability",2,-1},
+	{CW_TYPE_WORD,"wlan-id",1,-1},
+	{CW_TYPE_DWORD,"cisco/encryption-policy",4,-1},
 
+	{CW_TYPE_BSTR16,"cisco/wep-key",13,9},
+	{CW_TYPE_BYTE,"cisco/wep-encryption",1,42},
 	
+	{CW_TYPE_BOOL,"cisco/broadcast-ssid",1,426},
+	{CW_TYPE_WORD,"cisco/session-timout",2,475},
+	{CW_TYPE_BYTE, "cisco/dtim-period",1,541},
+	{CW_TYPE_STR, "cisco/profile-name",30,545},
+	{CW_TYPE_BYTE, "cisco/allow-aaa-override",1,578},
+	{CW_TYPE_BYTE, "cisco/max-stations",1,580},
+	{CW_TYPE_STR, "capwap80211/ssid", -1 , 583},
+	{NULL,NULL,0,0}
+};
+static int cisco_add_wlan_mkkey73(const char *pkey, uint8_t*data, int len, char *dst)
+{
+        int wlan_id,radio_id;
+        radio_id = cw_get_byte(data);
+        wlan_id = cw_get_byte(data+4);
+        sprintf(dst,"radio.%d/wlan.%d",radio_id,wlan_id);
+        return 1;
+}
 
-static int cisco_in_lw_del_wlan(struct cw_ElemHandler *eh, 
+static int cisco_in_del_wlan(struct cw_ElemHandler *eh, 
 		struct cw_ElemHandlerParams *params, 
 			uint8_t * data,	 int len)
 {
-	stop();
-/*
 	int wlan_id, radio_id;
 	char key[CW_CFG_MAX_KEY_LEN];
 	
 	radio_id=cw_get_byte(data);
-	wlan_id=cw_get_word(data+1);
+	wlan_id=cw_get_word(data+2);
-	sprintf(key,"radio.%d/wlan.%d",radio_id,wlan_id);
+	sprintf(key,"radio.%d/wlan.%d/@actube/enable",radio_id,wlan_id);
-	cw_ktv_del_sub(params->cfg,key);
+	cw_cfg_set(params->cfg,key,"false");
+
 	cw_dbg(DBG_INFO,"Del WLAN rid=%d, id=%d",wlan_id);
-	return 0;*/
+	return 0;
 }
 
 
@@ -769,15 +817,6 @@ static int cisoc_add_wlan_mkkey(const char *pkey, uint8_t*data, int len, char *d
 */
 
 
-static int cisco_add_wlan_mkkey70(const char *pkey, uint8_t*data, int len, char *dst)
-{
-        int wlan_id,radio_id;
-        radio_id = cw_get_byte(data);
-        wlan_id = cw_get_byte(data+4);
-        sprintf(dst,"radio.%d/wlan.%d",radio_id,wlan_id);
-        return 1;
-}
-
 static int mkkey_sig_payload(const char *pkey, uint8_t*data, int len, char *dst)
 {
         int id;
@@ -799,13 +838,28 @@ static int cisco_patch_add_wlan70(uint8_t * data, void * st)
 
 */
 
-static cw_ValStruct_t cisco_add_lwwlan[]={
+static cw_ValStruct_t cisco_add_lwwlan73[]={
 	{CW_TYPE_BSTR16, "misc", 8, 2},
 	{CW_TYPE_STR, "ssid",-1,10},
 	{CW_TYPE_WORD, "misc2", 2, 48 },
 	{NULL,NULL,0,0}
 };
 
+static int cisoc_add_lwwlan_mkkey73(const char *pkey, uint8_t*data, int len, char *dst)
+{
+	int wlan_id,radio_id;
+	sprintf(dst,"update-wlan");
+	return 0;
+	stop();	
+	radio_id = cw_get_byte(data);
+	wlan_id = cw_get_byte(data+1);
+	sprintf(dst,"radio.%d/wlan.%d/add-lw-wlan",radio_id,wlan_id);
+	return 1;
+}
+
+
+
+
 static cw_ValValRange_t oper_val_state[]={
 	{1,1,"disabled"},
 	{2,2,"enabled"},
@@ -835,16 +889,6 @@ static cw_ValStruct_t cisco_capwap_timers[] = {
 
 
 
-static int cisoc_add_lwwlan_mkkey(const char *pkey, uint8_t*data, int len, char *dst)
-{
-	int wlan_id,radio_id;
-	stop();	
-	radio_id = cw_get_byte(data);
-	wlan_id = cw_get_byte(data+1);
-	sprintf(dst,"radio.%d/wlan.%d/add-lw-wlan",radio_id,wlan_id);
-	return 1;
-}
-
 static int cisco_patch_add_lwwlan(uint8_t * data, void * st)
 {
 	stop();
@@ -923,6 +967,20 @@ static int cisco_data(struct cw_ElemHandler *eh,
 */
 
 static struct cw_ElemHandler handlers70[] = {
+	{ 
+		"WTP Frame Tunnel Mode (Draft 7)",		/* name */
+		CAPWAP_ELEM_WTP_FRAME_TUNNEL_MODE,	/* Element ID */
+		0,0,					/* Vendor / Proto */
+		1,1,					/* min/max length */
+		CW_TYPE_BITS,				/* type */
+		"capwap/wtp-frame-tunnel-mode",		/* Key */
+		cw_in_generic,				/* get */
+		cw_out_generic,				/* put */
+		NULL,
+		NULL,
+		frame_tunnel_bits_draft7
+	}
+	,
 	
 	{ 
 		"AC Name - (zero-length allowed)",	/* name */
@@ -1374,11 +1432,15 @@ static struct cw_ElemHandler handlers70[] = {
 		"AP Regulatory Domain",			/* name */
 		CISCO_ELEM_AP_REGULATORY_DOMAIN,	/* Element ID */
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
-		4,5,					/* min/max length */
+		4,4,					/* min/max length */
-		cisco_ap_regulatory_domain4,		/* type */
+		CW_TYPE_STRUCT,				/* type */
 		"cisco/ap-regulatory-domain",		/* Key */
-		cisco_in_ap_regulatory_domain,		/* get */
+		cw_in_generic,				/* get */
-		cisco_out_ap_regulatory_domain		/* put */
+		cisco_out_ap_regulatory_domain,		/* put */
+		mkkey_domain70,
+		NULL,
+		cisco_ap_regulatory_domain70
+
 	},
 	
 	{ 
@@ -1793,6 +1855,19 @@ static struct cw_ElemHandler handlers70[] = {
 		cisco_phy_ht_control_stru
 	},
 
+	{ 
+		"Cisco LWAP Elem 15",			/* name */
+
+		CISCO_LWELEM_15,				/* Element ID */
+		CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP,	/* Vendor / Proto */
+		
+		1,1024,					/* min/max length */
+		CW_TYPE_BSTR16,				/* type */
+		"cisco/lwelem15",			/* Key */
+		cw_in_radio_generic,				/* get */
+		cw_out_radio_generic				/* put */
+	},
+
 
 
 	{ 
@@ -1804,8 +1879,21 @@ static struct cw_ElemHandler handlers70[] = {
 		1,1024,					/* min/max length */
 		CW_TYPE_BSTR16,				/* type */
 		"cisco/lwelem33",			/* Key */
-		cw_in_radio_generic,			/* get */
+		cw_in_generic,				/* get */
-		cw_out_radio_generic			/* put */
+		cw_out_generic				/* put */
+	},
+
+	{ 
+		"Cisco LWAPP Elem 37 (Diagnostic Channel?)",			/* name */
+
+		CISCO_LWELEM_37,				/* Element ID */
+		CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP,	/* Vendor / Proto */
+		
+		1,1024,					/* min/max length */
+		CW_TYPE_BSTR16,				/* type */
+		"cisco/lwelem37",			/* Key */
+		cw_in_generic,				/* get */
+		cw_out_generic				/* put */
 	},
 
 	{ 
@@ -2101,21 +2189,6 @@ static struct cw_ElemHandler handlers70[] = {
 	}
 	,
 	
-	{ 
-		"Add Cisco WLAN (LWAPP)",		/* name */
-		CISCO_LWELEM_ADD_WLAN,			/* Element ID */
-		CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP,	/* Vendor / Proto */
-		7,1117,					/* min/max length */
-		CW_TYPE_STRUCT,				/* type */
-		"radio/wlan/add-lw-wlan",		/* Key */
-		cw_in_generic,				/* get */
-		cw_out_traverse,			/* put */
-		cisoc_add_lwwlan_mkkey,
-		cisco_patch_add_lwwlan,
-		cisco_add_lwwlan,
-	}
-	,
-
 
 	{ 
 		"SSC Hash Validation",			/* name */
@@ -2148,14 +2221,26 @@ static struct cw_ElemHandler handlers70[] = {
 		CISCO_LWELEM_DELETE_WLAN,		/* Element ID */
 		CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP,	/* Vendor / Proto */
 		4,4,					/* min/max length */
-		NULL,					/* type */
+		CW_TYPE_BSTR16,				/* type */
 		"cisco-del-wlan",			/* Key */
-		cisco_in_lw_del_wlan,			/* get */
+		cw_in_generic,				/* get */
-		NULL,					/* put */
+		cw_out_generic,				/* put */
 		NULL
 	}
 	,
 	
+	{ 
+		"Cisco Delete WLAN ",			/* name */
+		CISCO_ELEM_DELETE_WLAN,			/* Element ID */
+		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
+		3,3,					/* min/max length */
+		NULL,					/* type */
+		"cisco-del-wlan",			/* Key */
+		cisco_in_del_wlan,			/* get */
+		NULL,					/* put */
+		NULL
+	}
+	,
 		
 	{ 
 		"Radio Operational State (Draft 7)",	/* name */
@@ -2341,6 +2426,8 @@ static struct cw_ElemDef discovery_request_elements[] ={
 	 * requests and no WTP Board Data element, so we make them 
 	 * non-mandatory here */
 	{0,0,			CAPWAP80211_ELEM_WTP_RADIO_INFORMATION,	0, 0},
+
+
 	{0,0,			CAPWAP_ELEM_WTP_BOARD_DATA,		0, 0},
 
 	/* Instead of WTP Board Data we get Board Data Options from 
@@ -2351,7 +2438,6 @@ static struct cw_ElemDef discovery_request_elements[] ={
 	
 };
 
-/*static uint16_t discovery_response_states[] = {CAPWAP_STATE_DISCOVERY,0};*/
 static struct cw_ElemDef discovery_response_elements[] ={
 	{0,CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_TIMESYNC,			1, 0},
 	{0,CW_VENDOR_ID_CISCO,	CISCO_ELEM_MWAR_TYPE,			0, 0},
@@ -2386,6 +2472,9 @@ static struct cw_ElemDef join_response_elements[] ={
 
 	{0,0,			CAPWAP_ELEM_ECN_SUPPORT,	0, CW_DELETE},
 
+	{0,0,			CAPWAP_ELEM_WTP_IPV4_IP_ADDRESS,	0, 0},
+	{0,0,			CAPWAP_ELEM_WTP_IPV6_IP_ADDRESS,	0, 0},
+
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_PATH_MTU,	1, 0},
 	{0,0,0,00}
 	
@@ -2400,9 +2489,11 @@ static cw_State_t configuration_status_request_states[] = {
 	{0,0}
 };
 
-static struct cw_ElemDef configuration_status_request_elements[] ={
+static struct cw_ElemDef configuration_status_request_elements70[] ={
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SPAM_VENDOR_SPECIFIC,0, CW_IGNORE},
 
+
+
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_15,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SUPPORTED_RATES,				0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_19,				0, 0},	
@@ -2427,7 +2518,9 @@ static struct cw_ElemDef configuration_status_request_elements[] ={
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_PHY_HT_CAP,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_28,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_PHY_HT_CONTROL,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_15,			0, 0},	/* 15 */
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_33,			0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_37,			0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_48,			0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_55,			0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_105,			0, 0},	
@@ -2437,6 +2530,7 @@ static struct cw_ElemDef configuration_status_request_elements[] ={
 
 
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_UPTIME,			0, 0},
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_QOS,			0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_LED_STATE_CONFIG,		0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_LOG_FACILITY,		0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_MULTI_DOMAIN_CAPABILITY,	0, 0},
@@ -2460,7 +2554,6 @@ static struct cw_ElemDef configuration_status_request_elements[] ={
 
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AC_NAME_WITH_INDEX,		0, CW_IGNORE},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_CORE_DUMP,		0, 0},
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_VENUE_SETTINGS,		0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_MAC_OPERATION,		0, 0},
 
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_TX_POWER,			0, 0},	
@@ -2487,7 +2580,6 @@ static struct cw_ElemDef configuration_status_request_elements[] ={
 	
 };
 
-/*static uint16_t configuration_status_response_states[] = {CAPWAP_STATE_JOIN,0};*/
 static struct cw_ElemDef configuration_status_response_elements[] ={
 
 
@@ -2516,7 +2608,9 @@ static struct cw_ElemDef configuration_status_response_elements[] ={
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_PHY_HT_CAP,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_28,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_PHY_HT_CONTROL,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_15,			0, 0},	/* 15 */
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_33,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_37,			0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_48,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_55,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_105,	0, 0},	
@@ -2545,9 +2639,8 @@ static struct cw_ElemDef configuration_status_response_elements[] ={
 
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SPAM_DOMAIN_SECRET,		0, 0},	
 
-	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_SSC_HASH_VALIDATION,	0, 0},
-
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_MWAR_HASH_VALUE,		0, 0},
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_MWAR_HASH_VALUE,	1, 0},
 
 	{0,0,0,0}
 };
@@ -2555,15 +2648,20 @@ static struct cw_ElemDef configuration_status_response_elements[] ={
 
 static struct cw_ElemDef configuration_update_request_elements[] ={
 
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SPAM_VENDOR_SPECIFIC,			0, CW_IGNORE},
+
+	{0, 		 CW_VENDOR_ID_CISCO,	CISCO_ELEM_DELETE_WLAN,			0, 0},
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_DELETE_WLAN,		0, 0},
+
+
 	{0, 0,	CAPWAP_ELEM_RADIO_ADMINISTRATIVE_STATE,					0, 0},
 	{0, 0,	CAPWAP_ELEM_RADIO_OPERATIONAL_STATE,					0, 0},
 
-	{0,CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_GROUP_NAME,	0, 0},
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_GROUP_NAME,				0, 0},
 
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_BCAST_SSID_MODE,				0, 0},	
 
 
-	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SPAM_VENDOR_SPECIFIC,0, CW_IGNORE},
 
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_15,						0, 0},	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SUPPORTED_RATES,				0, 0},	
@@ -2588,7 +2686,9 @@ static struct cw_ElemDef configuration_update_request_elements[] ={
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_PHY_HT_CAP,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_28,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_PHY_HT_CONTROL,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_15,			0, 0},	/* 15 */
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_33,	0, 0},	
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_37,			0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_48,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_55,	0, 0},	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_105,	0, 0},	
@@ -2603,6 +2703,7 @@ static struct cw_ElemDef configuration_update_request_elements[] ={
 	
 	
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_UPTIME,			0, 0},
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_QOS,			0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_LED_STATE_CONFIG,		0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_LOG_FACILITY,		0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_MULTI_DOMAIN_CAPABILITY,	0, 0},
@@ -2628,7 +2729,6 @@ static struct cw_ElemDef configuration_update_request_elements[] ={
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_CORE_DUMP,		0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_STATISTICS_TIMER,		0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AC_NAME_WITH_INDEX,		0, 0},
-//	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_VENUE_SETTINGS,		0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_80211_ASSOC_LIMIT,		0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SIG_TOGGLE,			0, 0},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SIG_PAYLOAD,			0, 0},
@@ -2656,8 +2756,6 @@ static struct cw_ElemDef configuration_update_request_elements[] ={
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_SSC_HASH,			0, 0},
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_DISCOVERY_PROTOCOL,	0, 0},
 
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_ADD_WLAN,			0, 0},
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_DELETE_WLAN,		0, 0},
 	
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_TCP_ADJUST_MSS,		0, 0},
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_ROUGE_DETECTION,		0, 0},
@@ -2667,13 +2765,11 @@ static struct cw_ElemDef configuration_update_request_elements[] ={
 	
 };
 
-/*static uint16_t wtp_event_request_states[] = {CAPWAP_STATE_JOIN,0};*/
 static struct cw_ElemDef wtp_event_request_elements[] ={
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_SPAM_VENDOR_SPECIFIC,0, 			CW_IGNORE},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_ADD_WLAN,					0, CW_IGNORE},
 	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_RRM_LOAD,					0, 0},	
 
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_ADD_WLAN,			0, 0},
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_HARDWARE_INFO,		0, 0},
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_RADIO_MODULE_INFO,		0, 0},
 	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_PHY_HT_CONTROL,		0, 0},	
@@ -2725,6 +2821,8 @@ static struct cw_ElemDef wtp_echo_response_elements[] ={
 };
 
 
+
+
 static struct cw_MsgDef messages70[] = {
 	{
 		NULL,				/* name */
@@ -2787,7 +2885,7 @@ static struct cw_MsgDef messages70[] = {
 		CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST,	/* type */
 		CW_ROLE_AC,
 		configuration_status_request_states,		/* states */
-		configuration_status_request_elements,
+		configuration_status_request_elements70,
 		NULL					/* postprocess */
 	},
 
@@ -2856,6 +2954,8 @@ static struct cw_MsgDef messages70[] = {
 
 };
 
+
+
 static struct cw_ElemHandler handlers73[] = {
 	{ 
 		"Rouge Detection (>=7.3)",				/* name */
@@ -2902,6 +3002,21 @@ static struct cw_ElemHandler handlers73[] = {
 		cisco_wtp_radio_config73,
 	}
 	,
+	{ 
+		"AP Quality of Service (>=v7.3)",		/* name */
+		CISCO_ELEM_AP_QOS,			/* Element ID */
+		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
+		67,67,					/* min/max length */
+		CW_TYPE_STRUCT,				/* type */
+		"cisco/ap-qos",				/* Key */
+		cw_in_radio_generic,		/* get */
+		cw_out_radio_generic, /* put */
+		NULL,
+		NULL,
+		cisco_ap_qos73,
+	},
+
+
 		
 	{ 
 		"AP Venue Settings",				/* name */
@@ -2918,14 +3033,80 @@ static struct cw_ElemHandler handlers73[] = {
 	}
 	,
 
+	{ 
+		"Add Cisco WLAN (LWAPP)",		/* name */
+		CISCO_LWELEM_ADD_WLAN,			/* Element ID */
+		CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP,	/* Vendor / Proto */
+		7,1117,					/* min/max length */
+		CW_TYPE_STRUCT,				/* type */
+		"radio/wlan/",				/* Key */
+		cw_in_generic,				/* get */
+		cw_out_traverse,			/* put */
+		cisoc_add_lwwlan_mkkey73,
+		cisco_patch_add_lwwlan,
+		cisco_add_lwwlan73,
+	}
+	,
+
+	{ 
+		"Add Cisco WLAN",			/* name */
+		CISCO_ELEM_ADD_WLAN,			/* Element ID */
+		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
+		7,1117,					/* min/max length */
+		CW_TYPE_STRUCT,				/* type */
+		"radio/wlan/",				/* Key */
+		cw_in_generic,				/* get */
+		cw_out_generic_walk,			/* put */
+		cisco_add_wlan_mkkey73,
+		NULL, //		cisco_patch_add_wlan70
+		cisco_add_wlan73
+	}
+	,
+		
 	{0,0,0,0,0,0,0,0}
 };
 
 
+static struct cw_ElemDef configuration_status_request_elements73[] ={
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_VENUE_SETTINGS,			0, 0},
+	{0,0,0,0,0}
+};
+
+static struct cw_ElemDef configuration_update_request_elements73[] ={
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_VENUE_SETTINGS,			0, 0},
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_ADD_WLAN,		0, 0},
+
+	{0,0,0,0,0}
+};
+
+
+
+static struct cw_MsgDef messages73[] = {
+	{
+		NULL,						/* name */
+		CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST,	/* type */
+		CW_ROLE_AC,
+		NULL, //configuration_status_request_states,		/* states * /
+		configuration_status_request_elements73,
+		NULL					/* postprocess */
+	},
+	{
+		NULL,						/* name */
+		CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST,	/* type */
+		CW_ROLE_WTP,
+		NULL,
+		configuration_update_request_elements73,
+		NULL					/* postprocess */
+	},
+
+
+	{0,0,0,0}
+};
+
 
 static struct cw_ElemHandler handlers75[] = {
 	{ 
-		"WTP Radio Configuration  (Version >= 7.5)",/* name */
+		"WTP Radio Configuration  (>=7.5)",/* name */
 		CISCO_ELEM_WTP_RADIO_CONFIGURATION,	/* Element ID */
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
 		28,28,					/* min/max length */
@@ -2939,7 +3120,7 @@ static struct cw_ElemHandler handlers75[] = {
 	}
 	,
 	{ 
-		"Mac Operation (Version >= 7.5)",	/* name */
+		"Mac Operation (Version >=7.5)",	/* name */
 		CISCO_ELEM_MAC_OPERATION,		/* Element ID */
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
 		17,17,					/* min/max length */
@@ -2951,6 +3132,20 @@ static struct cw_ElemHandler handlers75[] = {
 		NULL,
 		cisco_mac_operation75,
 	},
+	{ 
+	 
+		"AP Regulatory Domain (>=7.5)",		/* name */
+		CISCO_ELEM_AP_REGULATORY_DOMAIN,	/* Element ID */
+		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
+		5,5,					/* min/max length */
+		CW_TYPE_STRUCT,			/* type */
+		"cisco/ap-regulatory-domain",		/* Key */
+		cw_in_generic,				/* get */
+		cisco_out_ap_regulatory_domain,		/* put */
+		mkkey_domain75,
+		NULL,
+		cisco_ap_regulatory_domain75
+	},
 
 	{0,0,0,0,0,0,0,0}
 };
@@ -2958,13 +3153,43 @@ static struct cw_ElemHandler handlers75[] = {
 
 
 
-static struct cw_MsgDef messages73[] = {
+static struct cw_MsgDef messages75[] = {
 	{0,0,0,0}
 };
 
 
+static struct cw_ElemHandler handlers80[] = {
+	{0,0,0,0,0,0,0,0}
+};
+
+static struct cw_ElemDef configuration_status_request_elements80[] ={
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_19,				0, CW_DELETE}, /* RRM_NEIGHBOR_CTRL_PAYLOAD */	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_22,				0, CW_DELETE}, /* RRM_INTERFERENCE_CTRL_PAYLOAD*/	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_24,				0, CW_DELETE}, /* RRM_LOAD_CTRL_PAYLOAD*/
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_39,				0, CW_DELETE}, /* DECRYPT_ERR_REPORT_PERIOD*/
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_BCAST_SSID_MODE,		0, CW_DELETE}, /* 51 */	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_CAPWAP_TIMERS,		0, CW_DELETE}, /* 68 */	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_CLIENT_AUTO_HANDOFF,		0, CW_DELETE}, /* 72 */	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_81,				0, CW_DELETE}, /* 81 */	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_DOT11H,			0, CW_DELETE}, /* 132 */	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_145,				0, CW_DELETE}, /* AP_DTPC_PAYLOAD */	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_146,				0, CW_DELETE}, /* AP_CISCO_7920_VSIE_PAYLOAD */	
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_153,				0, CW_DELETE}, /* AP_TSM_CONFIG_PAYLOAD */
+	{0, CW_VENDOR_ID_CISCO,	CISCO_ELEM_156,				0, CW_DELETE}, /* AP_CAC_CONFIG_PAYLOAD */
+
+	{0,0,0,0,0}
+};
+
+static struct cw_MsgDef messages80[] = {
+	{
+		NULL,						/* name */
+		CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST,	/* type */
+		CW_ROLE_AC,
+		NULL,						/* states */
+		configuration_status_request_elements80,
+		NULL						/* postprocess */
+	},
 
-static struct cw_MsgDef messages75[] = {
 	{0,0,0,0}
 };
 
@@ -3014,9 +3239,11 @@ static void update_msgset(struct cw_MsgSet *msgset, bstr_t version)
 			cw_dbg(DBG_MOD, "CISCO - Loading messages for 0x.x%08X >= 0x07056600", rv);
 			cw_msgset_add(msgset,messages75, handlers75);
 		}
+		if (rv >= 0x08000000){
+			cw_dbg(DBG_MOD, "CISCO - Loading messages for 0x.x%08X >= 0x08000000", rv);
+			cw_msgset_add(msgset,messages80, handlers80);
+		}
 	}
-
-
 }
 
 
@@ -3135,6 +3362,7 @@ static struct cw_MsgSet * register_messages(struct cw_MsgSet *set, int mode)
 
 			set->write_header = write_header;
 		      	set->header_len = header_len;	
+			set->format_pkt_hdr = cw_format_pkt_hdr_7;
 			break;
 		}
 		case CW_MOD_MODE_BINDINGS:

src/wtp/Makefile

@@ -5,9 +5,9 @@ OBJDIR=./o
 LIBDIR		:= ../../lib
 LIBARCHDIR	:= $(LIBDIR)/$(KERNEL)/$(ARCH)
 
-CFLAGS+=-I../ -DUSE_OPENSSL -I../../include
+CFLAGS+=-I../ -DUSE_OPENSSL -I../../include -I/usr/include/libnl3
 LDFLAGS+=-L$(LIBARCHDIR) -L/usr/local/lib
-LIBS+=-lcw -lnettle -lssl -lcrypto -ldl -lpthread -lmavl
+LIBS+=-lcw -lnettle -lssl -lcrypto -ldl -lpthread -lmavl -lnl-3 -lnl-genl-3
 
 SOURCES=\
      	wtp_main.c\
@@ -15,6 +15,7 @@ SOURCES=\
 	join.c\
 	configure.c\
 	run.c\
-	changestate.c
+	changestate.c \
+	nlt.c
 
 include ../prog.mk

src/wtp/dot11.h

@@ -322,6 +322,9 @@ struct beacon_data{
 int dot11_get_beacon_data(struct apdata *ap,struct beacon_data *bd);
 
 
+#define cw_dot11_get_version(frame) ( (frame)[1] & 3)
+#define cw_dot11_get_type(frame) ( ( (frame)[1] & 0x0c) >> 2)
+#define cw_dot11_get_subtype(frame)  ( (frame)[1] >> 4)
 
 
 #endif

src/wtp/nlt.c

@@ -1,16 +1,17 @@
-#include "netlink/netlink.h"
+#include <netlink/netlink.h>
-#include "netlink/genl/genl.h"
+#include <netlink/genl/genl.h>
-#include "netlink/genl/ctrl.h"
+#include <netlink/genl/ctrl.h>
 #include <netlink/msg.h>
 
 #include "cw/log.h"
 #include "cw/dbg.h"
-#include "cw/avltree.h"
+
+#include <mavl.h>
 
 #include "nlt.h"
 
 
-/*
+
 
 static int error_handler(struct sockaddr_nl *nla, struct nlmsgerr *err, void *arg)
 {
@@ -32,21 +33,22 @@ static int wiphylist_cmp(const void * d1,const void *d2)
 }
 
 
-struct avltree * wiphylist_create()
+struct mavl * wiphylist_create()
 {
-	return avltree_create(wiphylist_cmp,0);
+	return mavl_create(wiphylist_cmp,0,sizeof(struct nlt_wiphyinfo));
 }
 
 
-struct nlt_wiphyinfo * wiphylist_get( struct avltree * l,int idx)
+struct nlt_wiphyinfo * wiphylist_get( struct mavl * l,int idx)
 {
 	//return avltree_get(l);
 }
 
 
-struct nlt_wiphyinfo * nlt_wiphylist_add(struct avltree * t, struct nlt_wiphyinfo * wi)
+struct nlt_wiphyinfo * nlt_wiphylist_add(struct mavl * t, struct nlt_wiphyinfo * wi)
 {
-	return avltree_add(t,wi);
+	int exists;
+	return mavl_insert(t,wi,exists);
 }
 
 
@@ -258,7 +260,7 @@ static int nlCallback(struct nl_msg *msg, void *arg)
 		       genlmsg_attrlen(ghdr, 0), NULL);
 
 	if (rc < 0) {
-		cw_dbg(DBG_DRV_ERR, "nla_parse failed: %d %d", rc, nl_geterror(rc));
+		cw_dbg(DBG_X, "nla_parse failed: %d %d", rc, nl_geterror(rc));
 		return NL_SKIP;
 	}
 
@@ -267,7 +269,7 @@ static int nlCallback(struct nl_msg *msg, void *arg)
 
 	switch (cmd) {
 		case NL80211_CMD_NEW_WIPHY:
-			add_wiphy_data(msgattribs, arg);
+			//add_wiphy_data(msgattribs, arg);
 			break;
 //              case NL80211_CMD_NEW_INTERFACE:
 //                      add_interface_data(msgattribs);
@@ -337,7 +339,6 @@ static int get_wiphy_info_cb(struct nl_msg * msg,void * arg)
 
 int nlt_get_wiphy_list(struct nl_sock *sk)
 {
-
 	struct nlt_wiphyinfo ** wi = malloc (sizeof(struct nlt_wiphyinfo *)*NLT_MAX_WIPHYINDEX);
 	if (wi==0)
 		return 0;
@@ -347,9 +348,9 @@ int nlt_get_wiphy_list(struct nl_sock *sk)
 	struct nl_msg * msg = nlt_nl_msg_new(sk,NL80211_CMD_GET_WIPHY,NLM_F_DUMP);
 	nl_send_auto(sk, msg);
 	struct nl_cb *nl_cb = get_nl_cb(get_wiphy_info_cb,wi);
-//	while(1){
+	while(1){
 		int nlr = nl_recvmsgs(sk, nl_cb);
-//	}
+	}
 
 
 	int i;
@@ -364,4 +365,15 @@ int nlt_get_wiphy_list(struct nl_sock *sk)
 }
 
 
-*/
+nlt_test()
+{
+	struct nl_sock *nl;
+	nl = nl_socket_alloc();
+	if (!nl) {
+		fprintf(stderr, "Failed to allocate netlink socket.\n");
+		return -ENOMEM;
+	}
+
+	nlt_get_wiphy_list(nl);
+
+}

src/wtp/wtp_main.c

@@ -3,7 +3,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
-\
+
 
 #include "cw/val.h"
 #include "cw/dbg.h"
@@ -88,6 +88,82 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
 struct bootcfg bootcfg;
 
 
+#include "cw/file.h"
+
+#include "cw/dot11.h"
+
+int test()
+{
+	int rc;
+	uint8_t  *f,*frame;
+	size_t len;
+	f=(uint8_t*)cw_load_file("wificap-002",&len);
+	cw_dbg(DBG_X, "Loaded %d bytes",len);
+	int l;
+
+	uint8_t rates[] = {
+		12,0x82,0x84,0x8b,0x96,0x0c,0x12,0x18,0x24,0x30,0x48,0x60,0x6c	
+	}; 
+
+//	static int got_radiotap = 0;
+//	struct libwifi_frame frame = {0};
+///	rc = libwifi_get_wifi_frame(&frame, (unsigned char*)(f+16+1), len-16-1, 0);
+
+// struct libwifi_frame_ctrl *frame_control = (struct libwifi_frame_ctrl *) (f+16);
+// printf("SO: %d\n",frame_control->type);
+
+  //  	if (rc != 0) {
+   //     	printf("[!] Error getting libwifi_frame: %d\n", rc);
+   // 	}
+
+//	cw_dbg(DBG_X,"Frame CTL:%d,%d",frame.frame_control.type, frame.frame_control.subtype);
+
+//	cw_dbg(DBG_X,"MY RESULT: Type %d, SubType %d",cw_dot11_get_type(f+16), cw_dot11_get_subtype(f+16));
+//	cw_dbg(DBG_X,"FRAME: %s",dot11_get_frame_name(f+16+1));
+	
+
+	cw_dbg(DBG_X,"%04x",dot11_get_word((uint8_t*)(f)+16));
+
+	char dstr[2048];
+
+	cw_format_dot11_hdr(dstr,f+16,len-16);
+
+	cw_dbg(DBG_X,"R:\n%s",dstr);
+
+	
+
+	cw_dbg_dot11_frame(f+16,len-16);
+
+	frame = f+16;
+
+	uint8_t  rframe[1000];
+
+
+        dot11_init_assoc_resp(rframe);
+	dot11_set_duration(rframe,100);
+
+        dot11_copy_mac(dot11_get_sa(frame),dot11_get_da(rframe));
+        dot11_copy_mac(dot11_get_bssid(frame),dot11_get_bssid(rframe));
+        dot11_copy_mac(dot11_get_da(frame),dot11_get_sa(rframe));
+	dot11_set_seq(rframe,0);
+	dot11_assoc_resp_set_cap(rframe,dot11_assoc_req_get_cap(frame));
+	dot11_assoc_resp_set_status_code(rframe,0);
+	dot11_assoc_resp_set_assoc_id(rframe,17);
+	l=24+6;
+
+
+	l+=dot11_put_supported_rates(rframe+l,rates);
+
+	cw_dbg_dot11_frame(rframe,l);
+
+
+
+	free(f);
+	return 0;
+}
+
+
+
 int main (int argc, char **argv)
 {
 	struct cw_Mod * mod;
@@ -102,6 +178,29 @@ int main (int argc, char **argv)
 	const char *bind_addr, *disc_addr;
 
 
+
+/*	
+
+{
+	struct cw_ValBit bits[] = {
+		{0,"ess"},
+		{1,"ibss"},
+		{2,"cf-pollable"},
+		{3,"cf-poll-request"},
+		{4,"privacy"},
+		{5,"short-preamble"},
+		{2,"pbcc"},
+		{3,"cf-poll-request"},
+		{2,NULL}	
+	};
+	uint16_t x;
+	cw_set_word(&x,1057);
+
+	CW_TYPE_BITS->read(global_cfg,"hello",(uint8_t*)(&x),2,bits);
+	exit(0);
+}
+*/
+
 	bootcfg.nmods=0;
 	
 	/* read command line args, results are in bootcfg */
@@ -113,6 +212,11 @@ int main (int argc, char **argv)
 		bootcfg.nmods=2;
 	}
 
+	test();
+	nlt_test();
+	stop();
+
+
 	/* 
 	 * set ths for production
 	 * cw_dbg_set_level(DBG_X,0); 
@@ -152,8 +256,6 @@ int main (int argc, char **argv)
 		cw_dbg(DBG_INFO,"Local startup '%s' loaded.",bootcfg.local_startup_file);
 	}
 
-	cw_cfg_dump(global_cfg);
-
 	/* Create a temp. cfg */
 	cfg = cw_cfg_create();
 	if (cfg==NULL)