interface: suppress unnecessary device config overrides

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 6cdfb49..66eb261 100644 (file)
--- a/device.c
+++ b/device.c
@@ -42,6 +42,7 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
        [DEV_ATTR_RPFILTER] = { .name = "rpfilter", .type = BLOBMSG_TYPE_STRING },
        [DEV_ATTR_ACCEPTLOCAL] = { .name = "acceptlocal", .type = BLOBMSG_TYPE_BOOL },
        [DEV_ATTR_IGMPVERSION] = { .name = "igmpversion", .type = BLOBMSG_TYPE_INT32 },
+       [DEV_ATTR_MLDVERSION] = { .name = "mldversion", .type = BLOBMSG_TYPE_INT32 },
 };
 
 const struct uci_blob_param_list device_attr_list = {
@@ -160,6 +161,7 @@ device_merge_settings(struct device *dev, struct device_settings *n)
        n->rpfilter = s->flags & DEV_OPT_RPFILTER ? s->rpfilter : os->rpfilter;
        n->acceptlocal = s->flags & DEV_OPT_ACCEPTLOCAL ? s->acceptlocal : os->acceptlocal;
        n->igmpversion = s->flags & DEV_OPT_IGMPVERSION ? s->igmpversion : os->igmpversion;
+       n->mldversion = s->flags & DEV_OPT_MLDVERSION ? s->mldversion : os->mldversion;
        n->flags = s->flags | os->flags;
 }
 
@@ -216,12 +218,21 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
        }
 
        if ((cur = tb[DEV_ATTR_IGMPVERSION])) {
-               if (system_resolve_igmpversion(blobmsg_get_u32(cur), &s->igmpversion))
+               s->igmpversion = blobmsg_get_u32(cur);
+               if (s->igmpversion >= 1 && s->igmpversion <= 3)
                        s->flags |= DEV_OPT_IGMPVERSION;
                else
                        DPRINTF("Failed to resolve igmpversion: %d\n", blobmsg_get_u32(cur));
        }
 
+       if ((cur = tb[DEV_ATTR_MLDVERSION])) {
+               s->mldversion = blobmsg_get_u32(cur);
+               if (s->mldversion >= 1 && s->mldversion <= 2)
+                       s->flags |= DEV_OPT_MLDVERSION;
+               else
+                       DPRINTF("Failed to resolve mldversion: %d\n", blobmsg_get_u32(cur));
+       }
+
        device_set_disabled(dev, disabled);
 }
 
@@ -575,11 +586,18 @@ device_init_pending(void)
        }
 }
 
-static enum dev_change_type
-device_reload_config(struct device *dev, struct blob_attr *attr)
+enum dev_change_type
+device_set_config(struct device *dev, const struct device_type *type,
+                 struct blob_attr *attr)
 {
        struct blob_attr *tb[__DEV_ATTR_MAX];
-       const struct uci_blob_param_list *cfg = dev->type->config_params;
+       const struct uci_blob_param_list *cfg = type->config_params;
+
+       if (type != dev->type)
+               return DEV_CONFIG_RECREATE;
+
+       if (dev->type->reload)
+               return dev->type->reload(dev, attr);
 
        if (uci_blob_check_equal(dev->config, attr, cfg))
                return DEV_CONFIG_NO_CHANGE;
@@ -598,16 +616,37 @@ device_reload_config(struct device *dev, struct blob_attr *attr)
 }
 
 enum dev_change_type
-device_set_config(struct device *dev, const struct device_type *type,
-                 struct blob_attr *attr)
+device_apply_config(struct device *dev, const struct device_type *type,
+                   struct blob_attr *config)
 {
-       if (type != dev->type)
-               return DEV_CONFIG_RECREATE;
+       enum dev_change_type change;
 
-       if (dev->type->reload)
-               return dev->type->reload(dev, attr);
+       change = device_set_config(dev, type, config);
+       if (dev->external) {
+               system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
+               change = DEV_CONFIG_APPLIED;
+       }
+
+       switch (change) {
+               case DEV_CONFIG_RESTART:
+               case DEV_CONFIG_APPLIED:
+                       D(DEVICE, "Device '%s': config applied\n", dev->ifname);
+                       config = blob_memdup(config);
+                       free(dev->config);
+                       dev->config = config;
+                       if (change == DEV_CONFIG_RESTART && dev->present) {
+                               device_set_present(dev, false);
+                               device_set_present(dev, true);
+                       }
+                       break;
+               case DEV_CONFIG_NO_CHANGE:
+                       D(DEVICE, "Device '%s': no configuration change\n", dev->ifname);
+                       break;
+               case DEV_CONFIG_RECREATE:
+                       break;
+       }
 
-       return device_reload_config(dev, attr);
+       return change;
 }
 
 static void
@@ -664,41 +703,25 @@ device_create(const char *name, const struct device_type *type,
        struct device *odev = NULL, *dev;
        enum dev_change_type change;
 
-       config = blob_memdup(config);
-       if (!config)
-               return NULL;
-
        odev = device_get(name, false);
        if (odev) {
                odev->current_config = true;
-               change = device_set_config(odev, type, config);
-               if (odev->external) {
-                       system_if_apply_settings(odev, &odev->settings, odev->settings.flags);
-                       change = DEV_CONFIG_APPLIED;
-               }
+               change = device_apply_config(odev, type, config);
                switch (change) {
-               case DEV_CONFIG_RESTART:
-               case DEV_CONFIG_APPLIED:
-                       D(DEVICE, "Device '%s': config applied\n", odev->ifname);
-                       free(odev->config);
-                       odev->config = config;
-                       if (change == DEV_CONFIG_RESTART && odev->present) {
-                               device_set_present(odev, false);
-                               device_set_present(odev, true);
-                       }
-                       return odev;
-               case DEV_CONFIG_NO_CHANGE:
-                       D(DEVICE, "Device '%s': no configuration change\n", odev->ifname);
-                       free(config);
-                       return odev;
                case DEV_CONFIG_RECREATE:
                        D(DEVICE, "Device '%s': recreate device\n", odev->ifname);
                        device_delete(odev);
                        break;
+               default:
+                       return odev;
                }
        } else
                D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
 
+       config = blob_memdup(config);
+       if (!config)
+               return NULL;
+
        dev = type->create(name, config);
        if (!dev)
                return NULL;
@@ -765,6 +788,8 @@ device_dump_status(struct blob_buf *b, struct device *dev)
                        blobmsg_add_u8(b, "acceptlocal", st.acceptlocal);
                if (st.flags & DEV_OPT_IGMPVERSION)
                        blobmsg_add_u32(b, "igmpversion", st.igmpversion);
+               if (st.flags & DEV_OPT_MLDVERSION)
+                       blobmsg_add_u32(b, "mldversion", st.mldversion);
        }
 
        s = blobmsg_open_table(b, "statistics");