ubus: store rule origin as comment

[project/firewall3.git] / iptables.c

diff --git a/iptables.c b/iptables.c
index df0d704..ca84761 100644 (file)
--- a/iptables.c
+++ b/iptables.c
@@ -606,31 +606,6 @@ fw3_ipt_rule_in_out(struct fw3_ipt_rule *r,
 }
 
 
-static void
-ip4prefix2mask(int prefix, struct in_addr *mask)
-{
-       mask->s_addr = htonl(~((1 << (32 - prefix)) - 1));
-}
-
-#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)
@@ -645,13 +620,13 @@ fw3_ipt_rule_src_dest(struct fw3_ipt_rule *r,
                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++)
@@ -664,7 +639,7 @@ fw3_ipt_rule_src_dest(struct fw3_ipt_rule *r,
                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;
 
@@ -678,13 +653,13 @@ fw3_ipt_rule_src_dest(struct fw3_ipt_rule *r,
                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++)
@@ -697,7 +672,7 @@ fw3_ipt_rule_src_dest(struct fw3_ipt_rule *r,
                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;
 
@@ -741,13 +716,29 @@ fw3_ipt_rule_sport_dport(struct fw3_ipt_rule *r,
 }
 
 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",
+               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", ether_ntoa(&mac->mac));
+       fw3_ipt_rule_addarg(r, mac->invert, "--mac-source", buf);
 }
 
 void
@@ -984,7 +975,7 @@ fw3_ipt_rule_extra(struct fw3_ipt_rule *r, const char *extra)
 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)
@@ -1021,8 +1012,9 @@ rule_print6(struct ip6t_entry *e)
                if (e->ipv6.flags & 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)))
@@ -1030,8 +1022,9 @@ rule_print6(struct ip6t_entry *e)
                if (e->ipv6.flags & 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
@@ -1040,7 +1033,7 @@ static void
 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)
@@ -1077,8 +1070,9 @@ rule_print4(struct ipt_entry *e)
                if (e->ip.flags & 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)))
@@ -1086,8 +1080,9 @@ rule_print4(struct ipt_entry *e)
                if (e->ip.flags & 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)));
        }
 }
 
@@ -1204,7 +1199,9 @@ rule_mask(struct fw3_ipt_rule *r)
                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));
@@ -1216,7 +1213,7 @@ rule_mask(struct fw3_ipt_rule *r)
                        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
@@ -1226,7 +1223,9 @@ rule_mask(struct fw3_ipt_rule *r)
                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));
@@ -1238,7 +1237,7 @@ rule_mask(struct fw3_ipt_rule *r)
                        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;
@@ -1247,7 +1246,7 @@ rule_mask(struct fw3_ipt_rule *r)
 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
@@ -1260,12 +1259,12 @@ rule_build(struct fw3_ipt_rule *r)
                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;
 
@@ -1275,7 +1274,8 @@ rule_build(struct fw3_ipt_rule *r)
                        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;
        }
@@ -1289,12 +1289,12 @@ rule_build(struct fw3_ipt_rule *r)
                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;
 
@@ -1304,7 +1304,8 @@ rule_build(struct fw3_ipt_rule *r)
                        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;
        }