interface-ip: Fix broadcast address when using /31 or /32 IPv4 addressing

[project/netifd.git] / interface-ip.c

diff --git a/interface-ip.c b/interface-ip.c
index 587826a..54f56d6 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -75,8 +75,8 @@ clear_if_addr(union if_addr *a, int mask)
        uint8_t m_clear = (1 << (m_bytes * 8 - mask)) - 1;
        uint8_t *p = (uint8_t *) a;
 
        uint8_t m_clear = (1 << (m_bytes * 8 - mask)) - 1;
        uint8_t *p = (uint8_t *) a;
 

-       if (m_bytes < sizeof(a))
-               memset(p + m_bytes, 0, sizeof(a) - m_bytes);
+       if (m_bytes < sizeof(*a))
+               memset(p + m_bytes, 0, sizeof(*a) - m_bytes);

 
        p[m_bytes - 1] &= ~m_clear;
 }
 
        p[m_bytes - 1] &= ~m_clear;
 }


@@ -133,23 +133,6 @@ static int set_ip_source_policy(bool add, bool v6, unsigned int priority,
        return (add) ? system_add_iprule(&rule) : system_del_iprule(&rule);
 }
 
        return (add) ? system_add_iprule(&rule) : system_del_iprule(&rule);
 }
 

-static int set_ip_lo_policy(bool add, bool v6, struct interface *iface)
-{
-       struct iprule rule = {
-               .flags = IPRULE_IN | IPRULE_LOOKUP | IPRULE_PRIORITY,
-               .priority = IPRULE_PRIORITY_NW + iface->l3_dev.dev->ifindex,
-               .lookup = (v6) ? iface->ip6table : iface->ip4table,
-               .in_dev = "lo"
-       };
-
-       if (!rule.lookup)
-               return 0;
-
-       rule.flags |= (v6) ? IPRULE_INET6 : IPRULE_INET4;
-
-       return (add) ? system_add_iprule(&rule) : system_del_iprule(&rule);
-}
-

 static bool
 __find_ip_addr_target(struct interface_ip_settings *ip, union if_addr *a, bool v6)
 {
 static bool
 __find_ip_addr_target(struct interface_ip_settings *ip, union if_addr *a, bool v6)
 {


@@ -442,6 +425,9 @@ interface_handle_subnet_route(struct interface *iface, struct device_addr *addr,
        struct device *dev = iface->l3_dev.dev;
        struct device_route route;
 
        struct device *dev = iface->l3_dev.dev;
        struct device_route route;
 

+       if (addr->flags & DEVADDR_OFFLINK)
+               return;
+

        memset(&route, 0, sizeof(route));
        route.iface = iface;
        route.flags = addr->flags;
        memset(&route, 0, sizeof(route));
        route.iface = iface;
        route.flags = addr->flags;


@@ -453,14 +439,11 @@ interface_handle_subnet_route(struct interface *iface, struct device_addr *addr,
                route.flags |= DEVADDR_KERNEL;
                system_del_route(dev, &route);
 
                route.flags |= DEVADDR_KERNEL;
                system_del_route(dev, &route);
 

-               if (!(addr->flags & DEVADDR_OFFLINK)) {
-                       route.flags &= ~DEVADDR_KERNEL;
-                       route.metric = iface->metric;
-                       system_add_route(dev, &route);
-               }
+               route.flags &= ~DEVADDR_KERNEL;
+               route.metric = iface->metric;
+               system_add_route(dev, &route);

        } else {
        } else {

-               if (!(addr->flags & DEVADDR_OFFLINK))
-                       system_del_route(dev, &route);
+               system_del_route(dev, &route);

        }
 }
 
        }
 }
 


