CMake: bump the minimum required CMake version to 3.5

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index e26edbbc2d223030b14d0f10a711558ffbc182c9..322e009352eb80fd534c80871e84065bab7e979c 100644 (file)
--- a/device.c
+++ b/device.c
@@ -172,6 +172,11 @@ static int set_device_state(struct device *dev, bool state)
        } else {
                system_if_down(dev);
                system_if_apply_settings(dev, &dev->orig_settings, dev->orig_settings.flags);
+
+               /* Restore any settings present in UCI which may have
+                * failed to apply so that they will be re-attempted
+                * the next time the device is brought up */
+               dev->settings.flags |= dev->settings.valid_flags;
        }
 
        return 0;
@@ -354,7 +359,10 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
        struct ether_addr *ea;
        bool disabled = false;
 
-       s->flags = 0;
+       if (dev->wireless)
+               s->flags &= DEV_OPT_ISOLATE;
+       else
+               s->flags = 0;
        if ((cur = tb[DEV_ATTR_ENABLED]))
                disabled = !blobmsg_get_bool(cur);
 
@@ -400,7 +408,7 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                if (system_resolve_rpfilter(blobmsg_data(cur), &s->rpfilter))
                        s->flags |= DEV_OPT_RPFILTER;
                else
-                       DPRINTF("Failed to resolve rpfilter: %s\n", (char *) blobmsg_data(cur));
+                       D(DEVICE, "Failed to resolve rpfilter: %s", (char *) blobmsg_data(cur));
        }
 
        if ((cur = tb[DEV_ATTR_ACCEPTLOCAL])) {
@@ -413,7 +421,7 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                if (s->igmpversion >= 1 && s->igmpversion <= 3)
                        s->flags |= DEV_OPT_IGMPVERSION;
                else
-                       DPRINTF("Failed to resolve igmpversion: %d\n", blobmsg_get_u32(cur));
+                       D(DEVICE, "Failed to resolve igmpversion: %d", blobmsg_get_u32(cur));
        }
 
        if ((cur = tb[DEV_ATTR_MLDVERSION])) {
@@ -421,7 +429,7 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                if (s->mldversion >= 1 && s->mldversion <= 2)
                        s->flags |= DEV_OPT_MLDVERSION;
                else
-                       DPRINTF("Failed to resolve mldversion: %d\n", blobmsg_get_u32(cur));
+                       D(DEVICE, "Failed to resolve mldversion: %d", blobmsg_get_u32(cur));
        }
 
        if ((cur = tb[DEV_ATTR_NEIGHREACHABLETIME])) {
@@ -454,7 +462,7 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                if (s->multicast_router <= 2)
                        s->flags |= DEV_OPT_MULTICAST_ROUTER;
                else
-                       DPRINTF("Invalid value: %d - (Use 0: never, 1: learn, 2: always)\n", blobmsg_get_u32(cur));
+                       D(DEVICE, "Invalid value: %d - (Use 0: never, 1: learn, 2: always)", blobmsg_get_u32(cur));
        }
 
        if ((cur = tb[DEV_ATTR_MULTICAST_FAST_LEAVE])) {
@@ -568,6 +576,9 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                s->flags |= DEV_OPT_EEE;
        }
 
+       /* Remember the settings present in UCI */
+       s->valid_flags = s->flags;
+
        cur = tb[DEV_ATTR_AUTH_VLAN];
        free(dev->config_auth_vlans);
        dev->config_auth_vlans = cur ? blob_memdup(cur) : NULL;
@@ -680,7 +691,7 @@ int device_claim(struct device_user *dep)
                return -1;
 
        dep->claimed = true;
-       D(DEVICE, "Claim %s %s, new active count: %d\n", dev->type->name, dev->ifname, dev->active + 1);
+       D(DEVICE, "Claim %s %s, new active count: %d", dev->type->name, dev->ifname, dev->active + 1);
        if (++dev->active != 1)
                return 0;
 
@@ -700,7 +711,7 @@ int device_claim(struct device_user *dep)
        if (ret == 0)
                device_broadcast_event(dev, DEV_EVENT_UP);
        else {
-               D(DEVICE, "claim %s %s failed: %d\n", dev->type->name, dev->ifname, ret);
+               D(DEVICE, "claim %s %s failed: %d", dev->type->name, dev->ifname, ret);
                dev->active = 0;
                dep->claimed = false;
        }
@@ -717,7 +728,7 @@ void device_release(struct device_user *dep)
 
        dep->claimed = false;
        dev->active--;
-       D(DEVICE, "Release %s %s, new active count: %d\n", dev->type->name, dev->ifname, dev->active);
+       D(DEVICE, "Release %s %s, new active count: %d", dev->type->name, dev->ifname, dev->active);
        assert(dev->active >= 0);
 
        if (dev->active)
