From: Steven Barth <steven@midlink.org>
Date: Wed, 11 Dec 2013 09:54:37 +0000 (+0100)
Subject: IPv6: Remove IPv6 source-routing workaround (kernel is fixed)
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4106d0ced43327848791ed6182f28d461c01a4b8;p=oweals%2Fnetifd.git

IPv6: Remove IPv6 source-routing workaround (kernel is fixed)

Signed-off-by: Steven Barth <steven@midlink.org>
---

diff --git a/interface-ip.c b/interface-ip.c
index 60b446c..3771b5d 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;
 
@@ -640,7 +570,6 @@ interface_update_proto_route(struct vlist_tree *tree,
 		if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep)
 			system_del_route(dev, route_old);
 
-		put_source_table(route_old);
 		free(route_old);
 	}
 
diff --git a/iprule.h b/iprule.h
index 3381ae3..b4b124c 100644
--- a/iprule.h
+++ b/iprule.h
@@ -19,7 +19,6 @@
 
 #define IPRULE_PRIORITY_ADDR 80000
 #define IPRULE_PRIORITY_NW 90000
-#define IPRULE_PRIORITY_SOURCE 4026531840
 #define IPRULE_PRIORITY_REJECT 4200000000
 
 enum iprule_flags {
diff --git a/system-linux.c b/system-linux.c
index 714729f..7b3e08f 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -1142,6 +1142,7 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd)
 	struct rtmsg rtm = {
 		.rtm_family = (alen == 4) ? AF_INET : AF_INET6,
 		.rtm_dst_len = route->mask,
+		.rtm_src_len = route->sourcemask,
 		.rtm_table = (table < 256) ? table : RT_TABLE_UNSPEC,
 		.rtm_protocol = (route->flags & DEVADDR_KERNEL) ? RTPROT_KERNEL : RTPROT_STATIC,
 		.rtm_scope = scope,
@@ -1167,6 +1168,9 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd)
 	if (route->mask)
 		nla_put(msg, RTA_DST, alen, &route->addr);
 
+	if (route->sourcemask)
+		nla_put(msg, RTA_SRC, alen, &route->source);
+
 	if (route->metric > 0)
 		nla_put_u32(msg, RTA_PRIORITY, route->metric);