@@ -490,11 +473,17 @@ interface_update_proto_addr(struct vlist_tree *tree,
                if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET4 &&
                    !a_new->broadcast) {
 
                if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET4 &&
                    !a_new->broadcast) {
 

-                       uint32_t mask = ~0;
-                       uint32_t *a = (uint32_t *) &a_new->addr;
+                       /* /31 and /32 addressing need 255.255.255.255
+                        * as broadcast address. */
+                       if (a_new->mask >= 31) {
+                               a_new->broadcast = (uint32_t) ~0;
+                       } else {
+                               uint32_t mask = ~0;
+                               uint32_t *a = (uint32_t *) &a_new->addr;

 
 

-                       mask >>= a_new->mask;
-                       a_new->broadcast = *a | htonl(mask);
+                               mask >>= a_new->mask;
+                               a_new->broadcast = *a | htonl(mask);
+                       }

                }
        }
 
                }
        }
 


@@ -517,9 +506,7 @@ interface_update_proto_addr(struct vlist_tree *tree,
        }
 
        if (node_old) {
        }
 
        if (node_old) {

-               if (!(a_old->flags & DEVADDR_EXTERNAL) && a_old->enabled && !keep) {
-                       interface_handle_subnet_route(iface, a_old, false);
-
+               if (a_old->enabled && !keep) {

                        if ((a_old->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
                                v6 = true;
 
                        if ((a_old->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
                                v6 = true;
 


@@ -532,11 +519,16 @@ interface_update_proto_addr(struct vlist_tree *tree,
                        if (table) {
                                set_ip_source_policy(false, v6, IPRULE_PRIORITY_ADDR, &a_old->addr,
                                                (v6) ? 128 : 32, table, NULL, NULL);
                        if (table) {
                                set_ip_source_policy(false, v6, IPRULE_PRIORITY_ADDR, &a_old->addr,
                                                (v6) ? 128 : 32, table, NULL, NULL);

-                               set_ip_source_policy(false, v6, IPRULE_PRIORITY_NW, &a_old->addr,
-                                               a_old->mask, table, NULL, NULL);
+
+                               if (a_old->mask != ((v6) ? 128 : 32))
+                                       set_ip_source_policy(false, v6, IPRULE_PRIORITY_NW, &a_old->addr,
+                                                       a_old->mask, table, NULL, NULL);

                        }
 
                        }
 

-                       system_del_address(dev, a_old);
+                       if (!(a_old->flags & DEVADDR_EXTERNAL)) {
+                               interface_handle_subnet_route(iface, a_old, false);
+                               system_del_address(dev, a_old);
+                       }

                }
                free(a_old->pclass);
                free(a_old);
                }
                free(a_old->pclass);
                free(a_old);


@@ -544,9 +536,14 @@ interface_update_proto_addr(struct vlist_tree *tree,
 
        if (node_new) {
                a_new->enabled = true;
 
        if (node_new) {
                a_new->enabled = true;

-               if (!(a_new->flags & DEVADDR_EXTERNAL) && (!keep || replace)) {
-                       if (system_add_address(dev, a_new))
-                               a_new->failed = true;
+               if (!keep || replace) {
+                       if (!(a_new->flags & DEVADDR_EXTERNAL)) {
+                               if (system_add_address(dev, a_new))
+                                       a_new->failed = true;
+
+                               if (iface->metric)
+                                       interface_handle_subnet_route(iface, a_new, true);
+                       }

 
                        if (!keep) {
                                if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)
 
                        if (!keep) {
                                if ((a_new->flags & DEVADDR_FAMILY) == DEVADDR_INET6)


@@ -557,13 +554,12 @@ interface_update_proto_addr(struct vlist_tree *tree,
                                if (table) {
                                        set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &a_new->addr,
                                                        (v6) ? 128 : 32, table, NULL, NULL);
                                if (table) {
                                        set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &a_new->addr,
                                                        (v6) ? 128 : 32, table, NULL, NULL);

-                                       set_ip_source_policy(true, v6, IPRULE_PRIORITY_NW, &a_new->addr,
-                                                       a_new->mask, table, NULL, NULL);
+
+                                       if (a_new->mask != ((v6) ? 128 : 32))
+                                               set_ip_source_policy(true, v6, IPRULE_PRIORITY_NW, &a_new->addr,
+                                                               a_new->mask, table, NULL, NULL);

                                }
                        }
                                }
                        }

-
-                       if ((a_new->flags & DEVADDR_OFFLINK) || iface->metric)
-                               interface_handle_subnet_route(iface, a_new, true);

                }
        }
 }
                }
        }
 }


@@ -648,6 +644,56 @@ interface_update_host_route(struct vlist_tree *tree,
        }
 }
 
        }
 }
 

