X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=165d4a8d52c8f4fa939efc5f3b54002029f08e5a;hp=b720eff5539834887bddcd3ce5cb7e72a3a56cbf;hb=2bc475db30ab2716e1dd430f8eb982ba6e886b74;hpb=91228b6efb36c8954e3d23c0801f54ee984d5a0a

diff --git a/interface-ip.c b/interface-ip.c
index b720eff..165d4a8 100644
--- 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));
 }
 
@@ -665,14 +665,30 @@ static void interface_update_prefix_assignments(struct device_prefix *prefix, bo
 	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);
 
@@ -790,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;
@@ -805,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
@@ -841,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);
 	}
 }