/*
* firewall3 - 3rd OpenWrt UCI firewall implementation
*
- * Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ * Copyright (C) 2013 Jo-Philipp Wich <jo@mein.io>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
kernel_version = 0x10000 * x + 0x100 * y + z;
}
-#ifdef DISABLE_IPV6
-#undef __ipt_module
-#define __ipt_module(x) libxt_##x##_init, libipt_##x##_init,
-#else
-#undef __ipt_module
-#define __ipt_module(x) libxt_##x##_init, libipt_##x##_init, libip6t_##x##_init,
-#endif
-
static void fw3_init_extensions(void)
{
- int i;
- void (*initfuncs[])(void) = { FW3_IPT_MODULES };
+ init_extensions();
+ init_extensions4();
- for (i = 0; i < sizeof(initfuncs)/sizeof(initfuncs[0]); i++)
- if (initfuncs[i])
- initfuncs[i]();
+#ifndef DISABLE_IPV6
+ init_extensions6();
+#endif
}
struct fw3_ipt_handle *
iptc_delete_chain(chain, h->handle);
}
+static int
+get_rule_id(const void *base, unsigned int start, unsigned int end)
+{
+ uint32_t id;
+ unsigned int i;
+ const struct xt_entry_match *em;
+
+ for (i = start; i < end; i += em->u.match_size)
+ {
+ em = base + i;
+
+ if (strcmp(em->u.user.name, "id"))
+ continue;
+
+ memcpy(&id, em->data, sizeof(id));
+
+ if ((id & FW3_ID_MASK) != FW3_ID_MAGIC)
+ continue;
+
+ return (id & ~FW3_ID_MASK);
+ }
+
+ return -1;
+}
+
+void
+fw3_ipt_delete_id_rules(struct fw3_ipt_handle *h, const char *chain)
+{
+ unsigned int num;
+ const struct ipt_entry *e;
+ bool found;
+ int id;
+
+#ifndef DISABLE_IPV6
+ if (h->family == FW3_FAMILY_V6)
+ {
+ if (!ip6tc_is_chain(chain, h->handle))
+ return;
+
+ do {
+ found = false;
+
+ const struct ip6t_entry *e6;
+ for (num = 0, e6 = ip6tc_first_rule(chain, h->handle);
+ e6 != NULL;
+ num++, e6 = ip6tc_next_rule(e6, h->handle))
+ {
+ id = get_rule_id(e6, sizeof(*e6), e6->target_offset);
+
+ if (id >= 0)
+ {
+ if (fw3_pr_debug)
+ debug(h, "-D %s %u\n", chain, num + 1);
+
+ ip6tc_delete_num_entry(chain, num, h->handle);
+ found = true;
+ break;
+ }
+ }
+ } while (found);
+ }
+ else
+#endif
+ {
+ if (!iptc_is_chain(chain, h->handle))
+ return;
+
+ do {
+ found = false;
+
+ for (num = 0, e = iptc_first_rule(chain, h->handle);
+ e != NULL;
+ num++, e = iptc_next_rule(e, h->handle))
+ {
+ id = get_rule_id(e, sizeof(*e), e->target_offset);
+
+ if (id >= 0)
+ {
+ if (fw3_pr_debug)
+ debug(h, "-D %s %u\n", chain, num + 1);
+
+ iptc_delete_num_entry(chain, num, h->handle);
+ found = true;
+ break;
+ }
+ }
+ } while (found);
+ }
+}
+
void
fw3_ipt_create_chain(struct fw3_ipt_handle *h, const char *fmt, ...)
{
}
}
+static bool
+chain_is_empty(struct fw3_ipt_handle *h, const char *chain)
+{
+#ifndef DISABLE_IPV6
+ if (h->family == FW3_FAMILY_V6)
+ return (!ip6tc_builtin(chain, h->handle) &&
+ !ip6tc_first_rule(chain, h->handle));
+#endif
+
+ return (!iptc_builtin(chain, h->handle) &&
+ !iptc_first_rule(chain, h->handle));
+}
+
+void
+fw3_ipt_gc(struct fw3_ipt_handle *h)
+{
+ const char *chain;
+ bool found;
+
+#ifndef DISABLE_IPV6
+ if (h->family == FW3_FAMILY_V6)
+ {
+ do {
+ found = false;
+
+ for (chain = ip6tc_first_chain(h->handle);
+ chain != NULL;
+ chain = ip6tc_next_chain(h->handle))
+ {
+ if (!chain_is_empty(h, chain))
+ continue;
+
+ fw3_ipt_delete_chain(h, chain);
+ found = true;
+ break;
+ }
+ } while(found);
+ }
+ else
+#endif
+ {
+ do {
+ found = false;
+
+ for (chain = iptc_first_chain(h->handle);
+ chain != NULL;
+ chain = iptc_next_chain(h->handle))
+ {
+ warn("C=%s\n", chain);
+
+ if (!chain_is_empty(h, chain))
+ continue;
+
+ warn("D=%s\n", chain);
+
+ fw3_ipt_delete_chain(h, chain);
+ found = true;
+ break;
+ }
+ } while (found);
+ }
+}
+
void
fw3_ipt_commit(struct fw3_ipt_handle *h)
{
r = fw3_alloc(sizeof(*r));
r->h = h;
+ r->id = 0;
r->argv = fw3_alloc(sizeof(char *));
r->argv[r->argc++] = "fw3";
}
-static void
-ip4prefix2mask(int prefix, struct in_addr *mask)
-{
- if (prefix > 0)
- mask->s_addr = htonl(~((1 << (32 - prefix)) - 1));
- else
- mask->s_addr = 0;
-}
-
-#ifndef DISABLE_IPV6
-static void
-ip6prefix2mask(int prefix, struct in6_addr *mask)
-{
- char *p = (char *)mask;
-
- if (prefix > 0)
- {
- memset(p, 0xff, prefix / 8);
- memset(p + (prefix / 8) + 1, 0, (128 - prefix) / 8);
- p[prefix / 8] = 0xff << (8 - (prefix & 7));
- }
- else
- {
- memset(mask, 0, sizeof(*mask));
- }
-}
-#endif
-
void
fw3_ipt_rule_src_dest(struct fw3_ipt_rule *r,
struct fw3_address *src, struct fw3_address *dest)
if (src->range)
{
fw3_ipt_rule_addarg(r, src->invert, "--src-range",
- fw3_address_to_string(src, false));
+ fw3_address_to_string(src, false, false));
}
#ifndef DISABLE_IPV6
else if (r->h->family == FW3_FAMILY_V6)
{
r->e6.ipv6.src = src->address.v6;
- ip6prefix2mask(src->mask, &r->e6.ipv6.smsk);
+ r->e6.ipv6.smsk = src->mask.v6;
int i;
for (i = 0; i < 4; i++)
else
{
r->e.ip.src = src->address.v4;
- ip4prefix2mask(src->mask, &r->e.ip.smsk);
+ r->e.ip.smsk = src->mask.v4;
r->e.ip.src.s_addr &= r->e.ip.smsk.s_addr;
if (dest->range)
{
fw3_ipt_rule_addarg(r, dest->invert, "--dst-range",
- fw3_address_to_string(dest, false));
+ fw3_address_to_string(dest, false, false));
}
#ifndef DISABLE_IPV6
else if (r->h->family == FW3_FAMILY_V6)
{
r->e6.ipv6.dst = dest->address.v6;
- ip6prefix2mask(dest->mask, &r->e6.ipv6.dmsk);
+ r->e6.ipv6.dmsk = dest->mask.v6;
int i;
for (i = 0; i < 4; i++)
else
{
r->e.ip.dst = dest->address.v4;
- ip4prefix2mask(dest->mask, &r->e.ip.dmsk);
+ r->e.ip.dmsk = dest->mask.v4;
r->e.ip.dst.s_addr &= r->e.ip.dmsk.s_addr;
}
void
+fw3_ipt_rule_device(struct fw3_ipt_rule *r, const char *device, bool out)
+{
+ if (device) {
+ struct fw3_device dev = { .any = false };
+ strncpy(dev.name, device, sizeof(dev.name) - 1);
+ fw3_ipt_rule_in_out(r, (out) ? NULL : &dev, (out) ? &dev : NULL);
+ }
+}
+
+void
fw3_ipt_rule_mac(struct fw3_ipt_rule *r, struct fw3_mac *mac)
{
char buf[sizeof("ff:ff:ff:ff:ff:ff\0")];
+ uint8_t *addr = mac->mac.ether_addr_octet;
if (!mac)
return;
sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x",
- mac->mac[0], mac->mac[1], mac->mac[2],
- mac->mac[3], mac->mac[4], mac->mac[5]);
+ addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
fw3_ipt_rule_addarg(r, false, "-m", "mac");
fw3_ipt_rule_addarg(r, mac->invert, "--mac-source", buf);
static void
rule_print6(struct ip6t_entry *e)
{
- char buf[INET6_ADDRSTRLEN];
+ char buf1[INET6_ADDRSTRLEN], buf2[INET6_ADDRSTRLEN];
char *pname;
if (e->ipv6.flags & IP6T_F_PROTO)
{
- if (e->ipv6.flags & XT_INV_PROTO)
+ if (e->ipv6.invflags & XT_INV_PROTO)
printf(" !");
pname = get_protoname(container_of(e, struct fw3_ipt_rule, e6));
if (e->ipv6.iniface[0])
{
- if (e->ipv6.flags & IP6T_INV_VIA_IN)
+ if (e->ipv6.invflags & IP6T_INV_VIA_IN)
printf(" !");
printf(" -i %s", e->ipv6.iniface);
if (e->ipv6.outiface[0])
{
- if (e->ipv6.flags & IP6T_INV_VIA_OUT)
+ if (e->ipv6.invflags & IP6T_INV_VIA_OUT)
printf(" !");
printf(" -o %s", e->ipv6.outiface);
if (memcmp(&e->ipv6.src, &in6addr_any, sizeof(struct in6_addr)))
{
- if (e->ipv6.flags & IP6T_INV_SRCIP)
+ if (e->ipv6.invflags & IP6T_INV_SRCIP)
printf(" !");
- printf(" -s %s/%u", inet_ntop(AF_INET6, &e->ipv6.src, buf, sizeof(buf)),
- xtables_ip6mask_to_cidr(&e->ipv6.smsk));
+ printf(" -s %s/%s",
+ inet_ntop(AF_INET6, &e->ipv6.src, buf1, sizeof(buf1)),
+ inet_ntop(AF_INET6, &e->ipv6.smsk, buf2, sizeof(buf2)));
}
if (memcmp(&e->ipv6.dst, &in6addr_any, sizeof(struct in6_addr)))
{
- if (e->ipv6.flags & IP6T_INV_DSTIP)
+ if (e->ipv6.invflags & IP6T_INV_DSTIP)
printf(" !");
- printf(" -d %s/%u", inet_ntop(AF_INET6, &e->ipv6.dst, buf, sizeof(buf)),
- xtables_ip6mask_to_cidr(&e->ipv6.dmsk));
+ printf(" -d %s/%s",
+ inet_ntop(AF_INET6, &e->ipv6.dst, buf1, sizeof(buf1)),
+ inet_ntop(AF_INET6, &e->ipv6.dmsk, buf2, sizeof(buf2)));
}
}
#endif
rule_print4(struct ipt_entry *e)
{
struct in_addr in_zero = { 0 };
- char buf[sizeof("255.255.255.255\0")];
+ char buf1[sizeof("255.255.255.255\0")], buf2[sizeof("255.255.255.255\0")];
char *pname;
if (e->ip.proto)
{
- if (e->ip.flags & XT_INV_PROTO)
+ if (e->ip.invflags & XT_INV_PROTO)
printf(" !");
pname = get_protoname(container_of(e, struct fw3_ipt_rule, e));
if (e->ip.iniface[0])
{
- if (e->ip.flags & IPT_INV_VIA_IN)
+ if (e->ip.invflags & IPT_INV_VIA_IN)
printf(" !");
printf(" -i %s", e->ip.iniface);
if (e->ip.outiface[0])
{
- if (e->ip.flags & IPT_INV_VIA_OUT)
+ if (e->ip.invflags & IPT_INV_VIA_OUT)
printf(" !");
printf(" -o %s", e->ip.outiface);
if (memcmp(&e->ip.src, &in_zero, sizeof(struct in_addr)))
{
- if (e->ip.flags & IPT_INV_SRCIP)
+ if (e->ip.invflags & IPT_INV_SRCIP)
printf(" !");
- printf(" -s %s/%u", inet_ntop(AF_INET, &e->ip.src, buf, sizeof(buf)),
- xtables_ipmask_to_cidr(&e->ip.smsk));
+ printf(" -s %s/%s",
+ inet_ntop(AF_INET, &e->ip.src, buf1, sizeof(buf1)),
+ inet_ntop(AF_INET, &e->ip.smsk, buf2, sizeof(buf2)));
}
if (memcmp(&e->ip.dst, &in_zero, sizeof(struct in_addr)))
{
- if (e->ip.flags & IPT_INV_DSTIP)
+ if (e->ip.invflags & IPT_INV_DSTIP)
printf(" !");
- printf(" -d %s/%u", inet_ntop(AF_INET, &e->ip.dst, buf, sizeof(buf)),
- xtables_ipmask_to_cidr(&e->ip.dmsk));
+ printf(" -d %s/%s",
+ inet_ntop(AF_INET, &e->ip.dst, buf1, sizeof(buf1)),
+ inet_ntop(AF_INET, &e->ip.dmsk, buf2, sizeof(buf2)));
}
}
for (m = r->matches; m; m = m->next)
s += SZ(ip6t_entry_match) + m->match->size;
- s += SZ(ip6t_entry_target) + r->target->size;
+ s += SZ(ip6t_entry_target);
+ if (r->target)
+ s += r->target->size;
mask = fw3_alloc(s);
memset(mask, 0xFF, SZ(ip6t_entry));
p += SZ(ip6t_entry_match) + m->match->size;
}
- memset(p, 0xFF, SZ(ip6t_entry_target) + r->target->userspacesize);
+ memset(p, 0xFF, SZ(ip6t_entry_target) + (r->target) ? r->target->userspacesize : 0);
}
else
#endif
for (m = r->matches; m; m = m->next)
s += SZ(ipt_entry_match) + m->match->size;
- s += SZ(ipt_entry_target) + r->target->size;
+ s += SZ(ipt_entry_target);
+ if (r->target)
+ s += r->target->size;
mask = fw3_alloc(s);
memset(mask, 0xFF, SZ(ipt_entry));
p += SZ(ipt_entry_match) + m->match->size;
}
- memset(p, 0xFF, SZ(ipt_entry_target) + r->target->userspacesize);
+ memset(p, 0xFF, SZ(ipt_entry_target) + (r->target) ? r->target->userspacesize : 0);
}
return mask;
static void *
rule_build(struct fw3_ipt_rule *r)
{
- size_t s;
+ size_t s, target_size = (r->target) ? r->target->t->u.target_size : 0;
struct xtables_rule_match *m;
#ifndef DISABLE_IPV6
for (m = r->matches; m; m = m->next)
s += m->match->m->u.match_size;
- e6 = fw3_alloc(s + r->target->t->u.target_size);
+ e6 = fw3_alloc(s + target_size);
memcpy(e6, &r->e6, sizeof(struct ip6t_entry));
e6->target_offset = s;
- e6->next_offset = s + r->target->t->u.target_size;
+ e6->next_offset = s + target_size;
s = 0;
s += m->match->m->u.match_size;
}
- memcpy(e6->elems + s, r->target->t, r->target->t->u.target_size);
+ if (target_size)
+ memcpy(e6->elems + s, r->target->t, target_size);
return e6;
}
for (m = r->matches; m; m = m->next)
s += m->match->m->u.match_size;
- e = fw3_alloc(s + r->target->t->u.target_size);
+ e = fw3_alloc(s + target_size);
memcpy(e, &r->e, sizeof(struct ipt_entry));
e->target_offset = s;
- e->next_offset = s + r->target->t->u.target_size;
+ e->next_offset = s + target_size;
s = 0;
s += m->match->m->u.match_size;
}
- memcpy(e->elems + s, r->target->t, r->target->t->u.target_size);
+ if (target_size)
+ memcpy(e->elems + s, r->target->t, target_size);
return e;
}
struct xtables_globals *g;
int i, optc;
+ uint32_t id;
bool inv = false;
char buf[32];
va_list ap;
optind = 0;
opterr = 0;
+ if (r->id >= 0)
+ {
+ em = find_match(r, "id");
+
+ if (!em)
+ {
+ warn("fw3_ipt_rule_append(): Can't find match '%s'", "id");
+ goto free;
+ }
+
+ init_match(r, em, true);
+
+ id = FW3_ID_MAGIC | (r->id & ~FW3_ID_MASK);
+ memcpy(em->m->data, &id, sizeof(id));
+
+ em->mflags = 1;
+ }
+
while ((optc = getopt_long(r->argc, r->argv, "-:m:j:", g->opts,
NULL)) != -1)
{
projects / project / firewall3.git / blobdiff