Compare commits

...

8 Commits

Author SHA1 Message Date
057a23d435 Unused project files 2022-07-31 22:08:52 +02:00
fb4a3a9d82 For Linux 2022-07-31 22:08:43 +02:00
495eda6abe Put ac_global into ac_main 2022-07-31 22:08:12 +02:00
906dd79c64 Better error handling 2022-07-31 21:42:48 +02:00
241e18a832 Removed ac_global 2022-07-31 21:40:47 +02:00
5c6779b80b Removed ac_global 2022-07-31 21:40:31 +02:00
284d15e58d Deleted acshell - not needed anymore 2022-07-31 21:26:49 +02:00
5da6c02b2d Removed libconfuse 2022-07-31 18:37:50 +02:00
11 changed files with 62 additions and 659 deletions

View File

@ -1,121 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Project Name="mod_capwap" InternalType="">
<VirtualDirectory Name="src">
<VirtualDirectory Name="mod">
<VirtualDirectory Name="capwap">
<File Name="src/mod/capwap/capwap_out_ac_ip_list.c"/>
<File Name="src/mod/capwap/mod_capwap_ac.c"/>
<File Name="src/mod/capwap/capwap_in_wtp_board_data.c"/>
<File Name="src/mod/capwap/capwap_actions_wtp.c"/>
<File Name="src/mod/capwap/mod_capwap_wtp.c"/>
<File Name="src/mod/capwap/capwap_out_ac_descriptor.c"/>
<File Name="src/mod/capwap/capwap_in_ac_ip_list.c"/>
<File Name="src/mod/capwap/mod_capwap.h"/>
<File Name="src/mod/capwap/capwap_in_wtp_descriptor.c"/>
<File Name="src/mod/capwap/capwap_in_session_id.c"/>
<File Name="src/mod/capwap/capwap_out_get_session_id.c"/>
<File Name="src/mod/capwap/capwap_out_get_idle_timeout.c"/>
<File Name="src/mod/capwap/capwap_actions_ac.c"/>
<File Name="src/mod/capwap/capwap_in_vendor_specific_payload.c"/>
<File Name="src/mod/capwap/capwap_in_mtu_discovery_padding.c"/>
<File Name="src/mod/capwap/capwap_out_wtp_board_data.c"/>
<File Name="src/mod/capwap/capwap_out_wtp_descriptor.c"/>
<File Name="src/mod/capwap/capwap_out_capwap_control_ip_address.c"/>
<File Name="src/mod/capwap/capwap_in_capwap_control_ip_address.c"/>
<File Name="src/mod/capwap/capwap_in_ac_descriptor.c"/>
<File Name="src/mod/capwap/capwap_out_capwap_local_ip_address.c"/>
</VirtualDirectory>
</VirtualDirectory>
</VirtualDirectory>
<Description/>
<Dependencies/>
<Settings Type="Dynamic Library">
<GlobalSettings>
<Compiler Options="" C_Options="" Assembler="">
<IncludePath Value="."/>
</Compiler>
<Linker Options="">
<LibraryPath Value="."/>
</Linker>
<ResourceCompiler Options=""/>
</GlobalSettings>
<Configuration Name="Debug" CompilerType="clang( tags/RELEASE_380/final )" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="-g" C_Options="-g" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Debug" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand>make clean &amp;&amp; make</RebuildCommand>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)/src/mod/capwap/</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
<Configuration Name="Release" CompilerType="clang( tags/RELEASE_380/final )" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="" C_Options="" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="-O2" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Release" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand/>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
</Settings>
<Dependencies Name="Debug"/>
<Dependencies Name="Release"/>
</CodeLite_Project>

View File

@ -1,105 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Project Name="mod_capwap80211" InternalType="">
<VirtualDirectory Name="src">
<VirtualDirectory Name="mod">
<VirtualDirectory Name="capwap80211">
<File Name="src/mod/capwap80211/mod_capwap80211.h"/>
<File Name="src/mod/capwap80211/capwap80211_out_wtp_radio_cfg.c"/>
<File Name="src/mod/capwap80211/mod_capwap80211.c"/>
<File Name="src/mod/capwap80211/capwap80211_messages.c"/>
</VirtualDirectory>
</VirtualDirectory>
</VirtualDirectory>
<Description/>
<Dependencies/>
<Settings Type="Dynamic Library">
<GlobalSettings>
<Compiler Options="" C_Options="" Assembler="">
<IncludePath Value="."/>
</Compiler>
<Linker Options="">
<LibraryPath Value="."/>
</Linker>
<ResourceCompiler Options=""/>
</GlobalSettings>
<Configuration Name="Debug" CompilerType="GCC" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="-g" C_Options="-g" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Debug" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand>make clean &amp;&amp; make
</RebuildCommand>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)/src/mod/capwap80211/</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
<Configuration Name="Release" CompilerType="GCC" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="" C_Options="" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="-O2" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Release" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand/>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
</Settings>
<Dependencies Name="Debug"/>
<Dependencies Name="Release"/>
</CodeLite_Project>

