add code for cleaning up unused devices mentioned in the config

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 1f84a83..34b49d4 100644 (file)
--- a/device.c
+++ b/device.c
@@ -20,7 +20,7 @@ static void API_CTOR dev_init(void)
        avl_init(&devices, avl_strcmp, false, NULL);
 }
 
-static void free_device(struct device *dev)
+static void free_simple_device(struct device *dev)
 {
        cleanup_device(dev);
        free(dev);
@@ -93,12 +93,12 @@ void init_virtual_device(struct device *dev, const struct device_type *type, con
        assert(dev);
        assert(type);
 
-       fprintf(stderr, "Initialize interface '%s'\n", dev->ifname);
-       INIT_LIST_HEAD(&dev->users);
-       dev->type = type;
-
        if (name)
                strncpy(dev->ifname, name, IFNAMSIZ);
+
+       fprintf(stderr, "Initialize device '%s'\n", dev->ifname);
+       INIT_LIST_HEAD(&dev->users);
+       dev->type = type;
 }
 
 int init_device(struct device *dev, const struct device_type *type, const char *ifname)
@@ -126,7 +126,7 @@ struct device *get_device(const char *name, bool create)
        static const struct device_type simple_type = {
                .name = "Device",
                .check_state = system_if_check,
-               .free = free_device,
+               .free = free_simple_device,
        };
        struct device *dev;
 
@@ -151,7 +151,7 @@ void cleanup_device(struct device *dev)
 {
        struct device_user *dep, *tmp;
 
-       fprintf(stderr, "Clean up interface '%s'\n", dev->ifname);
+       fprintf(stderr, "Clean up device '%s'\n", dev->ifname);
        list_for_each_entry_safe(dep, tmp, &dev->users, list) {
                if (!dep->cb)
                        continue;
@@ -191,9 +191,22 @@ void remove_device_user(struct device_user *dep)
        list_del(&dep->list);
 
        if (list_empty(&dev->users)) {
-               /* all references have gone away, remove this interface */
-               dev->type->free(dev);
+               /* all references have gone away, remove this device */
+               free_device(dev);
        }
 
        dep->dev = NULL;
 }
+
+void
+cleanup_devices(void)
+{
+       struct device *dev, *tmp;
+
+       avl_for_each_element_safe(&devices, dev, avl, tmp) {
+               if (!list_empty(&dev->users))
+                       continue;
+
+               free_device(dev);
+       }
+}