rewrite resolv.conf after interface up setting updates

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

diff --git a/interface-ip.c b/interface-ip.c
index d8d8606..f62d670 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -220,7 +220,7 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
        }
 
        if ((cur = tb[ROUTE_TARGET]) != NULL) {
-               if (!inet_pton(af, blobmsg_data(cur), &route->addr)) {
+               if (!parse_ip_and_netmask(af, blobmsg_data(cur), &route->addr, &route->mask)) {
                        DPRINTF("Failed to parse route target: %s\n", (char *) blobmsg_data(cur));
                        goto error;
                }
@@ -238,8 +238,10 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
                route->flags |= DEVROUTE_METRIC;
        }
 
-       if ((cur = tb[ROUTE_MTU]) != NULL)
+       if ((cur = tb[ROUTE_MTU]) != NULL) {
                route->mtu = blobmsg_get_u32(cur);
+               route->flags |= DEVROUTE_MTU;
+       }
 
        vlist_add(&ip->route, &route->node, &route->flags);
        return;
@@ -268,6 +270,7 @@ interface_handle_subnet_route(struct interface *iface, struct device_addr *addr,
        struct device *dev = iface->l3_dev.dev;
        struct device_route route;
 
+       memset(&route, 0, sizeof(route));
        route.iface = iface;
        route.flags = addr->flags;
        route.mask = addr->mask;
@@ -427,6 +430,9 @@ interface_add_dns_server(struct interface_ip_settings *ip, const char *str)
        struct dns_server *s;
 
        s = calloc(1, sizeof(*s));
+       if (!s)
+               return;
+
        s->af = AF_INET;
        if (inet_pton(s->af, str, &s->addr.in))
                goto add;
@@ -611,6 +617,7 @@ interface_ip_update_complete(struct interface_ip_settings *ip)
        vlist_simple_flush(&ip->dns_search);
        vlist_flush(&ip->route);
        vlist_flush(&ip->addr);
+       interface_write_resolv_conf();
 }
 
 void