View File

@ -1,105 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Project Name="mod_cipwap" InternalType="">
<VirtualDirectory Name="src">
<VirtualDirectory Name="mod">
<VirtualDirectory Name="cipwap">
<File Name="src/mod/cipwap/cipwap_actions_ac.c"/>
<File Name="src/mod/cipwap/mod_cipwap_ac.c"/>
<File Name="src/mod/cipwap/mod_cipwap.h"/>
<File Name="src/mod/cipwap/mod_cipwap_wtp.c"/>
<File Name="src/mod/cipwap/cipwap_actions_wtp.c"/>
</VirtualDirectory>
</VirtualDirectory>
</VirtualDirectory>
<Description/>
<Dependencies/>
<Settings Type="Dynamic Library">
<GlobalSettings>
<Compiler Options="" C_Options="" Assembler="">
<IncludePath Value="."/>
</Compiler>
<Linker Options="">
<LibraryPath Value="."/>
</Linker>
<ResourceCompiler Options=""/>
</GlobalSettings>
<Configuration Name="Debug" CompilerType="clang( tags/RELEASE_380/final )" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="-g" C_Options="-g" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Debug" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand>make clean &amp;&amp; make</RebuildCommand>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)/src/mod/cipwap</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
<Configuration Name="Release" CompilerType="clang( tags/RELEASE_380/final )" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="" C_Options="" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="-O2" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Release" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand/>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
</Settings>
<Dependencies Name="Debug"/>
<Dependencies Name="Release"/>
</CodeLite_Project>

View File

@ -1,104 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Project Name="mod_fortinet" InternalType="">
<VirtualDirectory Name="src">
<VirtualDirectory Name="mod">
<VirtualDirectory Name="fortinet">
<File Name="src/mod/fortinet/mod_fortinet_ac.c"/>
<File Name="src/mod/fortinet/mod_fortinet_wtp.c"/>
<File Name="src/mod/fortinet/fortinet.h"/>
<File Name="src/mod/fortinet/fortinet_actions_ac.c"/>
<File Name="src/mod/fortinet/fortinet_actions_wtp.c"/>
<File Name="src/mod/fortinet/mod_fortinet.h"/>
</VirtualDirectory>
</VirtualDirectory>
</VirtualDirectory>
<Description/>
<Dependencies/>
<Settings Type="Dynamic Library">
<GlobalSettings>
<Compiler Options="" C_Options="" Assembler="">
<IncludePath Value="."/>
</Compiler>
<Linker Options="">
<LibraryPath Value="."/>
</Linker>
<ResourceCompiler Options=""/>
</GlobalSettings>
<Configuration Name="Debug" CompilerType="GCC" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="-g" C_Options="-g" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Debug" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand>make clean &amp;&amp; make</RebuildCommand>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)/src/mod/fortinet</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
<Configuration Name="Release" CompilerType="GCC" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="" C_Options="" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
</Compiler>
<Linker Options="-O2" Required="yes"/>
<ResourceCompiler Options="" Required="no"/>
<General OutputFile="" IntermediateDirectory="./Release" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
<DebuggerSearchPaths/>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
<PreBuild/>
<PostBuild/>
<CustomBuild Enabled="yes">
<RebuildCommand/>
<CleanCommand>make clean</CleanCommand>
<BuildCommand>make</BuildCommand>
<PreprocessFileCommand/>
<SingleFileCommand/>
<MakefileGenerationCommand/>
<ThirdPartyToolName>None</ThirdPartyToolName>
<WorkingDirectory>$(WorkspacePath)</WorkingDirectory>
</CustomBuild>
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild/>
</AdditionalRules>
<Completion EnableCpp11="no" EnableCpp14="no">
<ClangCmpFlagsC/>
<ClangCmpFlags/>
<ClangPP/>
<SearchPaths/>
</Completion>
</Configuration>
</Settings>
</CodeLite_Project>

