VM

FossilOrigin-Name: 4bbb8402b5110003c6d19908b6fa9b4a7a6b5903ba1fa691eb93a49aa0f089f4

src/ac/Makefile

@@ -11,7 +11,7 @@ ifndef ARCH
 endif
 
 LDFLAGS+=-g -D_REENTRANT -L/usr/local/lib -L../capwap/$(ARCH)
-CFLAGS += -Wall -g -O0 -D_REENTRANT -DIPV6 -I/usr/local/include -I../capwap  
+CFLAGS += -Wall -g -O0 -D_REENTRANT -DIPV6 -I/usr/local/include -I../
 
 
 LIBS+=-lcapwap

src/ac/ac_global.c

@@ -3,11 +3,11 @@
 
 #include "ac.h"
 #include "conf.h"
-#include "capwap.h"
-#include "capwap_items.h"
-#include "aciplist.h"
+#include "capwap/capwap.h"
+#include "capwap/capwap_items.h"
+#include "capwap/aciplist.h"
 #include "socklist.h"
-#include "sock.h"
+#include "capwap/sock.h"
 
 struct cw_ac_status ac_status;
 
@@ -93,11 +93,14 @@ int ac_global_init()
 	ac_status.dtls_policy = CW_FLAG_DTLS_POLICY_C | CW_FLAG_DTLS_POLICY_D;
 
 
-	cw_itemstore_set_version(ac_config, CW_ITEM_AC_HARDWARE_VERSION, 0,
+	cw_itemstore_set_vendorstr(ac_config, CW_ITEM_AC_HARDWARE_VERSION, 0,
 				 bstr_data(conf_hardware_version), bstr_len(conf_hardware_version));
-	cw_itemstore_set_version(ac_config, CW_ITEM_AC_SOFTWARE_VERSION, 0,
+	cw_itemstore_set_vendorstr(ac_config, CW_ITEM_AC_SOFTWARE_VERSION, 0,
 				 bstr_data(conf_software_version), bstr_len(conf_software_version));
 
+
+	cw_itemstore_set_str(ac_config,CW_ITEM_AC_IMAGE_DIR,conf_image_dir);
+
 //	cw_itemstore_set_avltree(ac_config, CW_ITEM_AC_IP_LIST, aciplist);
 
 	

src/ac/ac_interface.c

@@ -4,15 +4,15 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include "sock.h"
+#include "capwap/sock.h"
 
 #include "socklist.h"
-#include "acinfo.h"
+#include "capwap/acinfo.h"
 #include "conf.h"
 
-#include "capwap.h"
-#include "capwap_80211.h"
-#include "aciplist.h"
+#include "capwap/capwap.h"
+#include "capwap/capwap_80211.h"
+#include "capwap/aciplist.h"
 
 
 

src/ac/ac_main.c

@@ -27,18 +27,19 @@
 
 #include "actube.h"
 #include "wtplist.h"
-#include "dtls.h"
-#include "cw_log.h"
+#include "capwap/dtls.h"
+#include "capwap/cw_log.h"
 #include "conf.h"
-#include "sock.h"
+#include "capwap/sock.h"
 
 #include "socklist.h"
 
 #include "db.h"
-#include "capwap_items.h"
-#include "capwap_cisco.h"
+#include "capwap/capwap_items.h"
+#include "capwap/capwap_cisco.h"
 
 #include "ac.h"
+#include "capwap/format.h"
 
 int ac_run();
 
@@ -50,7 +51,7 @@ void alive_thread(void *data)
 	}
 }
 
-#include "action.h"
+#include "capwap/action.h"
 
 
 /*
@@ -98,20 +99,13 @@ int readelem_cisco_rad_name(struct conn *conn,struct cw_action * a,uint8_t *data
 */
 
 
-/*
-int avlprint(void *priv, void *data)
-{
-	struct cw_str * d = (struct cw_str*) data;
-	printf("String: %d - %s\n",d->id,d->str);
-}
-*/
+#include "capwap/capwap_crypto.h"
+
+
 
 int main (int argc, const char * argv[]) 
 {
 
-	
-
-
 	cw_log_name="AC-Tube";
 
 	read_config("ac.conf");

src/ac/conf.c

@@ -21,13 +21,13 @@
 
 #include <confuse.h>
 
-#include "capwap.h"
-#include "sock.h"
+#include "capwap/capwap.h"
+#include "capwap/sock.h"
 
 #include "conf.h"
 
-#include "cw_log.h"
-#include "cw_util.h"
+#include "capwap/cw_log.h"
+#include "capwap/cw_util.h"
 
 uint8_t conf_macaddress[12];
 uint8_t conf_macaddress_len=0;
@@ -391,7 +391,7 @@ static char * conf_default_mcast_groups_ipv6[] = {
 #endif
 
 //#include "avltree"
-#include "stravltree.h"
+#include "capwap/stravltree.h"
 
 
 
@@ -568,6 +568,12 @@ int read_config(const char * filename){
 	if (!init_control_port())
 		return 0;
 
+
+
+
+
+
+
 	cfg_opt_t opts[] = {
 		CFG_STR_LIST("dbg", "{}", CFGF_NONE),
 		CFG_STR_LIST("listen", "{}", CFGF_NONE),

src/ac/conf.h

@@ -26,9 +26,9 @@
 #include <net/if.h>
 
 
-#include "capwap.h"
-#include "lwapp.h"
-#include "bstr.h"
+#include "capwap/capwap.h"
+#include "capwap/lwapp.h"
+#include "capwap/bstr.h"
 
 #ifndef CONF_DEFAULT_ACNAME
 	#define CONF_DEFAULT_ACNAME "AC"

src/ac/db.c

@@ -1,7 +1,7 @@
 
 #include <sqlite3.h>
 
-#include "cw_log.h"
+#include "capwap/cw_log.h"
 
 #include "conf.h"
 

src/ac/socklist.c

@@ -25,8 +25,8 @@
 #include <pthread.h>
 
 
-#include "cw_log.h"
-#include "sock.h"
+#include "capwap/cw_log.h"
+#include "capwap/sock.h"
 
 
 #include "socklist.h"

src/ac/wtplist.c

@@ -30,12 +30,12 @@
 #include <stdio.h>
 
 #include "wtplist.h"
-#include "conn.h"
-#include "sock.h"
+#include "capwap/conn.h"
+#include "capwap/sock.h"
 
 
 #include "conf.h"
-#include "cw_log.h"
+#include "capwap/cw_log.h"
 
 /*
 static struct wtpman ** wtplist = 0;

src/ac/wtpman.h

@@ -5,8 +5,8 @@
 #include <semaphore.h>
 #include <pthread.h>
 
-#include "capwap.h"
-#include "fragman.h"
+#include "capwap/capwap.h"
+#include "capwap/fragman.h"
 
 #define WTPMAN_QSIZE 1024