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

Fixed some uissues with detection of loacl ip address. 

FossilOrigin-Name: 6437630df2aef4adc7b8a58d374bf3fa175e04e2cf8685ce56d6ec5fee269803
This commit is contained in:
7u83@mail.ru 2016-03-18 22:32:26 +00:00
parent 4a91a10b34
commit 3dfb5203ce
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wtp/conf_uci.c
View File

@ -151,6 +151,11 @@ int read_config(const char * filename){
if (str) if (str)
conf_mtu_discovery = atoi(str); conf_mtu_discovery = atoi(str);
str = uci_lookup_option_string(ctx,section,"interface");
if (str)
conf_primary_if=strdup(str);
str = uci_lookup_option_string(ctx,section,"ssl_key"); str = uci_lookup_option_string(ctx,section,"ssl_key");
if (str) if (str)
conf_sslkeyfilename=strdup(str); conf_sslkeyfilename=strdup(str);

16
src/wtp/wtp_conf.c
View File

@ -94,14 +94,12 @@ LONGSTRS conf_timer_cfgstrs[] = {
int wtpconf_primary_if() int wtpconf_primary_if()
{ {
if (!conf_primary_if ) {
conf_primary_if = sock_get_primary_if(AF_INET6);
if (!conf_primary_if)
conf_primary_if = sock_get_primary_if(AF_INET);
}
#ifdef WITH_IPV6
conf_primary_if = sock_get_primary_if(AF_INET6);
if (!conf_primary_if)
conf_primary_if = sock_get_primary_if(AF_INET);
#else
conf_primary_if = get_primary_if(AF_INET);
#endif
if (!conf_primary_if){ if (!conf_primary_if){
cw_log(LOG_ERR,"Fatal: Unable to detect primary interface"); cw_log(LOG_ERR,"Fatal: Unable to detect primary interface");
@ -117,10 +115,7 @@ int wtpconf_primary_if()
conf_primary_if, conf_primary_if,
sock_hwaddr2str(conf_macaddress,conf_macaddress_len) sock_hwaddr2str(conf_macaddress,conf_macaddress_len)
); );
return 1; return 1;
} }
int wtpconf_name() int wtpconf_name()
@ -192,6 +187,7 @@ int wtpconf_ac_list()
} }
conf_ac_list_len=len; conf_ac_list_len=len;
#ifdef WITH_CW_LOG_DEBUG #ifdef WITH_CW_LOG_DEBUG
for (i=0; i<conf_ac_list_len; i++){ for (i=0; i<conf_ac_list_len; i++){
cw_dbg(DBG_INFO,"Using AC: %s",conf_ac_list[i]); cw_dbg(DBG_INFO,"Using AC: %s",conf_ac_list[i]);