From 752e985c8673168be634f882660145e6822d8bc5 Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Thu, 31 Mar 2016 05:52:15 +0000 Subject: [PATCH] IP adress config. FossilOrigin-Name: 8b789ffc73b809ef9ad3a1422912b0369ca28edfc4f6dab4b3032890ace98f44 --- src/wtp/wtp_conf.c | 8 +++++++- src/wtp/wtp_conf.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/wtp/wtp_conf.c b/src/wtp/wtp_conf.c index 382e6c99..8c85c95d 100644 --- a/src/wtp/wtp_conf.c +++ b/src/wtp/wtp_conf.c @@ -27,6 +27,7 @@ #include "cw/vendors.h" char * conf_primary_if=0; +char * conf_ip=0; char * conf_wtpname=0; char * conf_dtls_psk=0; char * conf_sslkeyfilename=0; @@ -94,6 +95,7 @@ LONGSTRS conf_timer_cfgstrs[] = { int wtpconf_primary_if() { + if (!conf_primary_if ) { conf_primary_if = sock_get_primary_if(AF_INET6); if (!conf_primary_if) @@ -107,7 +109,10 @@ int wtpconf_primary_if() } if (!sock_getifhwaddr(conf_primary_if,conf_macaddress,&conf_macaddress_len)){ - cw_log(LOG_ERR,"Fatal: Unable to detect link layer address for %s.",conf_primary_if); + + + cw_log(LOG_ERR,"Fatal: Unable to detect link layer address for %s:",conf_primary_if, + strerror(errno)); return 0; }; @@ -223,6 +228,7 @@ int wtpconf_preinit() int wtpconf_init() { + if (!wtpconf_primary_if()){ cw_log(LOG_ERR,"Fatal: Error initialing primary interface."); goto errX; diff --git a/src/wtp/wtp_conf.h b/src/wtp/wtp_conf.h index 5bd93270..dbe55de2 100644 --- a/src/wtp/wtp_conf.h +++ b/src/wtp/wtp_conf.h @@ -35,6 +35,7 @@ extern bstr_t conf_board_revision; extern struct sockaddr_storage * conf_preffered_ac_sa; extern char * conf_primary_if; +extern char * conf_ip; extern char ** conf_ac_list;