write_defaults_uci(struct uci_context *ctx, struct fw3_defaults *d,
struct uci_package *dest)
{
- char buf[8];
+ char buf[sizeof("0xffffffff\0")];
struct uci_ptr ptr = { .p = dest };
uci_add_section(ctx, dest, "defaults", &ptr.s);
- sprintf(buf, "%u", d->flags[0]);
+ 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, "%u", d->flags[1]);
+ sprintf(buf, "0x%x", d->flags[1]);
ptr.o = NULL;
ptr.option = "__flags_v6";
ptr.value = buf;
if (dev->invert)
p += sprintf(p, "!");
- p += sprintf(p, "%s", dev->name);
+ if (*dev->network)
+ p += sprintf(p, "%s@%s", dev->name, dev->network);
+ else
+ p += sprintf(p, "%s", dev->name);
ptr.value = buf;
uci_add_list(ctx, &ptr);
uci_add_list(ctx, &ptr);
}
- sprintf(buf, "%u", z->flags[0]);
+ sprintf(buf, "0x%x", z->flags[0]);
ptr.o = NULL;
ptr.option = "__flags_v4";
ptr.value = buf;
uci_set(ctx, &ptr);
- sprintf(buf, "%u", z->flags[1]);
+ sprintf(buf, "0x%x", z->flags[1]);
ptr.o = NULL;
ptr.option = "__flags_v6";
ptr.value = buf;
uci_set(ctx, &ptr);
}
+static void
+write_ipset_uci(struct uci_context *ctx, struct fw3_ipset *s,
+ struct uci_package *dest)
+{
+ struct fw3_ipset_datatype *type;
+
+ char buf[sizeof("65535-65535\0")];
+
+ struct uci_ptr ptr = { .p = dest };
+
+ if (!s->enabled || s->external)
+ return;
+
+ uci_add_section(ctx, dest, "ipset", &ptr.s);
+
+ ptr.o = NULL;
+ ptr.option = "name";
+ ptr.value = s->name;
+ uci_set(ctx, &ptr);
+
+ ptr.o = NULL;
+ ptr.option = "storage";
+ ptr.value = fw3_ipset_method_names[s->method];
+ uci_set(ctx, &ptr);
+
+ list_for_each_entry(type, &s->datatypes, list)
+ {
+ sprintf(buf, "%s_%s", type->dest ? "dst" : "src",
+ fw3_ipset_type_names[type->type]);
+
+ ptr.o = NULL;
+ ptr.option = "match";
+ ptr.value = buf;
+ uci_add_list(ctx, &ptr);
+ }
+
+ if (s->iprange.set)
+ {
+ ptr.o = NULL;
+ ptr.option = "iprange";
+ ptr.value = fw3_address_to_string(&s->iprange, false);
+ uci_set(ctx, &ptr);
+ }
+
+ 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
fw3_write_statefile(void *state)
{
FILE *sf;
struct fw3_state *s = state;
struct fw3_zone *z;
+ struct fw3_ipset *i;
struct uci_package *p;
list_for_each_entry(z, &s->zones, list)
write_zone_uci(s->uci, z, p);
+ list_for_each_entry(i, &s->ipsets, list)
+ write_ipset_uci(s->uci, i, p);
+
uci_export(s->uci, sf, p, true);
uci_unload(s->uci, p);
}
struct fw3_zone *z = zone;
struct fw3_device *d = device;
- if (!d->network)
+ if (!*d->network)
return false;
switch (fork())
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);