proto: move the dns search option handling to the core

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index befb194..3dceef0 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -17,6 +17,7 @@ enum {
        IFACE_ATTR_IFNAME,
        IFACE_ATTR_PROTO,
        IFACE_ATTR_AUTO,
+       IFACE_ATTR_DEFAULTROUTE,
        IFACE_ATTR_MAX
 };
 
@@ -24,6 +25,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
        [IFACE_ATTR_PROTO] = { .name = "proto", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_AUTO] = { .name = "auto", .type = BLOBMSG_TYPE_BOOL },
+       [IFACE_ATTR_DEFAULTROUTE] = { .name = "defaultroute", .type = BLOBMSG_TYPE_BOOL },
 };
 
 const struct config_param_list interface_attr_list = {
@@ -90,44 +92,22 @@ interface_event(struct interface *iface, enum interface_event ev)
 static void
 interface_flush_state(struct interface *iface)
 {
-       interface_clear_dns(iface);
-       vlist_flush_all(&iface->proto_addr);
-       vlist_flush_all(&iface->proto_route);
+       interface_ip_flush(&iface->proto_ip);
        if (iface->main_dev.dev)
                device_release(&iface->main_dev);
+       if (iface->l3_dev != &iface->main_dev && iface->l3_dev->dev)
+               device_release(iface->l3_dev);
 }
 
 static void
 mark_interface_down(struct interface *iface)
 {
+       if (iface->state == IFS_UP)
+               interface_event(iface, IFEV_DOWN);
        interface_flush_state(iface);
        iface->state = IFS_DOWN;
 }
 
-static int
-__interface_set_up(struct interface *iface)
-{
-       int ret;
-
-       if (iface->state != IFS_DOWN)
-               return 0;
-
-       if (iface->main_dev.dev) {
-               ret = device_claim(&iface->main_dev);
-               if (ret)
-                       return ret;
-       }
-
-       iface->state = IFS_SETUP;
-       ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
-       if (ret) {
-               mark_interface_down(iface);
-               return ret;
-       }
-
-       return 0;
-}
-
 void
 __interface_set_down(struct interface *iface, bool force)
 {
@@ -137,8 +117,9 @@ __interface_set_down(struct interface *iface, bool force)
                iface->state == IFS_TEARDOWN)
                return;
 
+       if (iface->state == IFS_UP)
+               interface_event(iface, IFEV_DOWN);
        iface->state = IFS_TEARDOWN;
-       interface_event(iface, IFEV_DOWN);
        interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
        if (force)
                interface_flush_state(iface);
@@ -202,12 +183,14 @@ interface_claim_device(struct interface *iface)
 {
        struct device *dev;
 
-       if (iface->ifname && iface->proto_handler &&
+       if (iface->ifname &&
                !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
                dev = device_get(iface->ifname, true);
                if (dev)
                        device_add_user(&iface->main_dev, dev);
        }
+       if (iface->proto_handler->flags & PROTO_FLAG_INIT_AVAILABLE)
+               interface_set_available(iface, true);
 }
 
 
@@ -219,7 +202,8 @@ interface_cleanup(struct interface *iface)
        list_for_each_entry_safe(dep, tmp, &iface->users, list)
                interface_remove_user(dep);
 
-       interface_clear_dns(iface);
+       interface_ip_flush(&iface->config_ip);
+       interface_flush_state(iface);
        interface_clear_errors(iface);
        if (iface->main_dev.dev)
                device_remove_user(&iface->main_dev);
@@ -241,12 +225,8 @@ static void
 interface_do_reload(struct interface *iface)
 {
        interface_cleanup(iface);
-
-       interface_claim_device(iface);
        proto_init_interface(iface, iface->config);
-
-       if (iface->autostart && !config_init)
-               interface_set_up(iface);
+       interface_claim_device(iface);
 }
 
 static void
@@ -260,8 +240,10 @@ interface_handle_config_change(struct interface *iface)
                break;
        case IFC_REMOVE:
                interface_do_free(iface);
-               break;
+               return;
        }
+       if (iface->autostart && iface->available)
+               interface_set_up(iface);
 }
 
 static void
@@ -274,6 +256,7 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
                if (iface->state != IFS_SETUP)
                        return;
 
+               interface_ip_set_enabled(&iface->config_ip, true);
                system_flush_routes();
                iface->state = IFS_UP;
                iface->start_time = system_get_rtime();
@@ -286,21 +269,19 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
                        return;
 
                netifd_log_message(L_NOTICE, "Interface '%s' is now down\n", iface->name);
+               interface_ip_set_enabled(&iface->config_ip, false);
                system_flush_routes();
                mark_interface_down(iface);
                interface_handle_config_change(iface);
