From: Hans Dedecker <dedeckeh@gmail.com>
Date: Wed, 9 Sep 2015 13:45:52 +0000 (+0200)
Subject: interface-ip: Set route table when enabling interface ip settings
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=commitdiff_plain;h=a8f7addd5fca0af20a5942149711acc8bb35c5ce;hp=f566d7a2cdd34dba57c1052284764f5d17229b81

interface-ip: Set route table when enabling interface ip settings

Routes are now inserted in the correct routing table when interface ip4table and/or
ip6table was changed during interface_change_config

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---

diff --git a/interface-ip.c b/interface-ip.c
index d5f6aff..8eb2ff3 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -1234,6 +1234,15 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
 			if (!(route->flags & DEVROUTE_METRIC))
 				route->metric = ip->iface->metric;
 
+			if (!(route->flags & DEVROUTE_TABLE)) {
+				route->flags &= ~DEVROUTE_SRCTABLE;
+				route->table = ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET6) ?
+							iface->ip6table : iface->ip4table;
+
+				if (route->table)
+					route->flags |= DEVROUTE_SRCTABLE;
+			}
+
 			if (system_add_route(dev, route))
 				route->failed = true;
 		} else