interface-ip: Remove ip loop policy rules as kernel issue is fixed
[project/netifd.git] / interface-ip.c
index 62d15fd..6c152b6 100644 (file)
@@ -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);
 }
 
-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)
 {
@@ -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;
 
+       if (addr->flags & DEVADDR_OFFLINK)
+               return;
+
        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);
 
-               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 {
-               if (!(addr->flags & DEVADDR_OFFLINK))
-                       system_del_route(dev, &route);
+               system_del_route(dev, &route);
        }
 }
 
@@ -562,7 +545,7 @@ interface_update_proto_addr(struct vlist_tree *tree,
                                }
                        }
 
-                       if ((a_new->flags & DEVADDR_OFFLINK) || iface->metric)
+                       if (iface->metric)
                                interface_handle_subnet_route(iface, a_new, true);
                }
        }
@@ -648,6 +631,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,
@@ -660,20 +693,28 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
        struct device *l3_downlink = iface->l3_dev.dev;
 
        struct device_addr addr;
+       struct device_route route;
        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.flags = DEVADDR_INET6;
+       addr.flags = DEVADDR_INET6 | DEVADDR_OFFLINK;
        addr.preferred_until = prefix->preferred_until;
        addr.valid_until = prefix->valid_until;
 
-       if (addr.mask < 64) {
-               addr.mask = 64;
-               system_del_address(l3_downlink, &addr);
-               addr.mask = assignment->length;
-       }
+       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();
@@ -681,8 +722,6 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
                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
-
                if (prefix->iface) {
                        if (prefix->iface->ip6table)
                                set_ip_source_policy(false, true, IPRULE_PRIORITY_NW, &addr.addr,
@@ -692,16 +731,12 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
                                                        addr.mask, 0, iface, "unreachable");
                }
 
-               if (addr.mask < 64)
-                       addr.mask = 64;
-
-               interface_handle_subnet_route(iface, &addr, false);
+               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)) {
-               interface_handle_subnet_route(iface, &addr, false);
 
                if (prefix->iface && !assignment->enabled) {
                        set_ip_source_policy(true, true, IPRULE_PRIORITY_REJECT, &addr.addr,
@@ -712,15 +747,14 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
                                                addr.mask, prefix->iface->ip6table, iface, NULL);
                }
 
-               if (addr.mask < 64)
-                       addr.mask = 64;
+               route.metric = iface->metric;
+               system_add_route(l3_downlink, &route);
 
-               interface_handle_subnet_route(iface, &addr, true);
+               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 (uplink && uplink->l3_dev.dev) {
-                       int mtu = system_update_ipv6_mtu(
-                                       uplink->l3_dev.dev, 0);
-                       if (mtu > 0)
+                       if (mtu > 0 && mtu_old > mtu)
                                system_update_ipv6_mtu(l3_downlink, mtu);
                }
 
@@ -775,6 +809,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->addr = in6addr_any;
        list_add(&c->head, &prefix->assignments);
 
        // Excluded prefix
@@ -784,6 +819,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->addr = in6addr_any;
                memcpy(c->name, name, sizeof(name));
                list_add(&c->head, &prefix->assignments);
        }
@@ -815,6 +851,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->addr = in6addr_any;
                c->enabled = false;
                memcpy(c->name, iface->name, namelen);
 
@@ -1154,9 +1191,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 interface *iface;
 
        ip->enabled = enabled;
-       dev = ip->iface->l3_dev.dev;
+       iface = ip->iface;
+       dev = iface->l3_dev.dev;
        if (!dev)
                return;
 
@@ -1164,10 +1203,14 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
                if (addr->enabled == enabled)
                        continue;
 
-               if (enabled)
+               if (enabled) {
                        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);
+               }
                addr->enabled = enabled;
        }
 
@@ -1198,13 +1241,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 (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");
-       }
 }
 
 void