Deleted warnings in netsuku.c

Fixing server_opt default value assignement and free. Now we allocate
server_opt field and we strcpy default values in it.

src/conf.h

@@ -36,6 +36,23 @@
  	if(_val)							\
  		*(str)=xstrndup(_val, (maxbytes));			\
 })
+#define CONF_SET_STRN_OPT(opt, cnf_name, n) \
+{ \
+	char *v; \
+	v = CONF_GET_VALUE((cnf_name)); \
+	if(v) \
+	{ \
+		if(strlen(v) > n - 1) v[n] = '\0'; \
+		*opt = realloc(*opt, strlen(v)); \
+		if(!opt) \
+		{ \
+			perror("Unable to allocate memory for option"); \
+			exit(-1); \
+		} \
+		strcpy(*opt, v); \
+	}\
+}
+
 
 
 /* 

src/netsukuku.c

@@ -194,20 +194,20 @@ fill_default_options(void)
 
 	server_opt.family = AF_INET;
 
-	server_opt.config_file = NTK_CONFIG_FILE;
-	server_opt.pid_file = NTK_PID_FILE;
+	set_option_literal(&(server_opt.config_file), NTK_CONFIG_FILE);
+	set_option_literal(&(server_opt.pid_file), NTK_PID_FILE);
 
-	server_opt.int_map_file = INT_MAP_FILE;
-	server_opt.ext_map_file = EXT_MAP_FILE;
-	server_opt.bnode_map_file = BNODE_MAP_FILE;
+	set_option_literal(&(server_opt.int_map_file), INT_MAP_FILE);
+	set_option_literal(&(server_opt.ext_map_file), EXT_MAP_FILE);
+	set_option_literal(&(server_opt.bnode_map_file), BNODE_MAP_FILE);
 
-	server_opt.andna_hnames_file = ANDNA_HNAMES_FILE;
-	server_opt.snsd_nodes_file = SNSD_NODES_FILE;
-	server_opt.andna_cache_file = ANDNA_CACHE_FILE;
-	server_opt.lclkey_file = LCLKEY_FILE;
-	server_opt.lcl_file = LCL_FILE;
-	server_opt.rhc_file = RHC_FILE;
-	server_opt.counter_c_file = COUNTER_C_FILE;
+	set_option_literal(&(server_opt.andna_hnames_file), ANDNA_HNAMES_FILE);
+	set_option_literal(&(server_opt.snsd_nodes_file), SNSD_NODES_FILE);
+	set_option_literal(&(server_opt.andna_cache_file), ANDNA_CACHE_FILE);
+	set_option_literal(&(server_opt.lclkey_file), LCLKEY_FILE);
+	set_option_literal(&(server_opt.lcl_file), LCL_FILE);
+	set_option_literal(&(server_opt.rhc_file), RHC_FILE);
+	set_option_literal(&(server_opt.counter_c_file), COUNTER_C_FILE);
 
 	server_opt.daemon = 1;
 	server_opt.dbg_lvl = 0;
@@ -219,8 +219,8 @@ fill_default_options(void)
 
 	server_opt.use_shared_inet = 1;
 
-	server_opt.ip_masq_script = IPMASQ_SCRIPT_FILE;
-	server_opt.tc_shaper_script = TCSHAPER_SCRIPT_FILE;
+	set_option_literal(&(server_opt.ip_masq_script), IPMASQ_SCRIPT_FILE);
+	set_option_literal(&(server_opt.tc_shaper_script), TCSHAPER_SCRIPT_FILE);
 
 	server_opt.max_connections = MAX_CONNECTIONS;
 	server_opt.max_accepts_per_host = MAX_ACCEPTS;
@@ -236,31 +236,31 @@ void
 fill_loaded_cfg_options(void)
 {
 	char *value;
-
-	CONF_GET_STRN_VALUE(CONF_NTK_INT_MAP_FILE, &server_opt.int_map_file,
+	
+	CONF_SET_STRN_OPT(&(server_opt.int_map_file), CONF_NTK_INT_MAP_FILE,
+						NAME_MAX - 1);
+	CONF_SET_STRN_OPT(&(server_opt.bnode_map_file), CONF_NTK_BNODE_MAP_FILE,
 						NAME_MAX - 1);
-	CONF_GET_STRN_VALUE(CONF_NTK_BNODE_MAP_FILE,
-						&server_opt.bnode_map_file, NAME_MAX - 1);
-	CONF_GET_STRN_VALUE(CONF_NTK_EXT_MAP_FILE, &server_opt.ext_map_file,
+	CONF_SET_STRN_OPT(&(server_opt.ext_map_file), CONF_NTK_EXT_MAP_FILE,
 						NAME_MAX - 1);
 
-	CONF_GET_STRN_VALUE(CONF_ANDNA_HNAMES_FILE,
-						&server_opt.andna_hnames_file, NAME_MAX - 1);
-	CONF_GET_STRN_VALUE(CONF_SNSD_NODES_FILE, &server_opt.snsd_nodes_file,
+	CONF_SET_STRN_OPT(&(server_opt.andna_hnames_file), CONF_ANDNA_HNAMES_FILE,
+						NAME_MAX - 1);
+	CONF_SET_STRN_OPT(&(server_opt.snsd_nodes_file), CONF_SNSD_NODES_FILE,
 						NAME_MAX - 1);
 
-	CONF_GET_STRN_VALUE(CONF_ANDNA_CACHE_FILE,
-						&server_opt.andna_cache_file, NAME_MAX - 1);
-	CONF_GET_STRN_VALUE(CONF_ANDNA_LCLKEY_FILE, &server_opt.lclkey_file,
+	CONF_SET_STRN_OPT(&(server_opt.andna_cache_file), CONF_ANDNA_CACHE_FILE,
+						NAME_MAX - 1);
+	CONF_SET_STRN_OPT(&(server_opt.lclkey_file), CONF_ANDNA_LCLKEY_FILE,
+						NAME_MAX - 1);
+	CONF_SET_STRN_OPT(&(server_opt.lcl_file), CONF_ANDNA_LCL_FILE,
 						NAME_MAX - 1);
-	CONF_GET_STRN_VALUE(CONF_ANDNA_LCL_FILE, &server_opt.lcl_file,
+	CONF_SET_STRN_OPT(&(server_opt.rhc_file), CONF_ANDNA_RHC_FILE,
 						NAME_MAX - 1);
-	CONF_GET_STRN_VALUE(CONF_ANDNA_RHC_FILE, &server_opt.rhc_file,
+	CONF_SET_STRN_OPT(&(server_opt.counter_c_file), CONF_ANDNA_COUNTER_C_FILE,
 						NAME_MAX - 1);
-	CONF_GET_STRN_VALUE(CONF_ANDNA_COUNTER_C_FILE,
-						&server_opt.counter_c_file, NAME_MAX - 1);
 
-	CONF_GET_STRN_VALUE(CONF_NTK_PID_FILE, &server_opt.pid_file,
+	CONF_SET_STRN_OPT(&(server_opt.pid_file), CONF_NTK_PID_FILE,
 						NAME_MAX - 1);
 	CONF_GET_INT_VALUE(CONF_NTK_MAX_CONNECTIONS,
 					   server_opt.max_connections);
@@ -319,40 +319,25 @@ free_server_opt(void)
 {
 	int i;
 
-	if (server_opt.config_file != NTK_CONFIG_FILE)
-		xfree(server_opt.config_file);
-	if (server_opt.pid_file != NTK_PID_FILE)
-		xfree(server_opt.pid_file);
-
-	if (server_opt.int_map_file != INT_MAP_FILE)
-		xfree(server_opt.int_map_file);
-	if (server_opt.ext_map_file != EXT_MAP_FILE)
-		xfree(server_opt.ext_map_file);
-	if (server_opt.bnode_map_file != BNODE_MAP_FILE)
-		xfree(server_opt.bnode_map_file);
-
-	if (server_opt.andna_hnames_file != ANDNA_HNAMES_FILE)
-		xfree(server_opt.andna_hnames_file);
-	if (server_opt.snsd_nodes_file != SNSD_NODES_FILE)
-		xfree(server_opt.snsd_nodes_file);
-	if (server_opt.andna_cache_file != ANDNA_CACHE_FILE)
-		xfree(server_opt.andna_cache_file);
-	if (server_opt.lclkey_file != LCLKEY_FILE)
-		xfree(server_opt.lclkey_file);
-	if (server_opt.lcl_file != LCL_FILE)
-		xfree(server_opt.lcl_file);
-	if (server_opt.rhc_file != RHC_FILE)
-		xfree(server_opt.rhc_file);
-	if (server_opt.counter_c_file != COUNTER_C_FILE)
-		xfree(server_opt.counter_c_file);
-
-	if (server_opt.ip_masq_script != IPMASQ_SCRIPT_FILE)
-		xfree(server_opt.ip_masq_script);
-	if (server_opt.tc_shaper_script != TCSHAPER_SCRIPT_FILE)
-		xfree(server_opt.tc_shaper_script);
-
-	if (server_opt.inet_gw_dev)
-		xfree(server_opt.inet_gw_dev);
+	xfree(server_opt.config_file);
+	xfree(server_opt.pid_file);
+
+	xfree(server_opt.int_map_file);
+	xfree(server_opt.ext_map_file);
+	xfree(server_opt.bnode_map_file);
+
+	xfree(server_opt.andna_hnames_file);
+	xfree(server_opt.snsd_nodes_file);
+	xfree(server_opt.andna_cache_file);
+	xfree(server_opt.lclkey_file);
+	xfree(server_opt.lcl_file);
+	xfree(server_opt.rhc_file);
+	xfree(server_opt.counter_c_file);
+
+	xfree(server_opt.ip_masq_script);
+	xfree(server_opt.tc_shaper_script);
+
+	xfree(server_opt.inet_gw_dev);
 
 	for (i = 0; i < MAX_INTERFACES && server_opt.ifs[i]; i++)
 		xfree(server_opt.ifs[i]);
@@ -360,7 +345,7 @@ free_server_opt(void)
 
 /* Removes specified existing interface, Ntkd should populate the device list
  * prior to this.
- * returns 0 on success, And closes ntkd on error.
+ * returns 0 on success, return -1 and closes ntkd on error.
 */
 
 int