View File

@ -7,7 +7,6 @@ OBJS = \
dataman.o \
ac_interface.o \
socklist.o \
ac_global.o \
discovery_cache.o\
shell.o\

View File

@ -242,4 +242,4 @@ ssl_cert="../../ssl/certs/ac-xcisco.pem"
mods = { cisco,capwap, capwap80211 }
#, capwap80211 }
mods_dir = ../../lib/FreeBSD/amd64/
mods_dir = ../../lib/Linux/x86_64/

View File

@ -1,119 +0,0 @@
#include <stdlib.h>
#include "ac.h"
#include "conf.h"
#include "cw/capwap.h"
/*#include "cw/aciplist.h"*/
#include "socklist.h"
#include "cw/sock.h"
#include "cw/dbg.h"
#include "wtpman.h"
#include "discovery_cache.h"
#include "cw/mavltypes.h"
mavl_t actube_global_cfg;
/*
cw_aciplist_t get_aciplist()
{
int i=0;
cw_aciplist_t aciplist = cw_aciplist_create();
if(!aciplist)
return 0;
for (i=0; i<socklist_len;i++){
if (socklist[i].type != SOCKLIST_UNICAST_SOCKET)
break;
struct sockaddr_storage sa;
unsigned int salen=sizeof(sa);
if ( getsockname(socklist[i].sockfd,(struct sockaddr*)&sa,&salen)<0)
continue;
cw_acip_t * acip;
acip = malloc(sizeof(cw_acip_t));
if (!acip)
continue;
sock_copyaddr(&acip->ip,(struct sockaddr*)&sa);
if (acip->ip.ss_family == AF_INET)
acip->index=11;
else
acip->index=3;
/ * // printf ("Adding IP %s\n",sock_addr2str(&acip->ip));
* /
cw_aciplist_add(aciplist,acip);
}
return aciplist;
}
*/
/*
void * get_iplist(void * arg)
{
return get_aciplist();
}
*/
void release_iplist(void *arg,void *data)
{
}
/*
int handle_echo_req(struct conn *conn, struct cw_action_in *a, uint8_t * data,
int len, struct sockaddr *from)
{
cw_dbg(DBG_X,"Handle Echo Request %p",conn->data);
// struct wtpman * wtpman = conn->data;
// wtpman_echo_req(wtpman);
return 0;
}
*/
/*static void setup_actions (struct mod_ac *c, struct mod_ac *b, struct cw_actiondef *actions)
{
cw_dbg(DBG_X,"Setup Actions! Yea");
cw_set_msg_end_callback(actions,CW_STATE_RUN,CW_MSG_ECHO_REQUEST,handle_echo_req);
}
*/
struct cw_DiscoveryCache * discovery_cache;
int ac_global_init()
{
/* initialize discovery cache */
discovery_cache = discovery_cache_create(100);
if (discovery_cache==NULL)
goto errX;
return 1;
errX:
return 0;
}

View File

