fprintf(stderr, "\n");
}
+void *
+fw3_alloc(size_t size)
+{
+ void *mem;
+
+ mem = calloc(1, size);
+
+ if (!mem)
+ error("Out of memory while allocating %d bytes", size);
+
+ return mem;
+}
+
+char *
+fw3_strdup(const char *s)
+{
+ char *ns;
+
+ ns = strdup(s);
+
+ if (!ns)
+ error("Out of memory while duplicating string '%s'", s);
+
+ return ns;
+}
+
const char *
fw3_find_command(const char *cmd)
{
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);
struct uci_ptr ptr = { .p = dest };
- if (!s->enabled || (s->external && *s->external))
+ if (!s->enabled || s->external)
return;
uci_add_section(ctx, dest, "ipset", &ptr.s);
uci_unload(s->uci, p);
}
+ fsync(fileno(sf));
fclose(sf);
}
}
bool
-fw3_pr_rulespec(int table, int family, uint32_t *flags, uint32_t mask,
- const struct fw3_rule_spec *r, const char *fmt, ...)
-{
- char buf[256];
- bool rv = false;
-
- va_list ap;
- uint32_t f = flags ? flags[family == FW3_FAMILY_V6] : 0;
-
- if (mask)
- f &= mask;
-
- for (; r->format; r++)
- {
- if (!fw3_is_family(r, family))
- continue;
-
- if (r->table != table)
- continue;
-
- if ((r->flag != 0) && !hasbit(f, r->flag))
- continue;
-
- va_start(ap, fmt);
- vsnprintf(buf, sizeof(buf), r->format, ap);
- va_end(ap);
-
- fw3_pr(fmt, buf);
-
- rv = true;
- }
-
- return rv;
-}
-
-
-bool
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())
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);