Moved a lot of macros from capwap.h to cw.h

FossilOrigin-Name: 09114fbdffe3dd78d32f93da671f8f0cf9c40056a7b8f93114b12646f25db512

src/mod/capwap/capwap_actions_ac.c

@@ -17,7 +17,7 @@
 */
 
 
-#include "cw/capwap.h"
+#include "cw/cw.h"
 #include "cw/action.h"
 #include "cw/capwap_items.h"
 #include "cw/strheap.h"

src/mod/capwap/capwap_actions_wtp.c

@@ -1,4 +1,4 @@
-#include "cw/capwap.h"
+#include "cw/cw.h"
 #include "cw/action.h"
 #include "cw/capwap_items.h"
 
@@ -215,19 +215,18 @@ static cw_action_out_t actions_out[] = {
 		.elem_id  = CW_ELEM_WTP_BOARD_DATA,
 		.item_id = CW_ITEM_WTP_BOARD_DATA, 
 		.out = cw_out_wtp_board_data,
-		.get = cw_out_get_outgoing,
+	//	.get = cw_out_get_config,
 		.mand = 1
 	}
 	,
 
-
 	/* WTP Descriptor */
 	{
 		.msg_id = CW_MSG_DISCOVERY_REQUEST, 
 		.elem_id  = CW_ELEM_WTP_DESCRIPTOR,
 		.item_id = CW_ITEM_WTP_DESCRIPTOR, 
 		.out = capwap_out_wtp_descriptor,
-		//.get = cw_out_get_outgoing,
+		//.get = cw_out_get_config,
 		.mand = 1
 	}
 

src/mod/capwap/capwap_in_wtp_board_data.c

@@ -22,7 +22,7 @@
 
 
 
-#include "cw/capwap.h"
+#include "cw/cw.h"
 #include "cw/capwap_items.h"
 
 #include "cw/mbag.h"

src/mod/capwap/capwap_out_wtp_descriptor.c

@@ -31,6 +31,10 @@ int capwap_out_wtp_descriptor(struct conn *conn, struct cw_action_out *a, uint8_
 	// XXX Dummy WTP Descriptor Header
 	uint8_t *d = dst+4;
 
+
+int n =conn->radios->count;
+printf("radio count %d\n",n);
+
 	d+=cw_put_byte(d,conn->radios->count);	//max radios
 	d+=cw_put_byte(d,2);	//radios in use
 

src/mod/capwap80211/mod_capwap80211_ac.c

@@ -4,7 +4,7 @@
 #include "cw/dbg.h"
 
 #include "cw/action.h"
-#include "cw/capwap.h"
+#include "cw/cw.h"
 
 #include "mod_capwap80211.h"
 

src/mod/cisco/cisco_out_ac_descriptor.c

@@ -3,7 +3,7 @@
 
 #include "cw/mbag.h"
 #include "cw/capwap_items.h"
-#include "cw/capwap.h"
+#include "cw/cw.h"
 
 
 int cisco_out_ac_descriptor(struct conn *conn,struct cw_action_out * a,uint8_t *dst) 

src/mod/cisco/mod_cisco_ac.c

@@ -1,5 +1,5 @@
 
-#include "cw/capwap.h"
+#include "cw/cw.h"
 #include "cw/mod.h"
 #include "cw/log.h"
 #include "cw/dbg.h"