@ -64,7 +64,7 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
int c;
opterr = 1;
bootcfg->cfgfilename = "config.ktv";
bootcfg->cfgfilename = "config.atv";
while ( (c = getopt (argc, argv, "vc:d:p:")) != -1) {
@ -103,7 +103,21 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
struct cw_DiscoveryCache * discovery_cache;
mavl_t actube_global_cfg;
int ac_global_init()
{
/* initialize discovery cache */
discovery_cache = discovery_cache_create(100);
if (discovery_cache==NULL)
goto errX;
return 1;
errX:
return 0;
}
@ -173,16 +187,6 @@ static void show_cfg (FILE *out, mavl_t ktv)
}
int main (int argc, char *argv[])
{
int rc = 0;
struct bootcfg bootcfg;
FILE * file;
mavl_t types_tree, global_cfg;
const cw_Type_t **ti;
/*
{
cw_Cfg_t * cfg;
@ -211,11 +215,39 @@ return 0;
*/
int main (int argc, char *argv[])
{
int rc = 0;
struct bootcfg bootcfg;
FILE * file;
mavl_t types_tree, acglobal_cfg;
const cw_Type_t **ti;
cw_Cfg_t * global_cfg = NULL;
/* parse arguments */
parse_args (argc, argv, &bootcfg);
global_cfg=cw_cfg_create();
if (!global_cfg){
fprintf(stderr,"Can't create global_cfg: %s\n",strerror(errno));
goto errX;
}
rc = cw_cfg_load(bootcfg.cfgfilename,global_cfg);
if (rc)
{
if (rc<0)
fprintf(stderr,"Can't load cfg '%s': %s\n",bootcfg.cfgfilename,strerror(errno));
goto errX;
};
/* open config file */
file = fopen(bootcfg.cfgfilename,"r");
file = fopen("config.ktv","r");
if (file == NULL){
cw_log(LOG_ERR,"Cant open config file '%s': %s",
bootcfg.cfgfilename, strerror(errno));
@ -229,20 +261,20 @@ return 0;
mavl_insert_ptr(types_tree,*ti);
}
global_cfg = cw_ktv_create();
if (global_cfg == NULL){
acglobal_cfg = cw_ktv_create();
if (acglobal_cfg == NULL){
cw_log(LOG_ERR,"Can't create local_cfg: %s",strerror(errno));
exit(EXIT_FAILURE);
}
cw_ktv_read_file(file,global_cfg,types_tree);
cw_ktv_read_file(file,acglobal_cfg,types_tree);
fclose(file);
actube_global_cfg = global_cfg;
actube_global_cfg = acglobal_cfg;
cw_dbg_ktv_dump(global_cfg,DBG_INFO,NULL,"CFG:",NULL);
cw_dbg_ktv_dump(acglobal_cfg,DBG_INFO,NULL,"CFG:",NULL);
cw_log_name = "AC-Tube";
@ -294,6 +326,10 @@ return 0;
cw_log (LOG_INFO, "Starting AC-Tube, Name=%s, ID=%s", conf_acname, conf_acid);
rc = ac_run();
errX:
if (global_cfg)
mavl_destroy(global_cfg);
/* XXX There is more cleanup to do */
wtplist_destroy();
socklist_destroy();

View File

@ -1,81 +0,0 @@
#!/usr/bin/php
<?php
$sqlfile="./ac.sqlite3";
if (!file_exists($sqlfile))
die ("Can't open $sqlfile\n");
class DB extends SQLite3
{
function __construct()
{
global $sqlfile;
$this->open($sqlfile);
}
}
$db = new DB();
function ls_acs()
{
global $db;
echo "List of ACs\n";
echo "===========\n";
$results = $db->query("SELECT
acid as id,
acname as name,
lastseen>datetime('now','-10 second') as active
FROM acs ORDER by active,id,name;"
);
while ($row = $results->fetchArray(SQLITE3_ASSOC)) {
$o = $row['active'] ? "yes" : "no";
echo "ID: $row[id], Name: $row[name] - Online: $o\n";
}
}
function ls_wtps()
{
global $db;
echo "List of WTPs\n";
echo "============\n";
$result = $db->query("SELECT
wtpid as wtpid,
wtps.acid as acid,
acs.acname as acname
FROM wtps
LEFT join acs USING(acid)
");
while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
$j = $row['acid'] ? "Joined to $row[acid]" : "Not joined";
echo "ID: $row[wtpid], $j\n";
}
}
function print_help()
{
echo "acshell <cmd>\n";
echo "\n";
echo "acshell lsacs - list acs\n";
echo "acshell lswtp - list wtps\n";
}
//ls_wtps();
//
//var_dump($argv);
if (count($argv)==1){
print_help();
exit(0);
}
if( $argv[1] == "lsacs" )
ls_acs();
if( $argv[1] == "lswtps" )
ls_wtps();

View File

@ -335,13 +335,15 @@ int cw_cfg_read_from_file(FILE * f, cw_Cfg_t * cfg)
p.f=f;
int rc;
int errs=0;
do {
rc = cw_cfg_read_line(f,&p,key,val);
if (rc==-1){
fprintf(stderr,"Error: %s",p.error);
fprintf(stderr,"Error: %s\n",p.error);
errs++;
}
@ -354,15 +356,17 @@ int cw_cfg_read_from_file(FILE * f, cw_Cfg_t * cfg)
}while(rc==0);
return 0;
return errs;
}
int cw_cfg_load(const char *filename,cw_Cfg_t * cfg)
{
int errs;
FILE *f = fopen(filename,"rb");
if (!f)
return errno;
cw_cfg_read_from_file(f,cfg);
return 0;
errs = cw_cfg_read_from_file(f,cfg);
fclose(f);
return errs;
}

View File

@ -1,4 +1,3 @@
#include <confuse.h>
#include "cw/cw.h"
#include "cw/mod.h"