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

Mor work on dynamic loading of modules

Browse Source 
FossilOrigin-Name: b02170339426d0c9efc42d700e891a90f7ddb0961a67b679909a1c929e1501e1
This commit is contained in:
7u83@mail.ru
2018-02-26 08:04:53 +00:00
parent a71b86b125
commit 6316dd6576
7 changed files with 75 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/ac/conf.c
View File

@ -38,7 +38,7 @@ uint8_t conf_macaddress_len = 0;
long conf_strict_capwap = 1;
long conf_strict_headers = 0;
char *conf_capwap_mode_str = NULL;
//char *conf_capwap_mode_str = NULL;
int conf_capwap_mode = CW_MODE_CAPWAP;
@ -540,7 +540,7 @@ static int conf_read_dbg_level(cfg_t * cfg)
struct cw_Mod ** conf_mods; //[10];
char *conf_mods_dir = NULL;
static int init_mods()
@ -571,20 +571,29 @@ static int conf_read_mods(cfg_t *cfg){
n = cfg_size(cfg,CFG_ENTRY_MODS);
conf_mods = malloc(sizeof(struct cw_Mod *)*(n+1));
cw_dbg(DBG_INFO,"Mods directory: %s",conf_mods_dir);
for (i=0; i < n; i++){
char *modname = cfg_getnstr(cfg, CFG_ENTRY_MODS, i);
conf_mods[i] = NULL; //modload_ac(modname);
struct cw_Mod * mod = cw_mod_add_dynamic(conf_mods_dir,modname);
if (!mod)
return 0;
/* conf_mods[i] = NULL; //modload_ac(modname);
if (!conf_mods[i]){
cw_log(LOG_ERR,"Can't load mod: %s",modname);
return 0;
}
*/
}
conf_mods[i]=NULL;
return 1;
}
/*
void conf_init_capwap_mode()
{
if (conf_capwap_mode_str == NULL)
@ -600,7 +609,7 @@ void conf_init_capwap_mode()
}
*/
int conf_parse_listen_addr(const char *addrstr, char *saddr, char *port, int *proto)
@ -700,6 +709,8 @@ int read_config(const char *filename)
cfg_opt_t opts[] = {
CFG_STR_LIST("mods", "{}", CFGF_NONE),
CFG_SIMPLE_STR("mods_dir", &conf_mods_dir),
CFG_STR_LIST("dbg", "{}", CFGF_NONE),
CFG_STR_LIST("listen", "{}", CFGF_NONE),
CFG_STR_LIST("mcast_groups", "{}", CFGF_NONE),
@ -710,7 +721,7 @@ int read_config(const char *filename)
CFG_SIMPLE_BOOL("strict_capwap", &conf_strict_capwap),
CFG_SIMPLE_BOOL("strict_headers", &conf_strict_headers),
CFG_SIMPLE_BOOL("use_loopback", &conf_use_loopback),
CFG_SIMPLE_STR("capwap_mode", &conf_capwap_mode_str),
// CFG_SIMPLE_STR("capwap_mode", &conf_capwap_mode_str),
#ifdef WITH_LWAPP
@ -817,7 +828,7 @@ int read_config(const char *filename)
init_mods();
conf_init_capwap_mode();
// conf_init_capwap_mode();
init_listen_addrs();