IPv6: fix device_prefix vlist_key to not include prefix class

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

diff --git a/interface-ip.c b/interface-ip.c
index 47747cb..165d4a8 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -370,7 +370,7 @@ route_cmp(const void *k1, const void *k2, void *ptr)
 static int
 prefix_cmp(const void *k1, const void *k2, void *ptr)
 {
-       return memcmp(k1, k2, sizeof(struct device_prefix) -
+       return memcmp(k1, k2, offsetof(struct device_prefix, pclass) -
                        offsetof(struct device_prefix, addr));
 }
 
@@ -565,41 +565,6 @@ interface_update_host_route(struct vlist_tree *tree,
 
 static void
 interface_set_prefix_address(struct device_prefix_assignment *assignment,
-               const struct device_prefix *prefix, struct interface *iface, bool add);
-
-static void interface_trigger_ula_prefix(struct interface *iface,
-               const struct device_prefix *prefix, bool enable)
-{
-       if (prefix == ula_prefix || (prefix->addr.s6_addr[0] & 0xfe) != 0xfc)
-               return;
-
-       bool external_ula = false;
-       struct device_prefix_assignment *ula_assign = NULL;
-       struct device_prefix *c;
-       list_for_each_entry(c, &prefixes, head) {
-               if (c != ula_prefix && (c->addr.s6_addr[0] & 0xfe) != 0xfc)
-                       continue;
-
-               struct device_prefix_assignment *a;
-               list_for_each_entry(a, &c->assignments, head) {
-                       if (!strcmp(a->name, iface->name)) {
-                               if (c == ula_prefix)
-                                       ula_assign = a;
-                               else if (a->enabled)
-                                       external_ula = true;
-                       }
-               }
-
-       }
-
-       // Remove ULA assignment if there is an externally managed ULA and vice versa
-       if (ula_assign && ((enable && !external_ula) || (!enable && external_ula)))
-               interface_set_prefix_address(ula_assign, ula_prefix, iface, enable);
-}
-
-
-static void
-interface_set_prefix_address(struct device_prefix_assignment *assignment,
                const struct device_prefix *prefix, struct interface *iface, bool add)
 {
        const struct interface *uplink = prefix->iface;
@@ -625,8 +590,6 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
                        addr.valid_until = now + 7200;
                system_add_address(l3_downlink, &addr);
                assignment->enabled = false;
-
-               interface_trigger_ula_prefix(iface, prefix, true);
        } else if (add && (iface->state == IFS_UP || iface->state == IFS_SETUP)) {
                system_add_address(l3_downlink, &addr);
                if (uplink && uplink->l3_dev.dev) {
@@ -636,8 +599,6 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
                                system_update_ipv6_mtu(l3_downlink, mtu);
                }
                assignment->enabled = true;
-
-               interface_trigger_ula_prefix(iface, prefix, false);
        }
 }
 
@@ -701,16 +662,33 @@ static void interface_update_prefix_assignments(struct device_prefix *prefix, bo
                list_add(&c->head, &prefix->assignments);
        }
 
+       bool assigned_any = false;
        struct list_head assign_later = LIST_HEAD_INIT(assign_later);
        vlist_for_each_element(&interfaces, iface, node) {
-               if (iface->config_ip.assignment_length < 48 ||
-                               iface->config_ip.assignment_length > 64)
+               if (iface->assignment_length < 48 ||
+                               iface->assignment_length > 64)
                        continue;
 
+               // Test whether there is a matching class
+               if (!list_empty(&iface->assignment_classes)) {
+                       bool found = false;
+
+                       struct interface_assignment_class *c;
+                       list_for_each_entry(c, &iface->assignment_classes, head) {
+                               if (!strcmp(c->name, prefix->pclass)) {
+                                       found = true;
+                                       break;
+                               }
+                       }
+
+                       if (!found)
+                               continue;
+               }
+
                size_t namelen = strlen(iface->name) + 1;
                c = malloc(sizeof(*c) + namelen);
-               c->length = iface->config_ip.assignment_length;
-               c->assigned = iface->config_ip.assignment_hint;
+               c->length = iface->assignment_length;
+               c->assigned = iface->assignment_hint;
                c->enabled = false;
                memcpy(c->name, iface->name, namelen);
 
@@ -723,6 +701,9 @@ static void interface_update_prefix_assignments(struct device_prefix *prefix, bo
                        }
                        list_add_tail(&c->head, &assign_later);
                }
+
+               if (c->assigned != -1)
+                       assigned_any = true;
        }
 
        // Then try to assign all other + failed custom assignments
@@ -739,12 +720,18 @@ static void interface_update_prefix_assignments(struct device_prefix *prefix, bo
                        netifd_log_message(L_WARNING, "Failed to assign subprefix "
                                        "of size %hhu for %s\n", c->length, c->name);
                        free(c);
+               } else {
+                       assigned_any = true;
                }
        }
 
        list_for_each_entry(c, &prefix->assignments, head)
                if ((iface = vlist_find(&interfaces, c->name, iface, node)))
                        interface_set_prefix_address(c, prefix, iface, true);
+
+       if (!assigned_any)
+               netifd_log_message(L_WARNING, "You have delegated IPv6-prefixes but haven't assigned them "
+                               "to any interface. Did you forget to set option ip6assign on your lan-interfaces?");
 }
 
 
@@ -819,9 +806,12 @@ interface_update_prefix(struct vlist_tree *tree,
 struct device_prefix*
 interface_ip_add_device_prefix(struct interface *iface, struct in6_addr *addr,
                uint8_t length, time_t valid_until, time_t preferred_until,
-               struct in6_addr *excl_addr, uint8_t excl_length)
+               struct in6_addr *excl_addr, uint8_t excl_length, const char *pclass)
 {
-       struct device_prefix *prefix = calloc(1, sizeof(*prefix));
+       if (!pclass)
+               pclass = (iface) ? iface->name : "local";
+
+       struct device_prefix *prefix = calloc(1, sizeof(*prefix) + strlen(pclass) + 1);
        prefix->length = length;
        prefix->addr = *addr;
        prefix->preferred_until = preferred_until;
@@ -834,6 +824,8 @@ interface_ip_add_device_prefix(struct interface *iface, struct in6_addr *addr,
                prefix->excl_length = excl_length;
        }
 
+       strcpy(prefix->pclass, pclass);
+
        if (iface)
                vlist_add(&iface->proto_ip.prefix, &prefix->node, &prefix->addr);
        else
@@ -870,7 +862,7 @@ interface_ip_set_ula_prefix(const char *prefix)
                        interface_update_prefix(NULL, NULL, &ula_prefix->node);
 
                ula_prefix = interface_ip_add_device_prefix(NULL, &addr, length,
-                               0, 0, NULL, 0);
+                               0, 0, NULL, 0, NULL);
        }
 }