X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=utils.c;h=fc8c201c7b7958dffb3fbc39f1b628f821d056cd;hp=e7a22159244ec702a1a18a5a285f1ca54728c55e;hb=6d0ae262f561a1e7559154c8e122ae9ca9c71590;hpb=71d9d828691cefcac19201079473e600ffa596c9

diff --git a/utils.c b/utils.c
index e7a2215..fc8c201 100644
--- a/utils.c
+++ b/utils.c
@@ -348,122 +348,214 @@ fw3_unlock(void)
 }
 
 
-bool
-fw3_read_statefile(void *state)
+static void
+write_defaults_uci(struct uci_context *ctx, struct fw3_defaults *d,
+                   struct uci_package *dest)
 {
-	FILE *sf;
+	char buf[sizeof("0xffffffff\0")];
+	struct uci_ptr ptr = { .p = dest };
+
+	uci_add_section(ctx, dest, "defaults", &ptr.s);
+
+	ptr.o      = NULL;
+	ptr.option = "input";
+	ptr.value  = fw3_flag_names[d->policy_input];
+	uci_set(ctx, &ptr);
+
+	ptr.o      = NULL;
+	ptr.option = "output";
+	ptr.value  = fw3_flag_names[d->policy_output];
+	uci_set(ctx, &ptr);
+
+	ptr.o      = NULL;
+	ptr.option = "forward";
+	ptr.value  = fw3_flag_names[d->policy_forward];
+	uci_set(ctx, &ptr);
+
+	sprintf(buf, "0x%x", d->flags[0]);
+	ptr.o      = NULL;
+	ptr.option = "__flags_v4";
+	ptr.value  = buf;
+	uci_set(ctx, &ptr);
+
+	sprintf(buf, "0x%x", d->flags[1]);
+	ptr.o      = NULL;
+	ptr.option = "__flags_v6";
+	ptr.value  = buf;
+	uci_set(ctx, &ptr);
+}
 