+static void
+random_ifaceid(struct in6_addr *addr)
+{
+       static bool initialized = false;
+       struct timeval t;
+
+       if (!initialized) {
+               long int seed = 0;
+               gettimeofday(&t, NULL);
+               seed = t.tv_sec ^ t.tv_usec ^ getpid();
+               srand48(seed);
+               initialized = true;
+       }
+       addr->s6_addr32[2] = (uint32_t)mrand48();
+       addr->s6_addr32[3] = (uint32_t)mrand48();
+}
+
+static void
+eui64_ifaceid(struct interface *iface, struct in6_addr *addr)
+{
+       /* get mac address */
+       uint8_t *macaddr = iface->l3_dev.dev->settings.macaddr;
+       uint8_t *ifaceid = addr->s6_addr + 8;
+       memcpy(ifaceid,macaddr,3);
+       memcpy(ifaceid + 5,macaddr + 3, 3);
+       ifaceid[3] = 0xff;
+       ifaceid[4] = 0xfe;
+       ifaceid[0] ^= 0x02;
+}
+
+static void
+generate_ifaceid(struct interface *iface, struct in6_addr *addr)
+{
+       /* generate new iface id */
+       switch (iface->assignment_iface_id_selection) {
+       case IFID_FIXED:
+               /* fixed */
+               /* copy host part from assignment_fixed_iface_id */
+               memcpy(addr->s6_addr + 8, iface->assignment_fixed_iface_id.s6_addr + 8, 8);
+               break;
+       case IFID_RANDOM:
+               /* randomize last 64 bits */
+               random_ifaceid(addr);
+               break;
+       case IFID_EUI64:
+               /* eui64 */
+               eui64_ifaceid(iface, addr);
+               break;
+       }
+}

 
 static void
 interface_set_prefix_address(struct device_prefix_assignment *assignment,
 
 static void
 interface_set_prefix_address(struct device_prefix_assignment *assignment,


@@ -660,22 +706,35 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
        struct device *l3_downlink = iface->l3_dev.dev;
 
        struct device_addr addr;
        struct device *l3_downlink = iface->l3_dev.dev;
 
        struct device_addr addr;

+       struct device_route route;

        memset(&addr, 0, sizeof(addr));
        memset(&addr, 0, sizeof(addr));

-       addr.addr.in6 = prefix->addr;
-       addr.addr.in6.s6_addr32[1] |= htonl(assignment->assigned);
-       addr.addr.in6.s6_addr[15] += 1;
+       memset(&route, 0, sizeof(route));
+
+       if (IN6_IS_ADDR_UNSPECIFIED(&assignment->addr)) {
+               addr.addr.in6 = prefix->addr;
+               addr.addr.in6.s6_addr32[1] |= htonl(assignment->assigned);
+               generate_ifaceid(iface, &addr.addr.in6);
+               assignment->addr = addr.addr.in6;
+       }
+       else
+               addr.addr.in6 = assignment->addr;
+

        addr.mask = assignment->length;
        addr.mask = assignment->length;

-       addr.flags = DEVADDR_INET6;
+       addr.flags = DEVADDR_INET6 | DEVADDR_OFFLINK;

        addr.preferred_until = prefix->preferred_until;
        addr.valid_until = prefix->valid_until;
 
        addr.preferred_until = prefix->preferred_until;
        addr.valid_until = prefix->valid_until;
 

+       route.flags = DEVADDR_INET6;
+       route.mask = addr.mask < 64 ? 64 : addr.mask;
+       route.addr = addr.addr;
+       clear_if_addr(&route.addr, route.mask);
+

        if (!add && assignment->enabled) {
                time_t now = system_get_rtime();
                addr.preferred_until = now;
                if (!addr.valid_until || addr.valid_until - now > 7200)
                        addr.valid_until = now + 7200;
        if (!add && assignment->enabled) {
                time_t now = system_get_rtime();
                addr.preferred_until = now;
                if (!addr.valid_until || addr.valid_until - now > 7200)
                        addr.valid_until = now + 7200;

-               system_del_address(l3_downlink, &addr); // Work around dangling prefix routes
-               system_add_address(l3_downlink, &addr);
+

                if (prefix->iface) {
                        if (prefix->iface->ip6table)
                                set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &addr.addr,
                if (prefix->iface) {
                        if (prefix->iface->ip6table)
                                set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &addr.addr,


@@ -685,9 +744,13 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
                                                        addr.mask, 0, iface, "unreachable");
                }
 
                                                        addr.mask, 0, iface, "unreachable");
                }
 

+               system_del_route(l3_downlink, &route);
+               system_add_address(l3_downlink, &addr);
+

                assignment->enabled = false;
        } else if (add && (iface->state == IFS_UP || iface->state == IFS_SETUP) &&
                        !system_add_address(l3_downlink, &addr)) {
                assignment->enabled = false;
        } else if (add && (iface->state == IFS_UP || iface->state == IFS_SETUP) &&
                        !system_add_address(l3_downlink, &addr)) {

+

                if (prefix->iface && !assignment->enabled) {
                        set_ip_source_policy(true, true, IPRULE_PRIORITY_REJECT, &addr.addr,
                                        addr.mask, 0, iface, "unreachable");
                if (prefix->iface && !assignment->enabled) {
                        set_ip_source_policy(true, true, IPRULE_PRIORITY_REJECT, &addr.addr,
                                        addr.mask, 0, iface, "unreachable");


@@ -696,12 +759,18 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
                                set_ip_source_policy(true, true, IPRULE_PRIORITY_NW, &addr.addr,
                                                addr.mask, prefix->iface->ip6table, iface, NULL);
                }
                                set_ip_source_policy(true, true, IPRULE_PRIORITY_NW, &addr.addr,
                                                addr.mask, prefix->iface->ip6table, iface, NULL);
                }

-               if (uplink && uplink->l3_dev.dev) {
-                       int mtu = system_update_ipv6_mtu(
-                                       uplink->l3_dev.dev, 0);
-                       if (mtu > 0)
+
+               route.metric = iface->metric;
+               system_add_route(l3_downlink, &route);
+
+               if (uplink && uplink->l3_dev.dev && !(l3_downlink->settings.flags & DEV_OPT_MTU6)) {
+                       int mtu = system_update_ipv6_mtu(uplink->l3_dev.dev, 0);
+                       int mtu_old = system_update_ipv6_mtu(l3_downlink, 0);
+
+                       if (mtu > 0 && mtu_old > mtu)

                                system_update_ipv6_mtu(l3_downlink, mtu);
                }
                                system_update_ipv6_mtu(l3_downlink, mtu);
                }

+

                assignment->enabled = true;
        }
 }
                assignment->enabled = true;
        }
 }


