X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=a6a7dca3189b0e15dc2a2ab03b61ad28b021bf46;hp=084688c61c8e1921401784d44f3a948d5893b124;hb=9cd56141e80ea7d19350584d382d303f884d0aa5;hpb=f80b9e4acc47cf454768b44142495fdb8a68a39f

diff --git a/interface-ip.c b/interface-ip.c
index 084688c..a6a7dca 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -59,7 +59,6 @@ const struct uci_blob_param_list route_attr_list = {
 
 
 struct list_head prefixes = LIST_HEAD_INIT(prefixes);
-static struct list_head source_tables = LIST_HEAD_INIT(source_tables);
 static struct device_prefix *ula_prefix = NULL;
 static struct uloop_timeout valid_until_timeout;
 
@@ -197,72 +196,6 @@ __find_ip_route_target(struct interface_ip_settings *ip, union if_addr *a,
 	}
 }
 
-static struct device_source_table*
-find_source_table(const struct device_route *route)
-{
-	struct device_source_table key = {
-		.v6 = (route->flags & DEVADDR_FAMILY) == DEVADDR_INET6,
-		.addr = route->source,
-		.mask = route->sourcemask
-	};
-	struct device_source_table *c;
-	list_for_each_entry(c, &source_tables, head)
-		if (!memcmp(&c->v6, &key.v6, sizeof(key) -
-				offsetof(struct device_source_table, v6)))
-			return c;
-	return NULL;
-}
-
-static uint32_t
-get_source_table(const struct device_route *route)
-{
-	if (route->table || route->sourcemask == 0)
-		return route->table;
-
-	struct device_source_table *tbl = find_source_table(route);
-
-	if (!tbl) {
-		tbl = calloc(1, sizeof(*tbl));
-		tbl->addr = route->source;
-		tbl->mask = route->sourcemask;
-		tbl->v6 = (route->flags & DEVADDR_FAMILY) == DEVADDR_INET6;
-		tbl->table = IPRULE_PRIORITY_SOURCE | (((~tbl->mask) & 0x7f) << 20);
-
-		struct list_head *before = NULL;
-		struct device_source_table *c;
-		list_for_each_entry(c, &source_tables, head) {
-			if (c->table > tbl->table) {
-				before = &c->head;
-				break;
-			} else if (c->table == tbl->table) {
-				++tbl->table;
-			}
-		}
-
-		if (!before)
-			before = &source_tables;
-
-		list_add_tail(&tbl->head, before);
-		set_ip_source_policy(true, tbl->v6, tbl->table, &tbl->addr,
-				tbl->mask, tbl->table, NULL, NULL);
-	}
-
-	++tbl->refcount;
-	return tbl->table;
-}
-
-static void
-put_source_table(const struct device_route *route)
-{
-	struct device_source_table *tbl = find_source_table(route);
-	if (tbl && tbl->table == route->table && --tbl->refcount == 0) {
-		set_ip_source_policy(false, tbl->v6, tbl->table, &tbl->addr,
-				tbl->mask, tbl->table, NULL, NULL);
-		list_del(&tbl->head);
-		free(tbl);
-	}
-}
-
 static bool
 interface_ip_find_addr_target(struct interface *iface, union if_addr *a, bool v6)
 {
@@ -410,7 +343,9 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 		}
 
 		route->sourcemask = atoi(mask);
-	} else if (is_proto_route) {
+	}
+
+	if (is_proto_route) {
 		route->table = (v6) ? iface->ip6table : iface->ip4table;
 		route->flags |= DEVROUTE_SRCTABLE;
 	}
@@ -432,11 +367,6 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 			route->valid_until = valid_until;
 	}
 
-	if (route->sourcemask) {
-		route->table = get_source_table(route);
-		route->flags |= DEVROUTE_SRCTABLE;
-	}
-
 	vlist_add(&ip->route, &route->node, route);
 	return;
 
@@ -527,6 +457,9 @@ interface_update_proto_addr(struct vlist_tree *tree,
 	iface = ip->iface;
 	dev = iface->l3_dev.dev;
 
+	if (!node_new || !node_old)
+		iface->updated |= IUF_ADDRESS;
+
 	if (node_new) {
 		a_new = container_of(node_new, struct device_addr, node);
 
@@ -578,6 +511,7 @@ interface_update_proto_addr(struct vlist_tree *tree,
 
 			system_del_address(dev, a_old);
 		}
+		free(a_old->pclass);
 		free(a_old);
 	}
 
@@ -628,17 +562,20 @@ interface_update_proto_route(struct vlist_tree *tree,
 	iface = ip->iface;
 	dev = iface->l3_dev.dev;
 
+	if (!node_new || !node_old)
+		iface->updated |= IUF_ROUTE;
+
 	route_old = container_of(node_old, struct device_route, node);
 	route_new = container_of(node_new, struct device_route, node);
 
 	if (node_old && node_new)
-		keep = !memcmp(&route_old->nexthop, &route_new->nexthop, sizeof(route_old->nexthop));
+		keep = !memcmp(&route_old->nexthop, &route_new->nexthop, sizeof(route_old->nexthop)) &&
+			(route_old->table == route_new->table);
 
 	if (node_old) {
 		if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep)
 			system_del_route(dev, route_old);
 
-		put_source_table(route_old);
 		free(route_old);
 	}
 
@@ -898,6 +835,10 @@ interface_update_prefix(struct vlist_tree *tree,
 	prefix_old = container_of(node_old, struct device_prefix, node);
 	prefix_new = container_of(node_new, struct device_prefix, node);
 
+	struct interface_ip_settings *ip = container_of(tree, struct interface_ip_settings, prefix);
+	if (tree && (!node_new || !node_old))
+		ip->iface->updated |= IUF_PREFIX;
+
 	struct device_route route;
 	memset(&route, 0, sizeof(route));
 	route.flags = DEVADDR_INET6;