do not attempt to get an interface if PROTO_FLAG_NODEV is set

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 2d62bb04b31cede547074d01c825fda7ab1de59d..acfe8b156457d60c1c788899d5a728e4ef9bdd06 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -19,10 +19,6 @@ enum {
        IFACE_ATTR_MAX
 };
 
-static const union config_param_info iface_attr_info[IFACE_ATTR_MAX] = {
-       [IFACE_ATTR_IFNAME].type = BLOBMSG_TYPE_STRING,
-};
-
 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 },
@@ -32,7 +28,6 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 const struct config_param_list interface_attr_list = {
        .n_params = IFACE_ATTR_MAX,
        .params = iface_attrs,
-       .info = iface_attr_info,
 };
 
 static void
@@ -89,8 +84,10 @@ interface_event(struct interface *iface, enum interface_event ev)
 static void
 mark_interface_down(struct interface *iface)
 {
-       interface_del_ctx_addr(iface, NULL);
-       device_release(&iface->main_dev);
+       vlist_flush_all(&iface->proto_addr);
+       vlist_flush_all(&iface->proto_route);
+       if (iface->main_dev.dev)
+               device_release(&iface->main_dev);
        iface->state = IFS_DOWN;
 }
 
@@ -102,9 +99,11 @@ __interface_set_up(struct interface *iface)
        if (iface->state != IFS_DOWN)
                return 0;
 
-       ret = device_claim(&iface->main_dev);
-       if (ret)
-               return ret;
+       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);
@@ -128,8 +127,6 @@ __interface_set_down(struct interface *iface, bool force)
 
        iface->state = IFS_TEARDOWN;
        interface_event(iface, IFEV_DOWN);
-
-       interface_del_all_routes(iface);
        interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
 }
 
@@ -151,10 +148,16 @@ interface_cb(struct device_user *dep, enum device_event ev)
                return;
        }
 
-       if (iface->active == new_state)
+       interface_set_available(iface, new_state);
+}
+
+void
+interface_set_available(struct interface *iface, bool new_state)
+{
+       if (iface->available == new_state)
                return;
 
-       iface->active = new_state;
+       iface->available = new_state;
 
        if (new_state) {
                if (iface->autostart && !config_init)
@@ -220,8 +223,8 @@ interface_alloc(const char *name, struct blob_attr *attr)
        strncpy(iface->name, name, sizeof(iface->name) - 1);
        list_add_tail(&iface->list, &interfaces);
        INIT_LIST_HEAD(&iface->errors);
-       INIT_LIST_HEAD(&iface->address);
-       INIT_LIST_HEAD(&iface->routes);
+
+       interface_ip_init(iface);
 
        blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
                      blob_data(attr), blob_len(attr));
@@ -231,12 +234,18 @@ interface_alloc(const char *name, struct blob_attr *attr)
 
        proto_attach_interface(iface, proto_name);
 
-       if ((cur = tb[IFACE_ATTR_IFNAME])) {
+       if (!(iface->proto_handler->flags & PROTO_FLAG_NODEV) &&
+           (cur = tb[IFACE_ATTR_IFNAME])) {
                dev = device_get(blobmsg_data(cur), true);
                if (dev)
                        device_add_user(&iface->main_dev, dev);
        }
 
+       if ((cur = tb[IFACE_ATTR_AUTO]))
+               iface->autostart = blobmsg_get_bool(cur);
+       else
+               iface->autostart = true;
+
        netifd_ubus_add_interface(iface);
        config_set_state(&iface->config, attr);
 
@@ -299,7 +308,7 @@ interface_set_up(struct interface *iface)
 {
        iface->autostart = true;
 
-       if (!iface->active) {
+       if (!iface->available) {
                interface_add_error(iface, "interface", "NO_DEVICE", NULL, 0);
                return -1;
        }
@@ -313,8 +322,13 @@ interface_set_up(struct interface *iface)
 int
 interface_set_down(struct interface *iface)
 {
-       iface->autostart = false;
-       __interface_set_down(iface, false);
+       if (!iface) {
+               list_for_each_entry(iface, &interfaces, list)
+                       __interface_set_down(iface, false);
+       } else {
+               iface->autostart = false;
+               __interface_set_down(iface, false);
+       }
 
        return 0;
 }
@@ -325,7 +339,7 @@ interface_start_pending(void)
        struct interface *iface;
 
        list_for_each_entry(iface, &interfaces, list) {
-               if (iface->active && iface->autostart)
+               if (iface->available && iface->autostart)
                        interface_set_up(iface);
        }
 }