X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=zones.c;h=9f4df5864c875e3939eef0574ec1a404150db442;hp=79f037e98306602fe9f6fe50fd5571ca159642b1;hb=a0b4c3356f90dbd5be4f6ddff5bd74319a6655b9;hpb=62863ea95d3c2c7dd0b56ac0f1dee5a4590ca70c

diff --git a/zones.c b/zones.c
index 79f037e..9f4df58 100644
--- a/zones.c
+++ b/zones.c
@@ -80,8 +80,8 @@ const struct fw3_option fw3_zone_opts[] = {
 	FW3_OPT("output",              target,   zone,     policy_output),
 
 	FW3_OPT("masq",                bool,     zone,     masq),
-	FW3_LIST("masq_src",           address,  zone,     masq_src),
-	FW3_LIST("masq_dest",          address,  zone,     masq_dest),
+	FW3_LIST("masq_src",           network,  zone,     masq_src),
+	FW3_LIST("masq_dest",          network,  zone,     masq_dest),
 
 	FW3_OPT("extra",               string,   zone,     extra_src),
 	FW3_OPT("extra_src",           string,   zone,     extra_src),
@@ -243,8 +243,8 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p)
 
 
 static void
-print_zone_chain(enum fw3_table table, enum fw3_family family,
-                 struct fw3_zone *zone, bool reload, struct fw3_state *state)
+print_zone_chain(struct fw3_state *state, enum fw3_family family,
+                 enum fw3_table table, bool reload, struct fw3_zone *zone)
 {
 	bool c, r;
 	uint32_t custom_mask = ~0;
@@ -280,10 +280,12 @@ print_zone_chain(enum fw3_table table, enum fw3_family family,
 }
 
 static void
-print_interface_rule(enum fw3_table table, enum fw3_family family,
-                     struct fw3_zone *zone, struct fw3_device *dev,
-                     struct fw3_address *sub, bool reload, bool disable_notrack)
+print_interface_rule(struct fw3_state *state, enum fw3_family family,
+                     enum fw3_table table, bool reload, struct fw3_zone *zone,
+                     struct fw3_device *dev, struct fw3_address *sub)
 {
+	bool disable_notrack = state->defaults.drop_invalid;
+
 	enum fw3_flag t;
 
 #define jump_target(t) \
@@ -388,8 +390,8 @@ print_interface_rule(enum fw3_table table, enum fw3_family family,
 }
 
 static void
-print_interface_rules(enum fw3_table table, enum fw3_family family,
-                      struct fw3_zone *zone, bool reload, bool disable_notrack)
+print_interface_rules(struct fw3_state *state, enum fw3_family family,
+                      enum fw3_table table, bool reload, struct fw3_zone *zone)
 {
 	struct fw3_device *dev;
 	struct fw3_address *sub;
@@ -403,13 +405,13 @@ print_interface_rules(enum fw3_table table, enum fw3_family family,
 		if (!dev && !sub)
 			continue;
 
-		print_interface_rule(table, family, zone, dev, sub, reload, disable_notrack);
+		print_interface_rule(state, family, table, reload, zone, dev, sub);
 	}
 }
 
 static void
-print_zone_rule(enum fw3_table table, enum fw3_family family,
-                struct fw3_zone *zone, bool reload, bool disable_notrack)
+print_zone_rule(struct fw3_state *state, enum fw3_family family,
+                enum fw3_table table, bool reload, struct fw3_zone *zone)
 {
 	struct fw3_address *msrc;
 	struct fw3_address *mdest;
@@ -460,9 +462,13 @@ print_zone_rule(enum fw3_table table, enum fw3_family family,
 			fw3_foreach(msrc, &zone->masq_src)
 			fw3_foreach(mdest, &zone->masq_dest)
 			{
-				fw3_pr("-A zone_%s_postrouting ", zone->name);
+				if (!fw3_is_family(msrc, family) ||
+				    !fw3_is_family(mdest, family))
+					continue;
+				
+				fw3_pr("-A zone_%s_postrouting", zone->name);
 				fw3_format_src_dest(msrc, mdest);
-				fw3_pr("-j MASQUERADE\n");
+				fw3_pr(" -j MASQUERADE\n");
 			}
 		}
 		break;
@@ -472,32 +478,32 @@ print_zone_rule(enum fw3_table table, enum fw3_family family,
 		break;
 	}
 
-	print_interface_rules(table, family, zone, reload, disable_notrack);
+	print_interface_rules(state, family, table, reload, zone);
 }
 
 void
-fw3_print_zone_chains(enum fw3_table table, enum fw3_family family,
-                      bool reload, struct fw3_state *state)
+fw3_print_zone_chains(struct fw3_state *state, enum fw3_family family,
+                      enum fw3_table table, bool reload)
 {
 	struct fw3_zone *zone;
 
 	list_for_each_entry(zone, &state->zones, list)
-		print_zone_chain(table, family, zone, reload, state);
+		print_zone_chain(state, family, table, reload, zone);
 }
 
 void
-fw3_print_zone_rules(enum fw3_table table, enum fw3_family family,
-                     bool reload, struct fw3_state *state)
+fw3_print_zone_rules(struct fw3_state *state, enum fw3_family family,
+                     enum fw3_table table, bool reload)
 {
 	struct fw3_zone *zone;
 
 	list_for_each_entry(zone, &state->zones, list)
-		print_zone_rule(table, family, zone, reload, state->defaults.drop_invalid);
+		print_zone_rule(state, family, table, reload, zone);
 }
 
 void
-fw3_flush_zones(enum fw3_table table, enum fw3_family family,
-			    bool pass2, bool reload, struct fw3_state *state)
+fw3_flush_zones(struct fw3_state *state, enum fw3_family family,
+                enum fw3_table table, bool reload, bool pass2)
 {
 	struct fw3_zone *z, *tmp;
 	uint32_t custom_mask = ~0;
@@ -515,8 +521,40 @@ fw3_flush_zones(enum fw3_table table, enum fw3_family family,
 		                pass2 ? "-X %s\n" : "-F %s\n", z->name);
 
 		if (pass2)
-		{
 			del(z->flags, family, table);
+	}
+}
+
+void
+fw3_hotplug_zones(struct fw3_state *state, bool add)
+{
+	struct fw3_zone *z;
+	struct fw3_device *d;
+
+	if (add)
+	{
+		list_for_each_entry(z, &state->running_zones, running_list)
+		{
+			if (!hasbit(z->flags[0], FW3_FLAG_HOTPLUG))
+			{
+				list_for_each_entry(d, &z->devices, list)
+					fw3_hotplug(add, z, d);
+
+				setbit(z->flags[0], FW3_FLAG_HOTPLUG);
+			}
+		}
+	}
+	else
+	{
+		list_for_each_entry(z, &state->running_zones, running_list)
+		{
+			if (hasbit(z->flags[0], FW3_FLAG_HOTPLUG))
+			{
+				list_for_each_entry(d, &z->running_devices, list)
+					fw3_hotplug(add, z, d);
+
+				delbit(z->flags[0], FW3_FLAG_HOTPLUG);
+			}
 		}
 	}
 }
@@ -542,3 +580,23 @@ fw3_lookup_zone(struct fw3_state *state, const char *name, bool running)
 
 	return NULL;
 }
+
+void
+fw3_free_zone(struct fw3_zone *zone)
+{
+	struct fw3_device *dev, *tmp;
+
+	list_for_each_entry_safe(dev, tmp, &zone->running_devices, list)
+	{
+		list_del(&dev->list);
+		free(dev);
+	}
+
+	list_for_each_entry_safe(dev, tmp, &zone->running_networks, list)
+	{
+		list_del(&dev->list);
+		free(dev);
+	}
+
+	fw3_free_object(zone, fw3_zone_opts);
+}