-	int type;
-	char line[128];
-	const char *p, *name;
+static void
+write_zone_uci(struct uci_context *ctx, struct fw3_zone *z,
+               struct uci_package *dest)
+{
+	struct fw3_device *dev;
+	struct fw3_address *sub;
+	enum fw3_family fam = FW3_FAMILY_ANY;
 
-	uint32_t flags[2];
+	char *p, buf[34];
 
-	struct fw3_state *s = state;
-	struct fw3_zone *zone;
-	struct fw3_ipset *ipset;
-	struct fw3_device *net, *dev;
+	struct uci_ptr ptr = { .p = dest };
 
-	sf = fopen(FW3_STATEFILE, "r");
+	if (!z->enabled)
+		return;
 
-	if (!sf)
-		return false;
+	if (fw3_no_table(z->flags[0]) && !fw3_no_table(z->flags[1]))
+		fam = FW3_FAMILY_V6;
+	else if (!fw3_no_table(z->flags[0]) && fw3_no_table(z->flags[1]))
+		fam = FW3_FAMILY_V4;
+	else if (fw3_no_table(z->flags[0]) && fw3_no_table(z->flags[1]))
+		return;
 
-	while (fgets(line, sizeof(line), sf))
+	uci_add_section(ctx, dest, "zone", &ptr.s);
+
+	ptr.o      = NULL;
+	ptr.option = "name";
+	ptr.value  = z->name;
+	uci_set(ctx, &ptr);
+
+	ptr.o      = NULL;
+	ptr.option = "input";
+	ptr.value  = fw3_flag_names[z->policy_input];
+	uci_set(ctx, &ptr);
+
+	ptr.o      = NULL;
+	ptr.option = "output";
+	ptr.value  = fw3_flag_names[z->policy_output];
+	uci_set(ctx, &ptr);
+
+	ptr.o      = NULL;
+	ptr.option = "forward";
+	ptr.value  = fw3_flag_names[z->policy_forward];
+	uci_set(ctx, &ptr);
+
+	ptr.o      = NULL;
+	ptr.option = "masq";
+	ptr.value  = z->masq ? "1" : "0";
+	uci_set(ctx, &ptr);
+
+	ptr.o      = NULL;
+	ptr.option = "conntrack";
+	ptr.value  = z->conntrack ? "1" : "0";
+	uci_set(ctx, &ptr);
+
+	ptr.o      = NULL;
+	ptr.option = "mtu_fix";
+	ptr.value  = z->mtu_fix ? "1" : "0";
+	uci_set(ctx, &ptr);
+
+	ptr.o      = NULL;
+	ptr.option = "custom_chains";
+	ptr.value  = z->custom_chains ? "1" : "0";
+	uci_set(ctx, &ptr);
+
+	if (fam != FW3_FAMILY_ANY)
 	{
-		p = strtok(line, " \t\n");
-
-		if (!p)
-			continue;
-
-		type = strtoul(p, NULL, 16);
-		name = strtok(NULL, " \t\n");
-
-		if (!name)
-			continue;
-
-		if (!(p = strtok(NULL, " \t\n")))
-			continue;
+		ptr.o      = NULL;
+		ptr.option = "family";
+		ptr.value  = fw3_flag_names[fam];
+		uci_set(ctx, &ptr);
+	}
 
-		flags[0] = strtoul(p, NULL, 16);
+	ptr.o      = NULL;
+	ptr.option = "device";
 
-		if (!(p = strtok(NULL, " \t\n")))
+	fw3_foreach(dev, &z->devices)
+	{
+		if (!dev)
 			continue;
 
-		flags[1] = strtoul(p, NULL, 16);
+		p = buf;
 
-		switch (type)
-		{
-		case FW3_TYPE_DEFAULTS:
-			s->defaults.flags[0] = flags[0];
-			s->defaults.flags[1] = flags[1];
-			break;
+		if (dev->invert)
+			p += sprintf(p, "!");
 
-		case FW3_TYPE_ZONE:
-			if (!(zone = fw3_lookup_zone(state, name, false)))
-			{
-				zone = fw3_alloc_zone();
+		if (*dev->network)
+			p += sprintf(p, "%s@%s", dev->name, dev->network);
+		else
+			p += sprintf(p, "%s", dev->name);
 
-				if (!zone)
-					continue;
-
-				zone->name = strdup(name);
-				list_add_tail(&zone->list, &s->zones);
+		ptr.value = buf;
+		uci_add_list(ctx, &ptr);
+	}
 
-				setbit(flags[0], FW3_FLAG_DELETED);
-			}
+	ptr.o      = NULL;
+	ptr.option = "subnet";
 
-			zone->flags[0] = flags[0];
-			zone->flags[1] = flags[1];
-			list_add_tail(&zone->running_list, &s->running_zones);
-			break;
+	fw3_foreach(sub, &z->subnets)
+	{
+		if (!sub)
+			continue;
 
-		case FW3_TYPE_IPSET:
-			if (!(ipset = fw3_lookup_ipset(state, name, false)))
-			{
-				ipset = fw3_alloc_ipset();
+		ptr.value = fw3_address_to_string(sub, true);
+		uci_add_list(ctx, &ptr);
+	}
 
-				if (!ipset)
-					continue;
+	sprintf(buf, "0x%x", z->flags[0]);
+	ptr.o      = NULL;
+	ptr.option = "__flags_v4";
+	ptr.value  = buf;
+	uci_set(ctx, &ptr);
+
+	sprintf(buf, "0x%x", z->flags[1]);
+	ptr.o      = NULL;
+	ptr.option = "__flags_v6";
+	ptr.value  = buf;
+	uci_set(ctx, &ptr);
+}
 
-				ipset->name = strdup(name);
-				list_add_tail(&ipset->list, &s->ipsets);
+static void
+write_ipset_uci(struct uci_context *ctx, struct fw3_ipset *s,
+                struct uci_package *dest)
+{
+	struct fw3_ipset_datatype *type;
 
-				setbit(flags[0], FW3_FLAG_DELETED);
-			}
+	char buf[sizeof("65535-65535\0")];
 
-			ipset->flags[0] = flags[0];
-			ipset->flags[1] = flags[1];
-			list_add_tail(&ipset->running_list, &s->running_ipsets);
-			break;
+	struct uci_ptr ptr = { .p = dest };
 
-		case FW3_TYPE_NETWORK:
-			if (!(zone = fw3_lookup_zone(state, name, false)))
-				continue;
+	if (!s->enabled || s->external)
+		return;
 
-			if (!(p = strtok(NULL, " \t\n")) || !(name = strtok(NULL, " \t\n")))
-				continue;
+	uci_add_section(ctx, dest, "ipset", &ptr.s);
 
-			if (!(net = malloc(sizeof(*net))))
-				continue;
+	ptr.o      = NULL;
+	ptr.option = "name";
+	ptr.value  = s->name;
+	uci_set(ctx, &ptr);
 
-			memset(net, 0, sizeof(*net));
-			snprintf(net->name, sizeof(net->name), "%s", p);
-			list_add_tail(&net->list, &zone->running_networks);
+	ptr.o      = NULL;
+	ptr.option = "storage";
+	ptr.value  = fw3_ipset_method_names[s->method];
+	uci_set(ctx, &ptr);
 
-			if (!(dev = malloc(sizeof(*dev))))
-				continue;
+	list_for_each_entry(type, &s->datatypes, list)
+	{
+		sprintf(buf, "%s_%s", type->dest ? "dst" : "src",
+		                      fw3_ipset_type_names[type->type]);
 
-			memset(dev, 0, sizeof(*dev));
-			dev->network = net;
-			snprintf(dev->name, sizeof(dev->name), "%s", name);
-			list_add_tail(&dev->list, &zone->running_devices);
-		}
+		ptr.o      = NULL;
+		ptr.option = "match";
+		ptr.value  = buf;
+		uci_add_list(ctx, &ptr);
 	}
 
-	fclose(sf);
+	if (s->iprange.set)
+	{
+		ptr.o      = NULL;
+		ptr.option = "iprange";
+		ptr.value  = fw3_address_to_string(&s->iprange, false);
+		uci_set(ctx, &ptr);
+	}
 
-	return true;
+	if (s->portrange.set)
+	{
+		sprintf(buf, "%u-%u", s->portrange.port_min, s->portrange.port_max);
+		ptr.o      = NULL;
+		ptr.option = "portrange";
+		ptr.value  = buf;
+		uci_set(ctx, &ptr);
+	}
 }
 
 void
