move device settings to a separate struct

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 91cb37a..f5a719a 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 = {
@@ -177,26 +178,31 @@ static const struct device_type alias_device_type = {
 void
 device_init_settings(struct device *dev, struct blob_attr **tb)
 {
+       struct device_settings *s = &dev->settings;
        struct blob_attr *cur;
        struct ether_addr *ea;
 
-       dev->flags = 0;
+       s->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);
-               dev->flags |= DEV_OPT_MTU;
+               s->mtu = blobmsg_get_u32(cur);
+               s->flags |= DEV_OPT_MTU;
        }
 
        if ((cur = tb[DEV_ATTR_TXQUEUELEN])) {
-               dev->txqueuelen = blobmsg_get_u32(cur);
-               dev->flags |= DEV_OPT_TXQUEUELEN;
+               s->txqueuelen = blobmsg_get_u32(cur);
+               s->flags |= DEV_OPT_TXQUEUELEN;
        }
 
        if ((cur = tb[DEV_ATTR_MACADDR])) {
                ea = ether_aton(blob_data(cur));
                if (ea) {
-                       memcpy(dev->macaddr, ea, sizeof(dev->macaddr));
-                       dev->flags |= DEV_OPT_MACADDR;
+                       memcpy(s->macaddr, ea, 6);
+                       s->flags |= DEV_OPT_MACADDR;
                }
        }
 }
@@ -409,16 +415,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;
@@ -646,6 +673,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)