From 65d42f32fe7c370c3c39e806c83dfbaf7b099b15 Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Fri, 25 Jul 2014 06:24:38 +0000 Subject: [PATCH] Added conf_lw_control_port FossilOrigin-Name: c4bd1afb57470062d566f024cfc72d1b8908e82376f5e954587bcbd954ac5579 --- src/ac/conf.c | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/src/ac/conf.c b/src/ac/conf.c index d1d9820b..6f98c219 100644 --- a/src/ac/conf.c +++ b/src/ac/conf.c @@ -88,7 +88,19 @@ int conf_ipv6=1; char * conf_control_port=0; -cfg_bool_t conf_ignore_wtp_source_port = cfg_false; +char * conf_lw_control_port=0; + + + + + + + + + + + + static int init_acname() { @@ -433,6 +445,10 @@ int read_config(const char * filename){ CFG_STR_LIST("bcast_addrs", "{}", CFGF_NONE), CFG_STR_LIST("ac_ips","{}",CFGF_NONE), CFG_SIMPLE_STR("control_port",&conf_control_port), +#ifdef WITH_LWAPP + CFG_SIMPLE_STR("lw_control_port",&conf_lw_control_port), +#endif + CFG_SIMPLE_INT("max_wtps",&conf_max_wtps), CFG_SIMPLE_INT("debug_level",&conf_debug_level), CFG_SIMPLE_INT("vendor_id",&conf_vendor_id), @@ -441,11 +457,9 @@ int read_config(const char * filename){ CFG_SIMPLE_STR("ssl_cert",&conf_sslcertfilename), CFG_SIMPLE_STR("ssl_key",&conf_sslkeyfilename), CFG_SIMPLE_STR("dtls_psk",&conf_dtls_psk), -// CFG_SIMPLE_BOOL("ignore_wtp_source_port",&conf_ignore_wtp_source_port), CFG_SIMPLE_BOOL("ipv4",&conf_ipv4), CFG_SIMPLE_BOOL("ipv6",&conf_ipv6), - CFG_SIMPLE_STR("db_file",conf_db_file), CFG_END() @@ -465,29 +479,6 @@ int read_config(const char * filename){ conf_read_strings(cfg,"bcast_addrs",&conf_bcast_addrs,&conf_bcast_addrs_len); -/* - n = cfg_size(cfg, "listen"); - if (! (conf_salist = malloc(sizeof (struct sockaddr_storage)*n)) ) - return 0; - - if (! (conf_listen_addrs=malloc(sizeof(char *)*n))) - return 0; - - memset(conf_listen_addrs,0,sizeof(char*)*n); - - conf_salist_len=n; - for (i=0; i