@@ -471,85 +563,51 @@ fw3_write_statefile(void *state)
 {
 	FILE *sf;
 	struct fw3_state *s = state;
-	struct fw3_defaults *defs = &s->defaults;
 	struct fw3_zone *z;
 	struct fw3_ipset *i;
-	struct fw3_device *d;
 
-	if (fw3_no_table(defs->flags[0]) && fw3_no_table(defs->flags[1]))
-	{
-		if (unlink(FW3_STATEFILE))
-			warn("Unable to remove state %s: %s",
-			     FW3_STATEFILE, strerror(errno));
+	struct uci_package *p;
 
-		return;
-	}
-
-	sf = fopen(FW3_STATEFILE, "w");
-
-	if (!sf)
+	if (fw3_no_family(s->defaults.flags[0]) &&
+	    fw3_no_family(s->defaults.flags[1]))
 	{
-		warn("Cannot create state %s: %s", FW3_STATEFILE, strerror(errno));
-		return;
+		unlink(FW3_STATEFILE);
 	}
-
-	fprintf(sf, "%x - %x %x\n",
-	        FW3_TYPE_DEFAULTS, defs->flags[0], defs->flags[1]);
-
-	list_for_each_entry(z, &s->running_zones, running_list)
+	else
 	{
-		if (hasbit(z->flags[0], FW3_FLAG_DELETED))
-			continue;
+		sf = fopen(FW3_STATEFILE, "w+");
 
-		if (fw3_no_table(z->flags[0]) && fw3_no_table(z->flags[1]))
-			continue;
-
-		fprintf(sf, "%x %s %x %x\n",
-		        FW3_TYPE_ZONE, z->name, z->flags[0], z->flags[1]);
-
-		list_for_each_entry(d, &z->devices, list)
+		if (!sf)
 		{
-			if (!d->network)
-				continue;
-
-			fprintf(sf, "%x %s 0 0 %s %s\n",
-			        FW3_TYPE_NETWORK, z->name, d->network->name, d->name);
+			warn("Cannot create state %s: %s", FW3_STATEFILE, strerror(errno));
+			return;
 		}
-	}
 
-	list_for_each_entry(i, &s->running_ipsets, running_list)
-	{
-		if (hasbit(z->flags[0], FW3_FLAG_DELETED))
-			continue;
+		if ((p = uci_lookup_package(s->uci, "fw3_state")) != NULL)
+			uci_unload(s->uci, p);
 
-		if (!fw3_no_family(i->flags[0]) || !fw3_no_family(i->flags[1]))
-		{
-			fprintf(sf, "%x %s %x %x\n",
-					FW3_TYPE_IPSET, i->name, i->flags[0], i->flags[1]);
-		}
-	}
+		uci_import(s->uci, sf, "fw3_state", NULL, true);
 
-	fclose(sf);
-}
+		if ((p = uci_lookup_package(s->uci, "fw3_state")) != NULL)
+		{
+			write_defaults_uci(s->uci, &s->defaults, p);
 
+			list_for_each_entry(z, &s->zones, list)
+				write_zone_uci(s->uci, z, p);
 
-struct object_list_heads
-{
-	struct list_head list;
-	struct list_head running_list;
-};
+			list_for_each_entry(i, &s->ipsets, list)
+				write_ipset_uci(s->uci, i, p);
 
-void
-fw3_set_running(void *object, struct list_head *dest)
-{
-	struct object_list_heads *o = object;
+			uci_export(s->uci, sf, p, true);
+			uci_unload(s->uci, p);
+		}
 
-	if (dest && !o->running_list.next)
-		list_add_tail(&o->running_list, dest);
-	else if (!dest && o->running_list.next)
-		list_del(&o->running_list);
+		fsync(fileno(sf));
+		fclose(sf);
+	}
 }
 
+
 void
 fw3_free_object(void *obj, const void *opts)
 {
@@ -616,7 +674,7 @@ fw3_hotplug(bool add, void *zone, void *device)
 	struct fw3_zone *z = zone;
 	struct fw3_device *d = device;
 
-	if (!d->network)
+	if (!*d->network)
 		return false;
 
 	switch (fork())
@@ -640,7 +698,7 @@ fw3_hotplug(bool add, void *zone, void *device)
 	clearenv();
 	setenv("ACTION",    add ? "add" : "remove", 1);
 	setenv("ZONE",      z->name,                1);
-	setenv("INTERFACE", d->network->name,       1);
+	setenv("INTERFACE", d->network,             1);
 	setenv("DEVICE",    d->name,                1);
 
 	execl(FW3_HOTPLUG, FW3_HOTPLUG, "firewall", NULL);