actube compiles again

FossilOrigin-Name: b4d49cce87d73a9c8e5bff97bda7cde9586849cfce0b6261dfee1fb7b7097d0f

actube.workspace

@@ -4,8 +4,8 @@
   <Project Name="wtp" Path="wtp.project" Active="No"/>
   <Project Name="mod_cipwap" Path="mod_cipwap.project" Active="No"/>
   <Project Name="mod_capwap" Path="mod_capwap.project" Active="No"/>
-  <Project Name="mod_cisco" Path="mod_cisco.project" Active="No"/>
-  <Project Name="libcw" Path="libcw.project" Active="Yes"/>
+  <Project Name="mod_cisco" Path="mod_cisco.project" Active="Yes"/>
+  <Project Name="libcw" Path="libcw.project" Active="No"/>
   <Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="No"/>
   <Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/>
   <BuildMatrix>

src/ac/conf.c

@@ -190,10 +190,11 @@ static int init_vendor_id()
 	return 1;
 }
 
+/*
 static int init_version()
 {
 
-	/* Init hardware version */
+	// Init hardware version 
 	if (!conf_hardware_version) {
 		struct utsname u;
 		int rc = uname(&u);
@@ -210,31 +211,26 @@ static int init_version()
 	bstr_replace(&conf_hardware_version,
 		     bstr_create_from_cfgstr((char *) conf_hardware_version));
 
-	/* software version */
+	// software version 
 	if (!conf_software_version)
 		conf_software_version = (bstr_t) strdup(CONF_DEFAULT_SOFTWARE_VERSION);
 	bstr_replace(&conf_software_version,
 		     bstr_create_from_cfgstr((char *) conf_software_version));
 
 
-	/* Cisco hardware version */
+	// Cisco hardware version 
 	if (!conf_cisco_hardware_version)
 		conf_cisco_hardware_version =
 		    (bstr_t) strdup(CONF_DEFAULT_CISCO_HARDWARE_VERSION);
 	bstr_replace(&conf_cisco_hardware_version,
 		     bstr_create_from_cfgstr((char *) conf_cisco_hardware_version));
 
-	/* Cisco software version */
-/*
-	if (!conf_cisco_software_version)
-		conf_cisco_software_version=(bstr_t)strdup(CONF_DEFAULT_CISCO_SOFTWARE_VERSION);
-	bstr_replace(&conf_cisco_software_version,bstr_create_from_cfgstr((char*)conf_cisco_software_version));
-*/
 
 
 
 	return 1;
 }
+*/
 
 static int init_control_port()
 {
@@ -809,9 +805,9 @@ int read_config(const char *filename)
 	if (!init_acname())
 		return 0;
 
-	if (!init_version())
+/*	if (!init_version())
 		return 0;
-
+*/
 
 	if (!init_vendor_id())
 		return 0;

src/ac/dataman.c

@@ -5,6 +5,7 @@
 #include "cw/timer.h"
 #include "cw/cw.h"
 #include "cw/format.h"
+#include "cw/netconn.h"
 
 #include "cw/log.h"
 #include "cw/dbg.h"

src/ac/dataman.h

@@ -3,7 +3,7 @@
 
 #include <pthread.h>
 
-#include "cw/netconn.h"
+/*#include "cw/netconn.h"*/
 
 #include "wtpman.h"
 

src/cw/vendors.h

@@ -20,6 +20,10 @@
  * @file 
  * @brief Definition of vendor IDs
  */
+/** 
+ * @addtogroup CAPWAP 
+ * @{
+ */
  
 /**
  * @defgroup CAPWAPVendors  List of known CAPWAP vendors
@@ -37,5 +41,6 @@
 #define CW_VENDOR_ID_FORTINET	12356
 
 /** @} */
+/** @} CAPWAP */
 
 #endif