-               if (iface->l3_dev->dev)
-                       device_release(iface->l3_dev);
-               if (iface->autostart && iface->available)
-                       __interface_set_up(iface);
                break;
        case IFPEV_LINK_LOST:
                if (iface->state != IFS_UP)
                        return;
 
                netifd_log_message(L_NOTICE, "Interface '%s' has lost the connection\n", iface->name);
+               if (iface->state == IFS_UP)
+                       interface_event(iface, IFEV_DOWN);
                iface->state = IFS_SETUP;
-               interface_event(iface, IFEV_DOWN);
                break;
        }
 }
@@ -332,8 +313,9 @@ interface_init(struct interface *iface, const char *name,
        INIT_LIST_HEAD(&iface->errors);
        INIT_LIST_HEAD(&iface->users);
        INIT_LIST_HEAD(&iface->hotplug_list);
-       INIT_LIST_HEAD(&iface->proto_dns_search);
-       INIT_LIST_HEAD(&iface->proto_dns_servers);
+       interface_ip_init(&iface->proto_ip, iface);
+       interface_ip_init(&iface->config_ip, iface);
+       iface->config_ip.enabled = false;
 
        iface->main_dev.cb = interface_cb;
        iface->l3_dev = &iface->main_dev;
@@ -346,10 +328,10 @@ interface_init(struct interface *iface, const char *name,
 
        proto_attach_interface(iface, proto_name);
 
-       if ((cur = tb[IFACE_ATTR_AUTO]))
-               iface->autostart = blobmsg_get_bool(cur);
-       else
-               iface->autostart = true;
+       iface->autostart = blobmsg_get_bool_default(tb[IFACE_ATTR_AUTO], true);
+       iface->proto_ip.no_defaultroute =
+               !blobmsg_get_bool_default(tb[IFACE_ATTR_DEFAULTROUTE], true);
+
        iface->config_autostart = iface->autostart;
 }
 
@@ -401,6 +383,8 @@ interface_add_link(struct interface *iface, struct device *dev)
 int
 interface_set_up(struct interface *iface)
 {
+       int ret;
+
        iface->autostart = true;
 
        if (iface->state != IFS_DOWN)
@@ -412,7 +396,20 @@ interface_set_up(struct interface *iface)
                return -1;
        }
 
-       return __interface_set_up(iface);
+       if (iface->main_dev.dev) {
+               ret = device_claim(&iface->main_dev);
+               if (ret)
+                       return ret;
+       }
+
+       iface->state = IFS_SETUP;
+       ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
+       if (ret) {
+               mark_interface_down(iface);
+               return ret;
+       }
+
+       return 0;
 }
 
 int
@@ -450,6 +447,26 @@ set_config_state(struct interface *iface, enum interface_config_state s)
                __interface_set_down(iface, false);
 }
 
+void
+interface_update_start(struct interface *iface)
+{
+       interface_ip_update_start(&iface->proto_ip);
+}
+
+void
+interface_update_complete(struct interface *iface)
+{
+       struct device_route *route;
+
+       interface_ip_update_complete(&iface->proto_ip);
+       vlist_for_each_element(&iface->config_ip.route, route, node) {
+               if (iface->l3_dev->dev) {
+                       system_add_route(iface->l3_dev->dev, route);
+                       route->enabled = true;
+               }
+       }
+}
+
 static void
 interface_change_config(struct interface *if_old, struct interface *if_new)
 {
@@ -466,8 +483,9 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
        if_old->ifname = if_new->ifname;
        if_old->proto_handler = if_new->proto_handler;
 
-       if (strcmp(old_ifname, if_new->ifname) != 0 ||
-               proto != if_new->proto_handler) {
+       if ((!!old_ifname != !!if_new->ifname) ||
+           (old_ifname && strcmp(old_ifname, if_new->ifname) != 0) ||
+           proto != if_new->proto_handler) {
                D(INTERFACE, "Reload interface '%s' because of ifname/proto change\n",
                  if_old->name);
                goto reload;
@@ -483,6 +501,11 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
                goto reload;
        }
 
+       if (if_old->proto_ip.no_defaultroute != if_new->proto_ip.no_defaultroute) {
+               if_old->proto_ip.no_defaultroute = if_new->proto_ip.no_defaultroute;
+               interface_ip_set_enabled(&if_old->proto_ip, if_old->proto_ip.enabled);
+       }
+
        goto out;
 
 reload:
@@ -507,9 +530,8 @@ interface_update(struct vlist_tree *tree, struct vlist_node *node_new,
                set_config_state(if_old, IFC_REMOVE);
        } else if (node_new) {
                D(INTERFACE, "Create interface '%s'\n", if_new->name);
-               interface_claim_device(if_new);
                proto_init_interface(if_new, if_new->config);
-               interface_ip_init(if_new);
+               interface_claim_device(if_new);
                netifd_ubus_add_interface(if_new);
        }
 }