X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=084516994ec46547eb55237d52cec9d31fac89b7;hp=baa8b0e81dad85f25ee491c48cf8e497aacaecb3;hb=98565127c60cba3d5b747bb9eb698e06d187f45b;hpb=69b2dcb92b8402b9c6df4d6a041a890fe6468e18

diff --git a/interface-ip.c b/interface-ip.c
index baa8b0e..0845169 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -10,6 +10,24 @@
 #include "ubus.h"
 #include "system.h"
 
+static int
+addr_cmp(const void *k1, const void *k2, void *ptr)
+{
+	const struct device_addr *a1 = k1, *a2 = k2;
+
+	return memcmp(&a1->mask, &a2->mask,
+		sizeof(*a1) - offsetof(struct device_addr, mask));
+}
+
+static int
+route_cmp(const void *k1, const void *k2, void *ptr)
+{
+	const struct device_route *r1 = k1, *r2 = k2;
+
+	return memcmp(&r1->mask, &r2->mask,
+		sizeof(*r1) - offsetof(struct device_route, mask));
+}
+
 static void
 interface_update_proto_addr(struct vlist_tree *tree,
 			    struct vlist_node *node_new,
@@ -20,17 +38,19 @@ interface_update_proto_addr(struct vlist_tree *tree,
 	struct device_addr *addr;
 
 	iface = container_of(tree, struct interface, proto_addr);
-	dev = iface->l3_iface->dev;
+	dev = iface->l3_dev->dev;
 
 	if (node_old) {
 		addr = container_of(node_old, struct device_addr, node);
-		system_del_address(dev, addr);
+		if (!(addr->flags & DEVADDR_EXTERNAL))
+			system_del_address(dev, addr);
 		free(addr);
 	}
 
 	if (node_new) {
 		addr = container_of(node_new, struct device_addr, node);
-		system_add_address(dev, addr);
+		if (!(addr->flags & DEVADDR_EXTERNAL))
+			system_add_address(dev, addr);
 	}
 }
 
@@ -44,26 +64,27 @@ interface_update_proto_route(struct vlist_tree *tree,
 	struct device_route *route;
 
 	iface = container_of(tree, struct interface, proto_route);
-	dev = iface->l3_iface->dev;
+	dev = iface->l3_dev->dev;
 
 	if (node_old) {
 		route = container_of(node_old, struct device_route, node);
-		system_del_route(dev, route);
+		if (!(route->flags & DEVADDR_EXTERNAL))
+			system_del_route(dev, route);
 		free(route);
 	}
 
 	if (node_new) {
 		route = container_of(node_new, struct device_route, node);
-		system_add_route(dev, route);
+		if (!(route->flags & DEVADDR_EXTERNAL))
+			system_add_route(dev, route);
 	}
 }
 
 void
 interface_ip_init(struct interface *iface)
 {
-	vlist_init(&iface->proto_route, interface_update_proto_route,
-		   struct device_route, node, mask, addr);
-	vlist_init(&iface->proto_addr, interface_update_proto_addr,
-		   struct device_addr, node, mask, addr);
+	vlist_init(&iface->proto_route, route_cmp, interface_update_proto_route,
+		   struct device_route, node);
+	vlist_init(&iface->proto_addr, addr_cmp, interface_update_proto_addr,
+		   struct device_addr, node);
 }
-