X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=2e2e9d8c5316111b85d54040e61e8cb268072219;hp=51f23eff92943059670373cb1efc39f36f69eead;hb=216f718323126aa5b89b820363c20f49488cbba1;hpb=273550337f70b8b2175875e0c4f0bbd483cfe326

diff --git a/interface-ip.c b/interface-ip.c
index 51f23ef..2e2e9d8 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -5,44 +5,69 @@
 #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 void
+interface_update_proto_addr(struct vlist_tree *tree,
+			    struct vlist_node *node_new,
+			    struct vlist_node *node_old)
 {
-	int family;
+	struct interface *iface;
+	struct device *dev;
+	struct device_addr *addr;
 
-	if (addr->flags & DEVADDR_INET6)
-		family = AF_INET6;
-	else
-		family = AF_INET;
+	iface = container_of(tree, struct interface, proto_addr);
+	dev = iface->l3_dev->dev;
 
-	list_add(&addr->list, &iface->address);
-	return system_add_address(iface->l3_iface->dev, 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);
+	}
+
+	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_address(struct interface *iface, struct device_addr *addr)
+static void
+interface_update_proto_route(struct vlist_tree *tree,
+			     struct vlist_node *node_new,
+			     struct vlist_node *node_old)
 {
-	int family;
+	struct interface *iface;
+	struct device *dev;
+	struct device_route *route;
 
-	if (addr->flags & DEVADDR_INET6)
-		family = AF_INET6;
-	else
-		family = AF_INET;
+	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);
+	}
 
-	list_del(&addr->list);
-	system_del_address(iface->l3_iface->dev, addr);
+	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_ctx_addr(struct interface *iface, void *ctx)
+void
+interface_ip_init(struct interface *iface)
 {
-	struct device_addr *addr, *tmp;
-
-	list_for_each_entry_safe(addr, tmp, &iface->address, list) {
-		if (ctx && addr->ctx != ctx)
-			continue;
-
-		interface_del_address(iface, addr);
-	}
+	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);
 }
+