interface-ip: Set route table when enabling interface ip settings
authorHans Dedecker <dedeckeh@gmail.com>
Wed, 9 Sep 2015 13:45:52 +0000 (15:45 +0200)
committerFelix Fietkau <nbd@openwrt.org>
Thu, 10 Sep 2015 20:50:31 +0000 (22:50 +0200)
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>
interface-ip.c

index d5f6aff..8eb2ff3 100644 (file)
@@ -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