firewall3: fix left shift on 64 bit systems in fw3_bitlen2netmask

[project/firewall3.git] / utils.c

diff --git a/utils.c b/utils.c
index fa4a73f..b2fbe02 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -414,13 +414,14 @@ write_defaults_uci(struct uci_context *ctx, struct fw3_defaults *d,
 
 static void
 write_zone_uci(struct uci_context *ctx, struct fw3_zone *z,
 
 static void
 write_zone_uci(struct uci_context *ctx, struct fw3_zone *z,

-               struct uci_package *dest)
+               struct uci_package *dest, struct ifaddrs *ifaddr)

 {
        struct fw3_device *dev;
        struct fw3_address *sub;
 {
        struct fw3_device *dev;
        struct fw3_address *sub;

+       struct ifaddrs *ifa;

        enum fw3_family fam = FW3_FAMILY_ANY;
 
        enum fw3_family fam = FW3_FAMILY_ANY;
 

-       char *p, buf[34];
+       char *p, buf[INET6_ADDRSTRLEN];

 
        struct uci_ptr ptr = { .p = dest };
 
 
        struct uci_ptr ptr = { .p = dest };
 


@@ -518,6 +519,35 @@ write_zone_uci(struct uci_context *ctx, struct fw3_zone *z,
                uci_add_list(ctx, &ptr);
        }
 
                uci_add_list(ctx, &ptr);
        }
 

+       ptr.o      = NULL;
+       ptr.option = "__addrs";
+
+       fw3_foreach(dev, &z->devices)
+       {
+               if (!dev)
+                       continue;
+
+               for (ifa = ifaddr; ifa; ifa = ifa->ifa_next)
+               {
+                       if (!ifa->ifa_addr || strcmp(dev->name, ifa->ifa_name))
+                               continue;
+
+                       if (ifa->ifa_addr->sa_family == AF_INET)
+                               inet_ntop(AF_INET,
+                                         &((struct sockaddr_in *)ifa->ifa_addr)->sin_addr,
+                                         buf, sizeof(buf));
+                       else if (ifa->ifa_addr->sa_family == AF_INET6)
+                               inet_ntop(AF_INET6,
+                                         &((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr,
+                                         buf, sizeof(buf));
+                       else
+                               continue;
+
+                       ptr.value = buf;
+                       uci_add_list(ctx, &ptr);
+               }
+       }
+

        sprintf(buf, "0x%x", z->flags[0]);
        ptr.o      = NULL;
        ptr.option = "__flags_v4";
        sprintf(buf, "0x%x", z->flags[0]);
        ptr.o      = NULL;
        ptr.option = "__flags_v4";


@@ -590,6 +620,7 @@ fw3_write_statefile(void *state)
        struct fw3_state *s = state;
        struct fw3_zone *z;
        struct fw3_ipset *i;
        struct fw3_state *s = state;
        struct fw3_zone *z;
        struct fw3_ipset *i;

+       struct ifaddrs *ifaddr;

 
        struct uci_package *p;
 
 
        struct uci_package *p;
 


@@ -608,6 +639,12 @@ fw3_write_statefile(void *state)
                        return;
                }
 
                        return;
                }
 

+               if (getifaddrs(&ifaddr))
+               {
+                       warn("Cannot get interface addresses: %s", strerror(errno));
+                       ifaddr = NULL;
+               }
+

                if ((p = uci_lookup_package(s->uci, "fw3_state")) != NULL)
                        uci_unload(s->uci, p);
 
                if ((p = uci_lookup_package(s->uci, "fw3_state")) != NULL)
                        uci_unload(s->uci, p);
 


@@ -618,7 +655,7 @@ fw3_write_statefile(void *state)
                        write_defaults_uci(s->uci, &s->defaults, p);
 
                        list_for_each_entry(z, &s->zones, list)
                        write_defaults_uci(s->uci, &s->defaults, p);
 
                        list_for_each_entry(z, &s->zones, list)

-                               write_zone_uci(s->uci, z, p);
+                               write_zone_uci(s->uci, z, p, ifaddr);

 
                        list_for_each_entry(i, &s->ipsets, list)
                                write_ipset_uci(s->uci, i, p);
 
                        list_for_each_entry(i, &s->ipsets, list)
                                write_ipset_uci(s->uci, i, p);


@@ -629,6 +666,9 @@ fw3_write_statefile(void *state)
 
                fsync(fileno(sf));
                fclose(sf);
 
                fsync(fileno(sf));
                fclose(sf);

+
+               if (ifaddr)
+                       freeifaddrs(ifaddr);

        }
 }
 
        }
 }
 


