Add inline fls() function for linux

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 22fe300..d8f7de3 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -5,6 +5,7 @@
 #include "netifd.h"
 #include "device.h"
 #include "interface.h"
+#include "interface-ip.h"
 #include "proto.h"
 #include "ubus.h"
 #include "config.h"
@@ -12,7 +13,6 @@
 static LIST_HEAD(interfaces);
 
 enum {
-       IFACE_ATTR_TYPE,
        IFACE_ATTR_IFNAME,
        IFACE_ATTR_PROTO,
        IFACE_ATTR_AUTO,
@@ -24,9 +24,8 @@ static const union config_param_info iface_attr_info[IFACE_ATTR_MAX] = {
 };
 
 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_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_AUTO] = { .name = "auto", .type = BLOBMSG_TYPE_BOOL },
 };
 
@@ -90,20 +89,21 @@ interface_event(struct interface *iface, enum interface_event ev)
 static void
 mark_interface_down(struct interface *iface)
 {
+       interface_del_all_routes(iface);
        interface_del_ctx_addr(iface, NULL);
-       release_device(iface->main_dev.dev);
+       device_release(&iface->main_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);
        if (ret)
                return ret;
 
@@ -119,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);
 
@@ -159,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
@@ -203,14 +203,15 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s
 }
 
 struct interface *
-alloc_interface(const char *name, struct uci_section *s, struct blob_attr *attr)
+interface_alloc(const char *name, struct blob_attr *attr)
 {
        struct interface *iface;
        struct blob_attr *tb[IFACE_ATTR_MAX];
        struct blob_attr *cur;
        struct device *dev;
+       const char *proto_name = NULL;
 
-       iface = get_interface(name);
+       iface = interface_get(name);
        if (iface)
                return iface;
 
@@ -218,22 +219,18 @@ alloc_interface(const char *name, struct uci_section *s, struct blob_attr *attr)
        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);
+       list_add_tail(&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_PROTO]))
+               proto_name = blobmsg_data(cur);
+
+       proto_attach_interface(iface, proto_name);
 
        if ((cur = tb[IFACE_ATTR_IFNAME])) {
                dev = device_get(blobmsg_data(cur), true);
@@ -241,11 +238,14 @@ alloc_interface(const char *name, struct uci_section *s, struct blob_attr *attr)
                        device_add_user(&iface->main_dev, dev);
        }
 
+       netifd_ubus_add_interface(iface);
+       config_set_state(&iface->config, attr);
+
        return iface;
 }
 
 void
-free_interface(struct interface *iface)
+interface_free(struct interface *iface)
 {
        netifd_ubus_remove_interface(iface);
        list_del(&iface->list);
@@ -255,7 +255,7 @@ free_interface(struct interface *iface)
 }
 
 struct interface *
-get_interface(const char *name)
+interface_get(const char *name)
 {
        struct interface *iface;
 
@@ -296,7 +296,7 @@ interface_add_link(struct interface *iface, struct device *dev)
 }
 
 int
-set_interface_up(struct interface *iface)
+interface_set_up(struct interface *iface)
 {
        iface->autostart = true;
 
@@ -308,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);
        }
 }