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

Removed unused stuff

This commit is contained in:
7u83 2022-07-30 23:27:42 +02:00
parent b881698d8b
commit 1f572a2ac0
1 changed files with 4 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/ac/conf.c
View File

@ -197,48 +197,6 @@ static int init_vendor_id()
return 1; return 1;
} }
/*
static int init_version()
{
// Init hardware version
if (!conf_hardware_version) {
struct utsname u;
int rc = uname(&u);
if (rc < 0)
conf_hardware_version =
(bstr_t) strdup(CONF_DEFAULT_HARDWARE_VERSION);
else {
char str[265];
sprintf(str, "%s / %s %s", u.machine, u.sysname, u.release);
conf_hardware_version = (bstr_t) strdup(str);
}
}
bstr_replace(&conf_hardware_version,
bstr_create_from_cfgstr((char *) conf_hardware_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
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));
return 1;
}
*/
static int init_control_port() static int init_control_port()
{ {
char str[30]; char str[30];
@ -281,10 +239,8 @@ static int init_listen_addrs()
if (ifa->ifa_addr->sa_family == AF_INET && conf_ipv4) if (ifa->ifa_addr->sa_family == AF_INET && conf_ipv4)
ctr++; ctr++;
#ifdef WITH_IPV6
if (ifa->ifa_addr->sa_family == AF_INET6 && conf_ipv6) if (ifa->ifa_addr->sa_family == AF_INET6 && conf_ipv6)
ctr++; ctr++;
#endif
} }
conf_listen_addrs = malloc(sizeof(char *) * ctr); conf_listen_addrs = malloc(sizeof(char *) * ctr);
@ -537,14 +493,6 @@ static int conf_read_strings(cfg_t * cfg, char *name, char ***dst, int *len)
} }
/*
struct conf_dbg_level_names{
const char *name;
int level;
};
*/
static int conf_read_dbg_level(cfg_t * cfg) static int conf_read_dbg_level(cfg_t * cfg)
{ {
@ -571,6 +519,7 @@ char *conf_mods_dir = NULL;
* Read the module names from config file * Read the module names from config file
*/ */
static int conf_read_mods(cfg_t *cfg){ static int conf_read_mods(cfg_t *cfg){
int n, i; int n, i;
n = cfg_size(cfg,CFG_ENTRY_MODS); n = cfg_size(cfg,CFG_ENTRY_MODS);
@ -590,24 +539,6 @@ static int conf_read_mods(cfg_t *cfg){
return 1; return 1;
} }
/*
void conf_init_capwap_mode()
{
if (conf_capwap_mode_str == NULL)
return;
if (0 == strcmp(conf_capwap_mode_str, "cipwap")) {
conf_capwap_mode = CW_MODE_CIPWAP;
}
if (0 == strcmp(conf_capwap_mode_str, "capwap")) {
conf_capwap_mode = CW_MODE_CAPWAP;
}
}
*/
int conf_parse_listen_addr(const char *addrstr, char *saddr, char *port, int *proto) int conf_parse_listen_addr(const char *addrstr, char *saddr, char *port, int *proto)
{ {
@ -759,7 +690,7 @@ int read_config(const char *filename)
cfg_t *cfg; cfg_t *cfg;
conf_mods_dir=cw_strdup(""); conf_mods_dir=cw_strdup("");
if (!init_control_port()) if (!init_control_port())
return 0; return 0;
@ -800,7 +731,8 @@ int read_config(const char *filename)
perror(str); perror(str);
} }
} }
if (!conf_read_mods(cfg)){ if (!conf_read_mods(cfg)){
cfg_free(cfg); cfg_free(cfg);
return 0; return 0;