Remove automatically assigned IPv6 routing table
authorSteven Barth <steven@midlink.org>
Thu, 16 Jan 2014 23:41:49 +0000 (00:41 +0100)
committerSteven Barth <steven@midlink.org>
Thu, 16 Jan 2014 23:41:49 +0000 (00:41 +0100)
This puts IPv6 routes back into the main table where they are expected.
Instead the newly-fixed source-address restrictions should be used.

interface.c

index 0032e57..b2c8baf 100644 (file)
@@ -26,7 +26,6 @@
 
 struct vlist_tree interfaces;
 static LIST_HEAD(iface_all_users);
 
 struct vlist_tree interfaces;
 static LIST_HEAD(iface_all_users);
-static unsigned int interface_serial = 0;
 
 enum {
        IFACE_ATTR_IFNAME,
 
 enum {
        IFACE_ATTR_IFNAME,
@@ -605,13 +604,6 @@ interface_alloc(const char *name, struct blob_attr *config)
                        DPRINTF("Failed to resolve routing table: %s\n", (char *) blobmsg_data(cur));
        }
 
                        DPRINTF("Failed to resolve routing table: %s\n", (char *) blobmsg_data(cur));
        }
 
-       // Set a default exteranl routing table for IPv6 to do source-based-filtering
-       struct interface *iface_old = vlist_find(&interfaces, name, iface_old, node);
-       if (iface_old && iface_old->ip6table > 1000 && iface_old->ip6table < 2000)
-               iface->ip6table = iface_old->ip6table;
-       else
-               iface->ip6table = 1000 + ++interface_serial;
-
        if ((cur = tb[IFACE_ATTR_IP6TABLE])) {
                if (!system_resolve_rt_table(blobmsg_data(cur), &iface->ip6table))
                        DPRINTF("Failed to resolve routing table: %s\n", (char *) blobmsg_data(cur));
        if ((cur = tb[IFACE_ATTR_IP6TABLE])) {
                if (!system_resolve_rt_table(blobmsg_data(cur), &iface->ip6table))
                        DPRINTF("Failed to resolve routing table: %s\n", (char *) blobmsg_data(cur));