netifd: Routing table parameter needs to be checked in route update

[project/netifd.git] / interface-ip.c

diff --git a/interface-ip.c b/interface-ip.c
index 60902f9..60b446c 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -15,7 +15,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
 
 #include <limits.h>
 #include <arpa/inet.h>
@@ -579,6 +578,7 @@ interface_update_proto_addr(struct vlist_tree *tree,
 
                        system_del_address(dev, a_old);
                }
+               free(a_old->pclass);
                free(a_old);
        }
 
@@ -633,7 +633,8 @@ interface_update_proto_route(struct vlist_tree *tree,
        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)
@@ -920,7 +921,9 @@ interface_update_prefix(struct vlist_tree *tree,
        } else if (node_new) {
                // Set null-route to avoid routing loops
                system_add_route(NULL, &route);
-               interface_update_prefix_assignments(prefix_new, true);
+
+               if (!prefix_new->iface || !prefix_new->iface->proto_ip.no_delegation)
+                       interface_update_prefix_assignments(prefix_new, true);
        } else if (node_old) {
                // Remove null-route
                interface_update_prefix_assignments(prefix_old, false);
@@ -928,11 +931,12 @@ interface_update_prefix(struct vlist_tree *tree,
        }
 
        if (node_old) {
-               list_del(&prefix_old->head);
+               if (prefix_old->head.next)
+                       list_del(&prefix_old->head);
                free(prefix_old);
        }
 
-       if (node_new)
+       if (node_new && (!prefix_new->iface || !prefix_new->iface->proto_ip.no_delegation))
                list_add(&prefix_new->head, &prefixes);
 
 }