X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=utils.c;h=2747a853a8b99f9b4e021b2c867092f8fd4d3156;hp=f01ba731664018d442a5b8d6660210bb03487298;hb=24e1ba98e43d44ad7ba5780afd0b98e19ee14570;hpb=5df8137ebc5db2bc9c6e71b2d154a5f77679d9d8

diff --git a/utils.c b/utils.c
index f01ba73..2747a85 100644
--- a/utils.c
+++ b/utils.c
@@ -27,6 +27,9 @@ static int lock_fd = -1;
 static pid_t pipe_pid = -1;
 static FILE *pipe_fd = NULL;
 
+bool fw3_pr_debug = false;
+
+
 static void
 warn_elem_section_name(struct uci_section *s, bool find_name)
 {
@@ -250,10 +253,18 @@ __fw3_command_pipe(bool silent, const char *command, ...)
 void
 fw3_pr(const char *fmt, ...)
 {
-    va_list args;
-    va_start(args, fmt);
-    vfprintf(pipe_fd, fmt, args);
-    va_end(args);
+	va_list args;
+
+	if (fw3_pr_debug && pipe_fd != stdout)
+	{
+		va_start(args, fmt);
+		vfprintf(stderr, fmt, args);
+		va_end(args);
+	}
+
+	va_start(args, fmt);
+	vfprintf(pipe_fd, fmt, args);
+	va_end(args);
 }
 
 void
@@ -341,11 +352,11 @@ fw3_read_statefile(void *state)
 {
 	FILE *sf;
 
-	int n, type;
+	int type;
 	char line[128];
 	const char *p, *name;
 
-	uint16_t flags[2];
+	uint32_t flags;
 
 	struct fw3_state *s = state;
 	struct fw3_zone *zone;
@@ -363,23 +374,23 @@ fw3_read_statefile(void *state)
 		if (!p)
 			continue;
 
-		type = strtoul(p, NULL, 10);
+		type = strtoul(p, NULL, 16);
 		name = strtok(NULL, " \t\n");
 
 		if (!name)
 			continue;
 
-		for (n = 0, p = strtok(NULL, " \t\n");
-		     n < ARRAY_SIZE(flags) && p != NULL;
-		     n++, p = strtok(NULL, " \t\n"))
-		{
-			flags[n] = strtoul(p, NULL, 10);
-		}
+		p = strtok(NULL, " \t\n");
+
+		if (!p)
+			continue;
+
+		flags = strtoul(p, NULL, 16);
 
 		switch (type)
 		{
 		case FW3_TYPE_DEFAULTS:
-			s->running_defaults.flags = flags[0];
+			s->defaults.running_flags = flags;
 			break;
 
 		case FW3_TYPE_ZONE:
@@ -394,8 +405,7 @@ fw3_read_statefile(void *state)
 				list_add_tail(&zone->list, &s->zones);
 			}
 
-			zone->src_flags = flags[0];
-			zone->dst_flags = flags[1];
+			zone->running_flags = flags;
 			list_add_tail(&zone->running_list, &s->running_zones);
 			break;
 
@@ -411,7 +421,7 @@ fw3_read_statefile(void *state)
 				list_add_tail(&ipset->list, &s->ipsets);
 			}
 
-			ipset->flags = flags[0];
+			ipset->running_flags = flags;
 			list_add_tail(&ipset->running_list, &s->running_ipsets);
 			break;
 		}
@@ -431,9 +441,7 @@ fw3_write_statefile(void *state)
 	struct fw3_zone *z;
 	struct fw3_ipset *i;
 
-	int mask = (1 << FW3_FAMILY_V4) | (1 << FW3_FAMILY_V6);
-
-	if (!(d->flags & mask))
+	if (fw3_no_family(d))
 	{
 		if (unlink(FW3_STATEFILE))
 			warn("Unable to remove state %s: %s",
@@ -450,17 +458,16 @@ fw3_write_statefile(void *state)
 		return;
 	}
 
-	fprintf(sf, "%u - %u\n", FW3_TYPE_DEFAULTS, d->flags);
+	fprintf(sf, "%x - %x\n", FW3_TYPE_DEFAULTS, d->flags);
 
 	list_for_each_entry(z, &s->running_zones, running_list)
 	{
-		fprintf(sf, "%u %s %u %u\n", FW3_TYPE_ZONE,
-		        z->name, z->src_flags, z->dst_flags);
+		fprintf(sf, "%x %s %x\n", FW3_TYPE_ZONE, z->name, z->flags);
 	}
 
 	list_for_each_entry(i, &s->running_ipsets, running_list)
 	{
-		fprintf(sf, "%u %s %u\n", FW3_TYPE_IPSET, i->name, i->flags);
+		fprintf(sf, "%x %s %x\n", FW3_TYPE_IPSET, i->name, i->flags);
 	}
 
 	fclose(sf);
@@ -488,10 +495,20 @@ void
 fw3_free_object(void *obj, const void *opts)
 {
 	const struct fw3_option *ol;
+	struct list_head *list, *cur, *tmp;
 
 	for (ol = opts; ol->name; ol++)
-		if (ol->elem_size)
-			fw3_free_list((struct list_head *)((char *)obj + ol->offset));
+	{
+		if (!ol->elem_size)
+			continue;
+
+		list = (struct list_head *)((char *)obj + ol->offset);
+		list_for_each_safe(cur, tmp, list)
+		{
+			list_del(cur);
+			free(cur);
+		}
+	}
 
 	free(obj);
 }