X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=includes.c;h=5022fbd71882a13b7f41dfb3c52e91110534f73a;hp=23cfda0f4f73f7e4d99183d84144336763e08237;hb=e7b6234df3d34d82b909f1e7367a89d322f87814;hpb=8eb2ce1f936bb27267c9fb312fbb4c3ea008f5af

diff --git a/includes.c b/includes.c
index 23cfda0..5022fbd 100644
--- a/includes.c
+++ b/includes.c
@@ -83,14 +83,11 @@ fw3_load_includes(struct fw3_state *state, struct uci_package *p)
 
 
 static void
-print_include(struct fw3_include *include, enum fw3_family family)
+print_include(struct fw3_include *include)
 {
 	FILE *f;
 	char line[1024];
 
-	if (!fw3_is_family(include, family))
-		return;
-
 	info(" * Loading include '%s'", include->path);
 
 	if (!(f = fopen(include->path, "r")))
@@ -110,14 +107,36 @@ fw3_print_includes(struct fw3_state *state, enum fw3_family family, bool reload)
 {
 	struct fw3_include *include;
 
+	bool exec = false;
+	const char *restore = "iptables-restore";
+
+	if (family == FW3_FAMILY_V6)
+		restore = "ip6tables-restore";
+
 	list_for_each_entry(include, &state->includes, list)
 	{
 		if (reload && !include->reload)
 			continue;
 
-		if (include->type == FW3_INC_TYPE_RESTORE)
-			print_include(include, family);
+		if (include->type != FW3_INC_TYPE_RESTORE)
+			continue;
+
+		if (!fw3_is_family(include, family))
+			continue;
+
+		if (!exec)
+		{
+			exec = fw3_command_pipe(false, restore, "--noflush");
+
+			if (!exec)
+				return;
+		}
+
+		print_include(include);
 	}
+
+	if (exec)
+		fw3_command_close();
 }