@@ -746,7 +757,7 @@ int device_init_virtual(struct device *dev, struct device_type *type, const char
        assert(dev);
        assert(type);
 
-       D(DEVICE, "Initialize device '%s'\n", name ? name : "");
+       D(DEVICE, "Initialize device '%s'", name ? name : "");
        INIT_SAFE_LIST(&dev->users);
        INIT_SAFE_LIST(&dev->aliases);
        dev->type = type;
@@ -755,8 +766,10 @@ int device_init_virtual(struct device *dev, struct device_type *type, const char
                int ret;
 
                ret = device_set_ifname(dev, name);
-               if (ret < 0)
+               if (ret < 0) {
+                       netifd_log_message(L_WARNING, "Failed to initalize device '%s'\n", name);
                        return ret;
+               }
        }
 
        if (!dev->set_state)
@@ -792,7 +805,7 @@ device_create_default(const char *name, bool external)
        if (!external && system_if_force_external(name))
                return NULL;
 
-       D(DEVICE, "Create simple device '%s'\n", name);
+       D(DEVICE, "Create simple device '%s'", name);
        dev = calloc(1, sizeof(*dev));
        if (!dev)
                return NULL;
@@ -857,7 +870,7 @@ device_delete(struct device *dev)
        if (!dev->avl.key)
                return;
 
-       D(DEVICE, "Delete device '%s' from list\n", dev->ifname);
+       D(DEVICE, "Delete device '%s' from list", dev->ifname);
        avl_delete(&devices, &dev->avl);
        dev->avl.key = NULL;
 }
@@ -874,15 +887,15 @@ static int device_cleanup_cb(void *ctx, struct safe_list *list)
 
 void device_cleanup(struct device *dev)
 {
-       D(DEVICE, "Clean up device '%s'\n", dev->ifname);
+       D(DEVICE, "Clean up device '%s'", dev->ifname);
        safe_list_for_each(&dev->users, device_cleanup_cb, NULL);
        safe_list_for_each(&dev->aliases, device_cleanup_cb, NULL);
        device_delete(dev);
 }
 
-static void __device_set_present(struct device *dev, bool state)
+static void __device_set_present(struct device *dev, bool state, bool force)
 {
-       if (dev->present == state)
+       if (dev->present == state && !force)
                return;
 
        dev->present = state;
@@ -897,7 +910,7 @@ device_refresh_present(struct device *dev)
        if (dev->disabled || dev->deferred)
                state = false;
 
-       __device_set_present(dev, state);
+       __device_set_present(dev, state, false);
 }
 
 void
@@ -935,9 +948,12 @@ void device_set_present(struct device *dev, bool state)
        if (dev->sys_present == state)
                return;
 
-       D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
+       D(DEVICE, "%s '%s' %s present", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
        dev->sys_present = state;
-       device_refresh_present(dev);
+       if (!state)
+               __device_set_present(dev, state, true);
+       else
+               device_refresh_present(dev);
        if (!state)
                safe_list_for_each(&dev->users, device_release_cb, NULL);
 }
@@ -971,8 +987,11 @@ int device_set_ifname(struct device *dev, const char *name)
        if (!strcmp(dev->ifname, name))
                return 0;
 
-       if (strlen(name) > sizeof(dev->ifname) - 1)
+       if (strlen(name) > sizeof(dev->ifname) - 1) {
+               netifd_log_message(L_WARNING, "Cannot set device name: '%s' is longer than max size %zd\n",
+                       name, sizeof(dev->ifname) - 1);
                return -1;
+       }
 
        if (dev->avl.key)
                avl_delete(&devices, &dev->avl);
@@ -1015,7 +1034,7 @@ __device_add_user(struct device_user *dep, struct device *dev)
                head = &dev->users;
 
        safe_list_add(&dep->list, head);
-       D(DEVICE, "Add user for device '%s', refcount=%d\n", dev->ifname, device_refcount(dev));
+       D(DEVICE, "Add user for device '%s', refcount=%d", dev->ifname, device_refcount(dev));
 
        if (dep->cb && dev->present) {
                dep->cb(dep, DEV_EVENT_ADD);
@@ -1091,7 +1110,7 @@ void device_remove_user(struct device_user *dep)
 
        safe_list_del(&dep->list);
        dep->dev = NULL;
-       D(DEVICE, "Remove user for device '%s', refcount=%d\n", dev->ifname, device_refcount(dev));
+       D(DEVICE, "Remove user for device '%s', refcount=%d", dev->ifname, device_refcount(dev));
        device_free_unused();
 }
 
@@ -1166,7 +1185,7 @@ device_apply_config(struct device *dev, struct device_type *type,
        switch (change) {
                case DEV_CONFIG_RESTART:
                case DEV_CONFIG_APPLIED:
-                       D(DEVICE, "Device '%s': config applied\n", dev->ifname);
+                       D(DEVICE, "Device '%s': config applied", dev->ifname);
                        config = blob_memdup(config);
                        free(dev->config);
                        dev->config = config;
@@ -1184,7 +1203,7 @@ device_apply_config(struct device *dev, struct device_type *type,
                        }
                        break;
                case DEV_CONFIG_NO_CHANGE:
-                       D(DEVICE, "Device '%s': no configuration change\n", dev->ifname);
+                       D(DEVICE, "Device '%s': no configuration change", dev->ifname);
                        break;
                case DEV_CONFIG_RECREATE:
                        break;
@@ -1258,14 +1277,14 @@ device_create(const char *name, struct device_type *type,
                change = device_apply_config(odev, type, config);
                switch (change) {
                case DEV_CONFIG_RECREATE:
-                       D(DEVICE, "Device '%s': recreate device\n", odev->ifname);
+                       D(DEVICE, "Device '%s': recreate device", odev->ifname);
                        device_delete(odev);
                        break;
                default:
                        return odev;
                }
        } else
-               D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
+               D(DEVICE, "Create new device '%s' (%s)", name, type->name);
 
        config = blob_memdup(config);
        if (!config)