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

diff --git a/interface-ip.c b/interface-ip.c
index 6c673c6..0845169 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -5,64 +5,86 @@
 #include "netifd.h"
 #include "device.h"
 #include "interface.h"
+#include "interface-ip.h"
 #include "proto.h"
 #include "ubus.h"
 #include "system.h"
 
-int interface_add_address(struct interface *iface, struct device_addr *addr)
+static int
+addr_cmp(const void *k1, const void *k2, void *ptr)
 {
-	int family;
+	const struct device_addr *a1 = k1, *a2 = k2;
 
-	if (addr->flags & DEVADDR_INET6)
-		family = AF_INET6;
-	else
-		family = AF_INET;
-
-	list_add(&addr->list, &iface->address);
-	return system_add_address(iface->l3_iface->dev, addr);
+	return memcmp(&a1->mask, &a2->mask,
+		sizeof(*a1) - offsetof(struct device_addr, mask));
 }
 
-void interface_del_address(struct interface *iface, struct device_addr *addr)
+static int
+route_cmp(const void *k1, const void *k2, void *ptr)
 {
-	int family;
-
-	if (addr->flags & DEVADDR_INET6)
-		family = AF_INET6;
-	else
-		family = AF_INET;
+	const struct device_route *r1 = k1, *r2 = k2;
 
-	list_del(&addr->list);
-	system_del_address(iface->l3_iface->dev, addr);
+	return memcmp(&r1->mask, &r2->mask,
+		sizeof(*r1) - offsetof(struct device_route, mask));
 }
 
-void interface_del_ctx_addr(struct interface *iface, void *ctx)
+static void
+interface_update_proto_addr(struct vlist_tree *tree,
+			    struct vlist_node *node_new,
+			    struct vlist_node *node_old)
 {
-	struct device_addr *addr, *tmp;
+	struct interface *iface;
+	struct device *dev;
+	struct device_addr *addr;
 
-	list_for_each_entry_safe(addr, tmp, &iface->address, list) {
-		if (ctx && addr->ctx != ctx)
-			continue;
+	iface = container_of(tree, struct interface, proto_addr);
+	dev = iface->l3_dev->dev;
 
-		interface_del_address(iface, addr);
+	if (node_old) {
+		addr = container_of(node_old, struct device_addr, node);
+		if (!(addr->flags & DEVADDR_EXTERNAL))
+			system_del_address(dev, addr);
+		free(addr);
 	}
-}
 
-int interface_add_route(struct interface *iface, struct device_route *route)
-{
-	list_add(&route->list, &iface->routes);
-	return system_add_route(iface->l3_iface->dev, route);
+	if (node_new) {
+		addr = container_of(node_new, struct device_addr, node);
+		if (!(addr->flags & DEVADDR_EXTERNAL))
+			system_add_address(dev, addr);
+	}
 }
 
-void interface_del_route(struct interface *iface, struct device_route *route)
+static void
+interface_update_proto_route(struct vlist_tree *tree,
+			     struct vlist_node *node_new,
+			     struct vlist_node *node_old)
 {
-	list_del(&route->list);
-	system_del_route(iface->l3_iface->dev, route);
+	struct interface *iface;
+	struct device *dev;
+	struct device_route *route;
+
+	iface = container_of(tree, struct interface, proto_route);
+	dev = iface->l3_dev->dev;
+
+	if (node_old) {
+		route = container_of(node_old, struct device_route, node);
+		if (!(route->flags & DEVADDR_EXTERNAL))
+			system_del_route(dev, route);
+		free(route);
+	}
+
+	if (node_new) {
+		route = container_of(node_new, struct device_route, node);
+		if (!(route->flags & DEVADDR_EXTERNAL))
+			system_add_route(dev, route);
+	}
 }
 
-void interface_del_all_routes(struct interface *iface)
+void
+interface_ip_init(struct interface *iface)
 {
-	struct device_route *route, *tmp;
-
-	list_for_each_entry_safe(route, tmp, &iface->routes, list)
-		interface_del_route(iface, route);
+	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);
 }