nterface-ip: remove superfluous iface check in interface_ip_set_enabled()

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

diff --git a/interface-ip.c b/interface-ip.c
index 716a093..1e49fe6 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -204,7 +204,7 @@ __find_ip_route_target(struct interface_ip_settings *ip, union if_addr *a,
                if (route->flags & DEVROUTE_TABLE)
                        continue;
 
-               if (!*res || route->mask < (*res)->mask)
+               if (!*res || route->mask > (*res)->mask)
                        *res = route;
        }
 }
@@ -229,23 +229,17 @@ interface_ip_add_target_route(union if_addr *addr, bool v6, struct interface *if
 {
        struct device_route *route, *r_next = NULL;
        bool defaultroute_target = false;
+       union if_addr addr_zero;
        int addrsize = v6 ? sizeof(addr->in6) : sizeof(addr->in);
 
-       route = calloc(1, sizeof(*route));
-       if (!route)
-               return NULL;
-
-       route->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4;
-       route->mask = v6 ? 128 : 32;
-       if (memcmp(&route->addr, addr, addrsize) == 0)
+       memset(&addr_zero, 0, sizeof(addr_zero));
+       if (memcmp(&addr_zero, addr, addrsize) == 0)
                defaultroute_target = true;
-       else
-               memcpy(&route->addr, addr, addrsize);
 
        if (iface) {
                /* look for locally addressable target first */
                if (interface_ip_find_addr_target(iface, addr, v6))
-                       goto done;
+                       return iface;
 
                /* do not stop at the first route, let the lookup compare
                 * masks to find the best match */
@@ -254,7 +248,7 @@ interface_ip_add_target_route(union if_addr *addr, bool v6, struct interface *if
                vlist_for_each_element(&interfaces, iface, node) {
                        /* look for locally addressable target first */
                        if (interface_ip_find_addr_target(iface, addr, v6))
-                               goto done;
+                               return iface;
 
                        /* do not stop at the first route, let the lookup compare
                         * masks to find the best match */
@@ -262,23 +256,27 @@ interface_ip_add_target_route(union if_addr *addr, bool v6, struct interface *if
                }
        }
 
-       if (!r_next) {
-               free(route);
+       if (!r_next)
                return NULL;
-       }
 
        iface = r_next->iface;
+       if (defaultroute_target)
+               return iface;
+
+       route = calloc(1, sizeof(*route));
+       if (!route)
+               return NULL;
+
+       route->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4;
+       route->mask = v6 ? 128 : 32;
+       memcpy(&route->addr, addr, addrsize);
        memcpy(&route->nexthop, &r_next->nexthop, sizeof(route->nexthop));
        route->mtu = r_next->mtu;
        route->metric = r_next->metric;
        route->table = r_next->table;
-
-done:
        route->iface = iface;
-       if (defaultroute_target)
-               free(route);
-       else
-               vlist_add(&iface->host_routes, &route->node, route);
+       vlist_add(&iface->host_routes, &route->node, route);
+
        return iface;
 }
 
@@ -712,9 +710,16 @@ random_ifaceid(struct in6_addr *addr)
        addr->s6_addr32[3] = (uint32_t)mrand48();
 }
 
-static void
+static bool
 eui64_ifaceid(struct interface *iface, struct in6_addr *addr)
 {
+       struct device_settings st;
+
+       device_merge_settings(iface->l3_dev.dev, &st);
+
+       if (!(st.flags & DEV_OPT_MACADDR))
+               return false;
+
        /* get mac address */
        uint8_t *macaddr = iface->l3_dev.dev->settings.macaddr;
        uint8_t *ifaceid = addr->s6_addr + 8;
@@ -723,11 +728,15 @@ eui64_ifaceid(struct interface *iface, struct in6_addr *addr)
        ifaceid[3] = 0xff;
        ifaceid[4] = 0xfe;
        ifaceid[0] ^= 0x02;
+
+       return true;
 }
 
-static void
+static bool
 generate_ifaceid(struct interface *iface, struct in6_addr *addr)
 {
+       bool ret = true;
+
        /* generate new iface id */
        switch (iface->assignment_iface_id_selection) {
        case IFID_FIXED:
@@ -741,9 +750,13 @@ generate_ifaceid(struct interface *iface, struct in6_addr *addr)
                break;
        case IFID_EUI64:
                /* eui64 */
-               eui64_ifaceid(iface, addr);
+               ret = eui64_ifaceid(iface, addr);
+               break;
+       default:
+               ret = false;
                break;
        }
+       return ret;
 }
 
 static void
@@ -797,12 +810,15 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
                system_del_route(l3_downlink, &route);
                system_add_address(l3_downlink, &addr);
 
+               assignment->addr = in6addr_any;
                assignment->enabled = false;
        } else if (add && (iface->state == IFS_UP || iface->state == IFS_SETUP)) {
                if (IN6_IS_ADDR_UNSPECIFIED(&addr.addr.in6)) {
                        addr.addr.in6 = prefix->addr;
                        addr.addr.in6.s6_addr32[1] |= htonl(assignment->assigned);
-                       generate_ifaceid(iface, &addr.addr.in6);
+                       if (!generate_ifaceid(iface, &addr.addr.in6))
+                               return;
+
                        assignment->addr = addr.addr.in6;
                        route.addr = addr.addr;
                }
@@ -978,8 +994,10 @@ static void interface_update_prefix_assignments(struct device_prefix *prefix, bo
                        }
 
                        entry = calloc(1, sizeof(*entry));
-                       if (!entry)
+                       if (!entry) {
+                               free(c);
                                continue;
+                       }
 
                        entry->node.key = c;
                        avl_insert(&assign_later, &entry->node);
@@ -1424,7 +1442,7 @@ 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->policy_rules_set != enabled &&
+       if (ip->iface->policy_rules_set != enabled &&
            ip->iface->l3_dev.dev) {
                set_ip_lo_policy(enabled, true, ip->iface);
                set_ip_lo_policy(enabled, false, ip->iface);