netifd: Don't assume routes are always applied in all cases

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

diff --git a/interface-ip.c b/interface-ip.c
index b000725..8458666 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -400,6 +400,9 @@ route_cmp(const void *k1, const void *k2, void *ptr)
        if (r1->sourcemask != r2->sourcemask)
                return r1->sourcemask - r2->sourcemask;
 
+       if (r1->table != r2->table)
+               return r1->table - r2->table;
+
        int maskcmp = memcmp(&r1->source, &r2->source, sizeof(r1->source));
        if (maskcmp)
                return maskcmp;
@@ -619,8 +622,10 @@ interface_update_host_route(struct vlist_tree *tree,
                free(route_old);
        }
 
-       if (node_new)
-               system_add_route(dev, route_new);
+       if (node_new) {
+               if (system_add_route(dev, route_new))
+                       route_new->failed = true;
+       }
 }
 
 
@@ -1040,7 +1045,7 @@ write_resolv_conf_entries(FILE *f, struct interface_ip_settings *ip, const char
                if (!str)
                        continue;
 
-               if (s->af == AF_INET6 && IN6_IS_ADDR_LINKLOCAL(&s->addr))
+               if (s->af == AF_INET6 && IN6_IS_ADDR_LINKLOCAL(&s->addr.in6))
                        fprintf(f, "nameserver %s%%%s\n", str, dev);
                else
                        fprintf(f, "nameserver %s\n", str);
@@ -1137,7 +1142,8 @@ void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
                        if (!(route->flags & DEVROUTE_METRIC))
                                route->metric = ip->iface->metric;
 
-                       system_add_route(dev, route);
+                       if (system_add_route(dev, route))
+                               route->failed = true;
                } else
                        system_del_route(dev, route);
                route->enabled = _enabled;