@@ -753,6 +822,7 @@ static void interface_update_prefix_assignments(struct device_prefix *prefix, bo
        c->assigned = 1 << (64 - prefix->length);
        c->length = 64;
        c->name[0] = 0;
        c->assigned = 1 << (64 - prefix->length);
        c->length = 64;
        c->name[0] = 0;

+       c->addr = in6addr_any;

        list_add(&c->head, &prefix->assignments);
 
        // Excluded prefix
        list_add(&c->head, &prefix->assignments);
 
        // Excluded prefix


@@ -762,6 +832,7 @@ static void interface_update_prefix_assignments(struct device_prefix *prefix, bo
                c->assigned = ntohl(prefix->excl_addr.s6_addr32[1]) &
                                ((1 << (64 - prefix->length)) - 1);
                c->length = prefix->excl_length;
                c->assigned = ntohl(prefix->excl_addr.s6_addr32[1]) &
                                ((1 << (64 - prefix->length)) - 1);
                c->length = prefix->excl_length;

+               c->addr = in6addr_any;

                memcpy(c->name, name, sizeof(name));
                list_add(&c->head, &prefix->assignments);
        }
                memcpy(c->name, name, sizeof(name));
                list_add(&c->head, &prefix->assignments);
        }


@@ -793,6 +864,7 @@ static void interface_update_prefix_assignments(struct device_prefix *prefix, bo
                c = malloc(sizeof(*c) + namelen);
                c->length = iface->assignment_length;
                c->assigned = iface->assignment_hint;
                c = malloc(sizeof(*c) + namelen);
                c->length = iface->assignment_length;
                c->assigned = iface->assignment_hint;

+               c->addr = in6addr_any;

                c->enabled = false;
                memcpy(c->name, iface->name, namelen);
 
                c->enabled = false;
                memcpy(c->name, iface->name, namelen);
 


@@ -1132,9 +1204,11 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
        struct device_addr *addr;
        struct device_route *route;
        struct device *dev;
        struct device_addr *addr;
        struct device_route *route;
        struct device *dev;

+       struct interface *iface;

 
        ip->enabled = enabled;
 
        ip->enabled = enabled;

-       dev = ip->iface->l3_dev.dev;
+       iface = ip->iface;
+       dev = iface->l3_dev.dev;

        if (!dev)
                return;
 
        if (!dev)
                return;
 


@@ -1142,10 +1216,14 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
                if (addr->enabled == enabled)
                        continue;
 
                if (addr->enabled == enabled)
                        continue;
 

-               if (enabled)
+               if (enabled) {

                        system_add_address(dev, addr);
                        system_add_address(dev, addr);

-               else
+                       if (iface->metric)
+                               interface_handle_subnet_route(iface, addr, true);
+               } else {
+                       interface_handle_subnet_route(iface, addr, false);

                        system_del_address(dev, addr);
                        system_del_address(dev, addr);

+               }

                addr->enabled = enabled;
        }
 
                addr->enabled = enabled;
        }
 


