add mac address to device info

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 0a33f67..7253bb9 100644 (file)
--- a/device.c
+++ b/device.c
@@ -34,6 +34,7 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
        [DEV_ATTR_MTU] = { "mtu", BLOBMSG_TYPE_INT32 },
        [DEV_ATTR_MACADDR] = { "macaddr", BLOBMSG_TYPE_STRING },
        [DEV_ATTR_TXQUEUELEN] = { "txqueuelen", BLOBMSG_TYPE_INT32 },
+       [DEV_ATTR_ENABLED] = { "enabled", BLOBMSG_TYPE_BOOL },
 };
 
 const struct config_param_list device_attr_list = {
@@ -55,6 +56,41 @@ void device_unlock(void)
                device_free_unused(NULL);
 }
 
+static int set_device_state(struct device *dev, bool state)
+{
+       if (state)
+               system_if_up(dev);
+       else
+               system_if_down(dev);
+
+       return 0;
+}
+
+static int
+simple_device_set_state(struct device *dev, bool state)
+{
+       struct device *pdev;
+       int ret = 0;
+
+       pdev = dev->parent.dev;
+       if (state && !pdev) {
+               pdev = system_if_get_parent(dev);
+               if (pdev)
+                       device_add_user(&dev->parent, pdev);
+       }
+
+       if (pdev) {
+               if (state)
+                       ret = device_claim(&dev->parent);
+               else
+                       device_release(&dev->parent);
+
+               if (ret < 0)
+                       return ret;
+       }
+       return set_device_state(dev, state);
+}
+
 static struct device *
 simple_device_create(const char *name, struct blob_attr *attr)
 {
@@ -66,6 +102,7 @@ simple_device_create(const char *name, struct blob_attr *attr)
        if (!dev)
                return NULL;
 
+       dev->set_state = simple_device_set_state;
        device_init_settings(dev, tb);
 
        return dev;
@@ -73,6 +110,8 @@ simple_device_create(const char *name, struct blob_attr *attr)
 
 static void simple_device_free(struct device *dev)
 {
+       if (dev->parent.dev)
+               device_remove_user(&dev->parent);
        device_cleanup(dev);
        free(dev);
 }
@@ -143,6 +182,10 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
        struct ether_addr *ea;
 
        dev->flags = 0;
+       dev->disabled = false;
+
+       if ((cur = tb[DEV_ATTR_ENABLED]))
+               device_set_disabled(dev, !blobmsg_get_bool(cur));
 
        if ((cur = tb[DEV_ATTR_MTU])) {
                dev->mtu = blobmsg_get_u32(cur);
@@ -209,16 +252,6 @@ alias_notify_device(const char *name, struct device *dev)
        device_unlock();
 }
 
-static int set_device_state(struct device *dev, bool state)
-{
-       if (state)
-               system_if_up(dev);
-       else
-               system_if_down(dev);
-
-       return 0;
-}
-
 int device_claim(struct device_user *dep)
 {
        struct device *dev = dep->dev;
@@ -308,12 +341,14 @@ int device_init(struct device *dev, const struct device_type *type, const char *
 }
 
 static struct device *
-device_create_default(const char *name)
+device_create_default(const char *name, bool external)
 {
        struct device *dev;
 
        D(DEVICE, "Create simple device '%s'\n", name);
        dev = calloc(1, sizeof(*dev));
+       dev->external = external;
+       dev->set_state = simple_device_set_state;
        device_init(dev, &simple_device_type, name);
        dev->default_config = true;
        return dev;
@@ -332,7 +367,7 @@ device_alias_get(const char *name)
 }
 
 struct device *
-device_get(const char *name, bool create)
+device_get(const char *name, int create)
 {
        struct device *dev;
 
@@ -349,7 +384,7 @@ device_get(const char *name, bool create)
        if (!create)
                return NULL;
 
-       return device_create_default(name);
+       return device_create_default(name, create > 1);
 }
 
 static void
@@ -379,16 +414,37 @@ void device_cleanup(struct device *dev)
        device_delete(dev);
 }
 
-void device_set_present(struct device *dev, bool state)
+static void __device_set_present(struct device *dev, bool state)
 {
        if (dev->present == state)
                return;
 
-       D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
        dev->present = state;
        device_broadcast_event(dev, state ? DEV_EVENT_ADD : DEV_EVENT_REMOVE);
 }
 
+void device_set_present(struct device *dev, bool state)
+{
+       if (dev->sys_present == state)
+               return;
+
+       dev->sys_present = state;
+       D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
+
+       if (state && dev->disabled)
+               return;
+
+       __device_set_present(dev, state);
+}
+
+void
+device_set_disabled(struct device *dev, bool value)
+{
+       dev->disabled = value;
+       if (dev->sys_present)
+               __device_set_present(dev, !value);
+}
+
 void device_add_user(struct device_user *dep, struct device *dev)
 {
        dep->dev = dev;
@@ -400,10 +456,18 @@ void device_add_user(struct device_user *dep, struct device *dev)
        }
 }
 
+void
+device_free(struct device *dev)
+{
+       __devlock++;
+       dev->type->free(dev);
+       __devlock--;
+}
+
 static void
 __device_free_unused(struct device *dev)
 {
-       if (!list_empty(&dev->users) || dev->current_config || config_init)
+       if (!list_empty(&dev->users) || dev->current_config || __devlock)
                return;
 
        device_free(dev);
@@ -527,7 +591,7 @@ device_reset_old(void)
                if (dev->type != &simple_device_type)
                        continue;
 
-               ndev = device_create_default(dev->ifname);
+               ndev = device_create_default(dev->ifname, dev->external);
                device_replace(ndev, dev);
        }
 }
@@ -608,6 +672,8 @@ device_dump_status(struct blob_buf *b, struct device *dev)
        blobmsg_add_u8(b, "up", !!dev->active);
        if (dev->type->dump_info)
                dev->type->dump_info(dev, b);
+       else
+               system_if_dump_info(dev, b);
 
        s = blobmsg_open_table(b, "statistics");
        if (dev->type->dump_stats)