@@ -383,6 +368,7 @@ exclude_interface(void)
                 else
                     fatal("Interface %s not found!", optarg);
 	}
+	return -1;
 }
 
 void
@@ -489,7 +475,11 @@ parse_options(int argc, char **argv)
 			server_opt.family = AF_INET6;
 			break;
 		case 'c':
-			server_opt.config_file = xstrndup(optarg, NAME_MAX - 1);
+			if(strlen(optarg) > NAME_MAX - 1)
+			{
+				optarg[NAME_MAX] = '\0';
+			}
+			set_option_str(&(server_opt.config_file), optarg);
 			break;
 		case 'l':
 			if (log_to_file(optarg) < 0)

src/netsukuku.h

@@ -193,4 +193,30 @@ ServOpt server_opt;
 
 time_t sigterm_timestamp, sighup_timestamp, sigalrm_timestamp;
 
+/*
+ * set_option_literal: set an option from a default value
+ */
+#define set_option_literal(opt, l) \
+{ \
+	if(!(*opt = malloc(strlen(l)+1))) \
+	{ \
+		perror("Unable to allocate memory for option default value");\
+		exit(-1); \
+	} \
+	strcpy(*opt, l); \
+}
+
+/*
+ * set_option_str: set an option from a default value
+ */
+#define set_option_str(opt, str) \
+{ \
+	if(!(*opt = realloc(*opt, strlen(str) + 1))) \
+	{ \
+		perror("Unable to allocate memory for option"); \
+		exit(-1); \
+	} \
+	strcpy(*opt, str); \
+}
+
 #endif							/*NETSUKUKU_H */