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

Moved initializion of controlport to the pre-init section.

Browse Source 
FossilOrigin-Name: fb78a475a2aa9580a844bae02a85d93202d7af06e356859cb3a4fe0e161efc7e
This commit is contained in:
7u83@mail.ru 2014-07-28 05:06:19 +00:00
parent 8d47274f77
commit 04ad7d8454
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ac/conf.c
View File

@ -182,9 +182,6 @@ static int init_version()
static int init_control_port() static int init_control_port()
{ {
if (conf_control_port != 0)
return 1;
char str[30]; char str[30];
sprintf(str,"%d",CONF_DEFAULT_CONTROL_PORT); sprintf(str,"%d",CONF_DEFAULT_CONTROL_PORT);
conf_control_port=(char*)cw_setstr((uint8_t**)&conf_control_port,(uint8_t*)str,strlen(str)); conf_control_port=(char*)cw_setstr((uint8_t**)&conf_control_port,(uint8_t*)str,strlen(str));
@ -441,6 +438,8 @@ static int conf_read_strings( cfg_t * cfg, char * name, char ***dst,int *len)
int read_config(const char * filename){ int read_config(const char * filename){
int i,n; int i,n;
if (!init_control_port())
return 0;
cfg_opt_t opts[] = { cfg_opt_t opts[] = {
CFG_STR_LIST("listen", "{}", CFGF_NONE), CFG_STR_LIST("listen", "{}", CFGF_NONE),
@ -521,8 +520,6 @@ int read_config(const char * filename){
return 0; return 0;
if (!init_control_port())
return 0;
init_listen_addrs(); init_listen_addrs();
init_mcast_groups(); init_mcast_groups();