@@ -734,6 +774,7 @@ bool
 fw3_bitlen2netmask(int family, int bits, void *mask)
 {
        int i;
 fw3_bitlen2netmask(int family, int bits, void *mask)
 {
        int i;

+       uint8_t rem, b;

        struct in_addr *v4;
        struct in6_addr *v6;
 
        struct in_addr *v4;
        struct in6_addr *v6;
 


@@ -743,14 +784,17 @@ fw3_bitlen2netmask(int family, int bits, void *mask)
                        return false;
 
                v6 = mask;
                        return false;
 
                v6 = mask;

-               i = abs(bits);
+               rem = abs(bits);

 
 

-               memset(v6->s6_addr, 0xff, i / 8);
-               memset(v6->s6_addr + (i / 8) + 1, 0, (128 - i) / 8);
-               v6->s6_addr[i / 8] = 0xff << (8 - (i & 7));
+               for (i = 0; i < sizeof(v6->s6_addr); i++)
+               {
+                       b = (rem > 8) ? 8 : rem;
+                       v6->s6_addr[i] = (uint8_t)(0xFF << (8 - b));
+                       rem -= b;
+               }

 
                if (bits < 0)
 
                if (bits < 0)

-                       for (i = 0; i < 16; i++)
+                       for (i = 0; i < sizeof(v6->s6_addr); i++)

                                v6->s6_addr[i] = ~v6->s6_addr[i];
        }
        else
                                v6->s6_addr[i] = ~v6->s6_addr[i];
        }
        else


@@ -759,7 +803,7 @@ fw3_bitlen2netmask(int family, int bits, void *mask)
                        return false;
 
                v4 = mask;
                        return false;
 
                v4 = mask;

-               v4->s_addr = htonl(~((1 << (32 - abs(bits))) - 1));
+               v4->s_addr = bits ? htonl(~((1 << (32 - abs(bits))) - 1)) : 0;

 
                if (bits < 0)
                        v4->s_addr = ~v4->s_addr;
 
                if (bits < 0)
                        v4->s_addr = ~v4->s_addr;


@@ -767,3 +811,87 @@ fw3_bitlen2netmask(int family, int bits, void *mask)
 
        return true;
 }
 
        return true;
 }

+
+void
+fw3_flush_conntrack(void *state)
+{
+       bool found;
+       struct fw3_state *s = state;
+       struct fw3_address *addr;
+       struct fw3_device *dev;
+       struct fw3_zone *zone;
+       struct ifaddrs *ifaddr, *ifa;
+       struct sockaddr_in *sin;
+       struct sockaddr_in6 *sin6;
+       char buf[INET6_ADDRSTRLEN];
+       FILE *ct;
+
+       if (!state)
+       {
+               if ((ct = fopen("/proc/net/nf_conntrack", "w")) != NULL)
+               {
+                       info(" * Flushing conntrack table ...");
+
+                       fwrite("f\n", 1, 2, ct);
+                       fclose(ct);
+               }
+
+               return;
+       }
+
+       if (getifaddrs(&ifaddr))
+       {
+               warn("Cannot get interface addresses: %s", strerror(errno));
+               return;
+       }
+
+       if ((ct = fopen("/proc/net/nf_conntrack", "w")) != NULL)
+       {
+               list_for_each_entry(zone, &s->zones, list)
+               list_for_each_entry(addr, &zone->old_addrs, list)
+               {
+                       found = false;
+
+                       list_for_each_entry(dev, &zone->devices, list)
+                       {
+                               for (ifa = ifaddr; ifa && !found; ifa = ifa->ifa_next)
+                               {
+                                       if (!ifa->ifa_addr || strcmp(dev->name, ifa->ifa_name))
+                                               continue;
+
+                                       sin = (struct sockaddr_in *)ifa->ifa_addr;
+                                       sin6 = (struct sockaddr_in6 *)ifa->ifa_addr;
+
+                                       if (addr->family == FW3_FAMILY_V4 &&
+                                               sin->sin_family == AF_INET)
+                                       {
+                                               found = !memcmp(&addr->address.v4, &sin->sin_addr,
+                                                                               sizeof(sin->sin_addr));
+                                       }
+                                       else if (addr->family == FW3_FAMILY_V6 &&
+                                                        sin6->sin6_family == AF_INET6)
+                                       {
+                                               found = !memcmp(&addr->address.v6, &sin6->sin6_addr,
+                                                                               sizeof(sin6->sin6_addr));
+                                       }
+                               }
+
+                               if (found)
+                                       break;
+                       }
+
+                       if (!found)
+                       {
+                               inet_ntop(addr->family == FW3_FAMILY_V4 ? AF_INET : AF_INET6,
+                                                 &addr->address.v4, buf, sizeof(buf));
+
+                               info(" * Flushing conntrack: %s", buf);
+                               fprintf(ct, "%s\n", buf);
+                       }
+               }
+
+               fclose(ct);
+       }
+
+       freeifaddrs(ifaddr);
+}