X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=main.c;h=71463aec6a3840b547291de8fbae5ece5f9939c3;hp=bc1cfd73c3a885803dc8901e9c9b8b8d93a57591;hb=dba19a8f14cefdede3cc7d0f8322fdb9a2c44d50;hpb=6661ec505820cfb1a02b788641c2e770cbd38e36

diff --git a/main.c b/main.c
index bc1cfd7..71463ae 100644
--- a/main.c
+++ b/main.c
@@ -45,12 +45,10 @@ build_state(bool runtime)
 	struct uci_package *p = NULL;
 	FILE *sf;
 
-	state = malloc(sizeof(*state));
-
+	state = calloc(1, sizeof(*state));
 	if (!state)
 		error("Out of memory");
 
-	memset(state, 0, sizeof(*state));
 	state->uci = uci_alloc_context();
 
 	if (!state->uci)
@@ -98,12 +96,16 @@ build_state(bool runtime)
 		cfg_state = state;
 	}
 
+
+	struct blob_buf b = {NULL, NULL, 0, NULL};
+	fw3_ubus_rules(&b);
+
 	fw3_load_defaults(state, p);
 	fw3_load_ipsets(state, p);
 	fw3_load_zones(state, p);
-	fw3_load_rules(state, p);
+	fw3_load_rules(state, p, b.head);
 	fw3_load_redirects(state, p);
-	fw3_load_snats(state, p);
+	fw3_load_snats(state, p, b.head);
 	fw3_load_forwards(state, p);
 	fw3_load_includes(state, p);
 
@@ -165,8 +167,6 @@ family_set(struct fw3_state *state, enum fw3_family family, bool set)
 static int
 stop(bool complete)
 {
-	FILE *ct;
-
 	int rv = 1;
 	enum fw3_family family;
 	enum fw3_table table;
@@ -222,13 +222,8 @@ stop(bool complete)
 	if (run_state)
 		fw3_destroy_ipsets(run_state);
 
-	if (complete && (ct = fopen("/proc/net/nf_conntrack", "w")) != NULL)
-	{
-		info(" * Flushing conntrack table ...");
-
-		fwrite("f\n", 2, 1, ct);
-		fclose(ct);
-	}
+	if (complete)
+		fw3_flush_conntrack(NULL);
 
 	if (!rv && run_state)
 		fw3_write_statefile(run_state);
@@ -302,6 +297,7 @@ start(void)
 
 	if (!rv)
 	{
+		fw3_flush_conntrack(run_state);
 		fw3_set_defaults(cfg_state);
 
 		if (!print_family)
@@ -393,6 +389,8 @@ start:
 
 	if (!rv)
 	{
+		fw3_flush_conntrack(run_state);
+
 		fw3_set_defaults(cfg_state);
 		fw3_run_includes(cfg_state, true);
 		fw3_hotplug_zones(cfg_state, true);
@@ -445,12 +443,42 @@ lookup_device(const char *dev)
 }
 
 static int
+lookup_zone(const char *zone, const char *device)
+{
+	struct fw3_zone *z;
+	struct fw3_device *d;
+
+	list_for_each_entry(z, &cfg_state->zones, list)
+	{
+		if (strcmp(z->name, zone))
+			continue;
+
+		list_for_each_entry(d, &z->devices, list)
+		{
+			if (device && strcmp(device, d->name))
+				continue;
+
+			printf("%s\n", d->name);
+
+			if (device)
+				return 0;
+		}
+
+		if (!device)
+			return 0;
+	}
+
+	return 1;
+}
+
+static int
 usage(void)
 {
 	fprintf(stderr, "fw3 [-4] [-6] [-q] print\n");
 	fprintf(stderr, "fw3 [-q] {start|stop|flush|reload|restart}\n");
 	fprintf(stderr, "fw3 [-q] network {net}\n");
 	fprintf(stderr, "fw3 [-q] device {dev}\n");
+	fprintf(stderr, "fw3 [-q] zone {zone} [dev]\n");
 
 	return 1;
 }
@@ -571,6 +599,10 @@ int main(int argc, char **argv)
 	{
 		rv = lookup_device(argv[optind + 1]);
 	}
+	else if (!strcmp(argv[optind], "zone") && (optind + 1) < argc)
+	{
+		rv = lookup_zone(argv[optind + 1], argv[optind + 2]);
+	}
 	else
 	{
 		rv = usage();