s/start_pending_interfaces/interface_start_pending/

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 06a36ed..5cefd4c 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -7,9 +7,35 @@
 #include "interface.h"
 #include "proto.h"
 #include "ubus.h"
+#include "config.h"
 
 static LIST_HEAD(interfaces);
 
+enum {
+       IFACE_ATTR_TYPE,
+       IFACE_ATTR_IFNAME,
+       IFACE_ATTR_PROTO,
+       IFACE_ATTR_AUTO,
+       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_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING },
+       [IFACE_ATTR_PROTO] = { .name = "proto", .type = BLOBMSG_TYPE_STRING },
+       [IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_ARRAY },
+       [IFACE_ATTR_AUTO] = { .name = "auto", .type = BLOBMSG_TYPE_BOOL },
+};
+
+const struct config_param_list interface_attr_list = {
+       .n_params = IFACE_ATTR_MAX,
+       .params = iface_attrs,
+       .info = iface_attr_info,
+};
+
 static void
 clear_interface_errors(struct interface *iface)
 {
@@ -26,7 +52,7 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 {
        struct interface_error *error;
        int i, len = 0;
-       int *datalen;
+       int *datalen = NULL;
        char *dest;
 
        if (n_data) {
@@ -64,19 +90,20 @@ interface_event(struct interface *iface, enum interface_event ev)
 static void
 mark_interface_down(struct interface *iface)
 {
-       release_device(iface->main_dev.dev);
+       interface_del_ctx_addr(iface, NULL);
+       device_release(iface->main_dev.dev);
        iface->state = IFS_DOWN;
 }
 
 static int
-__set_interface_up(struct interface *iface)
+__interface_set_up(struct interface *iface)
 {
        int ret;
 
        if (iface->state != IFS_DOWN)
                return 0;
 
-       ret = claim_device(iface->main_dev.dev);
+       ret = device_claim(iface->main_dev.dev);
        if (ret)
                return ret;
 
@@ -92,7 +119,7 @@ __set_interface_up(struct interface *iface)
 }
 
 static void
-__set_interface_down(struct interface *iface, bool force)
+__interface_set_down(struct interface *iface, bool force)
 {
        clear_interface_errors(iface);
 
@@ -103,6 +130,7 @@ __set_interface_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);
 }
 
@@ -131,9 +159,9 @@ interface_cb(struct device_user *dep, enum device_event ev)
 
        if (new_state) {
                if (iface->autostart && !config_init)
-                       set_interface_up(iface);
+                       interface_set_up(iface);
        } else
-               __set_interface_down(iface, true);
+               __interface_set_down(iface, true);
 }
 
 static void
@@ -175,30 +203,44 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s
 }
 
 struct interface *
-alloc_interface(const char *name)
+alloc_interface(const char *name, struct uci_section *s, struct blob_attr *attr)
 {
        struct interface *iface;
+       struct blob_attr *tb[IFACE_ATTR_MAX];
+       struct blob_attr *cur;
+       struct device *dev;
 
        iface = get_interface(name);
        if (iface)
                return iface;
 
        iface = calloc(1, sizeof(*iface));
-
-       interface_set_proto_state(iface, get_default_proto());
-       if (!iface->proto) {
-               free(iface);
-               return NULL;
-       }
-
        iface->main_dev.cb = interface_cb;
        iface->l3_iface = &iface->main_dev;
        strncpy(iface->name, name, sizeof(iface->name) - 1);
        list_add(&iface->list, &interfaces);
        INIT_LIST_HEAD(&iface->errors);
+       INIT_LIST_HEAD(&iface->address);
+       INIT_LIST_HEAD(&iface->routes);
+
+       proto_attach_interface(iface, s);
 
        netifd_ubus_add_interface(iface);
 
+       blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
+                     blob_data(attr), blob_len(attr));
+
+       if ((cur = tb[IFACE_ATTR_TYPE])) {
+               if (!strcmp(blobmsg_data(cur), "bridge"))
+                       interface_attach_bridge(iface, s);
+       }
+
+       if ((cur = tb[IFACE_ATTR_IFNAME])) {
+               dev = device_get(blobmsg_data(cur), true);
+               if (dev)
+                       device_add_user(&iface->main_dev, dev);
+       }
+
        return iface;
 }
 
@@ -234,7 +276,7 @@ interface_remove_link(struct interface *iface, struct device *dev)
                return;
        }
 
-       remove_device_user(&iface->main_dev);
+       device_remove_user(&iface->main_dev);
 }
 
 int
@@ -248,13 +290,13 @@ interface_add_link(struct interface *iface, struct device *dev)
        if (iface->main_dev.dev)
                interface_remove_link(iface, NULL);
 
-       add_device_user(&iface->main_dev, dev);
+       device_add_user(&iface->main_dev, dev);
 
        return 0;
 }
 
 int
-set_interface_up(struct interface *iface)
+interface_set_up(struct interface *iface)
 {
        iface->autostart = true;
 
@@ -266,25 +308,25 @@ set_interface_up(struct interface *iface)
        if (iface->state != IFS_DOWN)
                return 0;
 
-       return __set_interface_up(iface);
+       return __interface_set_up(iface);
 }
 
 int
-set_interface_down(struct interface *iface)
+interface_set_down(struct interface *iface)
 {
        iface->autostart = false;
-       __set_interface_down(iface, false);
+       __interface_set_down(iface, false);
 
        return 0;
 }
 
 void
-start_pending_interfaces(void)
+interface_start_pending(void)
 {
        struct interface *iface;
 
        list_for_each_entry(iface, &interfaces, list) {
                if (iface->active && iface->autostart)
-                       set_interface_up(iface);
+                       interface_set_up(iface);
        }
 }