netifd: Check interface state only when main device is set during interface_change_config

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

diff --git a/interface-ip.c b/interface-ip.c
index b1abbc6..33b5d43 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -18,6 +18,7 @@
 
 #include <limits.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
 
 #include "netifd.h"
 #include "device.h"
@@ -322,7 +323,8 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
        if ((cur = tb[ROUTE_METRIC]) != NULL) {
                route->metric = blobmsg_get_u32(cur);
                route->flags |= DEVROUTE_METRIC;
-       }
+       } else
+               route->metric = iface->metric;
 
        if ((cur = tb[ROUTE_MTU]) != NULL) {
                route->mtu = blobmsg_get_u32(cur);
@@ -398,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;
@@ -576,7 +581,7 @@ interface_update_proto_route(struct vlist_tree *tree,
 
        if (node_old && node_new)
                keep = !memcmp(&route_old->nexthop, &route_new->nexthop, sizeof(route_old->nexthop)) &&
-                       (route_old->table == route_new->table) && !route_old->failed;
+                       (route_old->mtu == route_new->mtu) && !route_old->failed;
 
        if (node_old) {
                if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep)
@@ -588,9 +593,6 @@ interface_update_proto_route(struct vlist_tree *tree,
        if (node_new) {
                bool _enabled = enable_route(ip, route_new);
 
-               if (!(route_new->flags & DEVROUTE_METRIC))
-                       route_new->metric = iface->metric;
-
                if (!(route_new->flags & DEVADDR_EXTERNAL) && !keep && _enabled)
                        if (system_add_route(dev, route_new))
                                route_new->failed = true;
@@ -620,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;
+       }
 }
 
 
@@ -662,8 +666,8 @@ interface_set_prefix_address(struct device_prefix_assignment *assignment,
                }
 
                assignment->enabled = false;
-       } else if (add && (iface->state == IFS_UP || iface->state == IFS_SETUP)) {
-               system_add_address(l3_downlink, &addr);
+       } else if (add && (iface->state == IFS_UP || iface->state == IFS_SETUP) &&
+                       !system_add_address(l3_downlink, &addr)) {
                if (prefix->iface && !assignment->enabled) {
                        set_ip_source_policy(true, true, IPRULE_PRIORITY_REJECT, &addr.addr,
                                        addr.mask, 0, iface, "unreachable");
@@ -1029,7 +1033,7 @@ interface_add_dns_search_list(struct interface_ip_settings *ip, struct blob_attr
 }
 
 static void
-write_resolv_conf_entries(FILE *f, struct interface_ip_settings *ip)
+write_resolv_conf_entries(FILE *f, struct interface_ip_settings *ip, const char *dev)
 {
        struct dns_server *s;
        struct dns_search_domain *d;
@@ -1041,7 +1045,10 @@ write_resolv_conf_entries(FILE *f, struct interface_ip_settings *ip)
                if (!str)
                        continue;
 
-               fprintf(f, "nameserver %s\n", str);
+               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);
        }
 
        vlist_simple_for_each_element(&ip->dns_search, d, node) {
@@ -1076,9 +1083,9 @@ interface_write_resolv_conf(void)
                        continue;
 
                fprintf(f, "# Interface %s\n", iface->name);
-               write_resolv_conf_entries(f, &iface->config_ip);
+               write_resolv_conf_entries(f, &iface->config_ip, iface->ifname);
                if (!iface->proto_ip.no_dns)
-                       write_resolv_conf_entries(f, &iface->proto_ip);
+                       write_resolv_conf_entries(f, &iface->proto_ip, iface->ifname);
        }
        fflush(f);
        rewind(f);
@@ -1135,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;