planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

actube compiles again

Browse Source 
FossilOrigin-Name: b4d49cce87d73a9c8e5bff97bda7cde9586849cfce0b6261dfee1fb7b7097d0f
This commit is contained in:
7u83@mail.ru 2018-03-25 17:13:58 +00:00
parent b57056b094
commit 11ee224d78
7 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actube.workspace
View File

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

18
src/ac/conf.c
View File

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

1
src/ac/dataman.c
View File

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

2
src/ac/dataman.h
View File

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

0
src/cw/unused/netconn.c → src/cw/netconn.c
View File

0
src/cw/unused/netconn.h → src/cw/netconn.h
View File

7
src/cw/vendors.h
View File

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