@@ -1162,6 +1240,15 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
                        if (!(route->flags & DEVROUTE_METRIC))
                                route->metric = ip->iface->metric;
 
                        if (!(route->flags & DEVROUTE_METRIC))
                                route->metric = ip->iface->metric;
 

+                       if (!(route->flags & DEVROUTE_TABLE)) {
+                               route->flags &= ~DEVROUTE_SRCTABLE;
+                               route->table = ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET6) ?
+                                                       iface->ip6table : iface->ip4table;
+
+                               if (route->table)
+                                       route->flags |= DEVROUTE_SRCTABLE;
+                       }
+

                        if (system_add_route(dev, route))
                                route->failed = true;
                } else
                        if (system_add_route(dev, route))
                                route->failed = true;
                } else


@@ -1176,13 +1263,9 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
                        if (!strcmp(a->name, ip->iface->name))
                                interface_set_prefix_address(a, c, ip->iface, enabled);
 
                        if (!strcmp(a->name, ip->iface->name))
                                interface_set_prefix_address(a, c, ip->iface, enabled);
 

-       if (ip->iface && ip->iface->l3_dev.dev) {
-               set_ip_lo_policy(enabled, true, ip->iface);
-               set_ip_lo_policy(enabled, false, ip->iface);
-
+       if (ip->iface && ip->iface->l3_dev.dev)

                set_ip_source_policy(enabled, true, IPRULE_PRIORITY_REJECT + ip->iface->l3_dev.dev->ifindex,
                        NULL, 0, 0, ip->iface, "failed_policy");
                set_ip_source_policy(enabled, true, IPRULE_PRIORITY_REJECT + ip->iface->l3_dev.dev->ifindex,
                        NULL, 0, 0, ip->iface, "failed_policy");

-       }

 }
 
 void
 }
 
 void