X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=ef706853e7806771cff66274a35433457f0e7ab7;hp=e1ffba179e9996a8e56a3f6ed3df827c7fffcb1b;hb=4ea88db58ca2c7d488996003b4a51cc3f3cf7808;hpb=5d1fff7af6f77c9bf0d46572c7af563cd9fc55b3

diff --git a/device.c b/device.c
index e1ffba1..ef70685 100644
--- a/device.c
+++ b/device.c
@@ -3,24 +3,17 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include <libubox/uapi.h>
-
 #include "netifd.h"
 #include "system.h"
 
 static struct avl_tree devices;
 
-static int avl_strcmp(const void *k1, const void *k2, void *ptr)
-{
-	return strcmp(k1, k2);
-}
-
-static void API_CTOR dev_init(void)
+static void __init 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);
@@ -40,15 +33,11 @@ static void broadcast_device_event(struct device *dev, enum device_event ev)
 
 static int set_device_state(struct device *dev, bool state)
 {
-	if (state) {
-		broadcast_device_event(dev, DEV_EVENT_SETUP);
+	if (state)
 		system_if_up(dev);
-		broadcast_device_event(dev, DEV_EVENT_UP);
-	} else {
-		broadcast_device_event(dev, DEV_EVENT_TEARDOWN);
+	else
 		system_if_down(dev);
-		broadcast_device_event(dev, DEV_EVENT_DOWN);
-	}
+
 	return 0;
 }
 
@@ -60,8 +49,11 @@ int claim_device(struct device *dev)
 	if (++dev->active != 1)
 		return 0;
 
+	broadcast_device_event(dev, DEV_EVENT_SETUP);
 	ret = dev->set_state(dev, true);
-	if (ret != 0)
+	if (ret == 0)
+		broadcast_device_event(dev, DEV_EVENT_UP);
+	else
 		dev->active = 0;
 
 	return ret;
@@ -73,8 +65,12 @@ void release_device(struct device *dev)
 	DPRINTF("release device %s, new refcount: %d\n", dev->ifname, dev->active);
 	assert(dev->active >= 0);
 
-	if (!dev->active)
-		dev->set_state(dev, false);
+	if (dev->active)
+		return;
+
+	broadcast_device_event(dev, DEV_EVENT_TEARDOWN);
+	dev->set_state(dev, false);
+	broadcast_device_event(dev, DEV_EVENT_DOWN);
 }
 
 int check_device_state(struct device *dev)
@@ -85,29 +81,36 @@ int check_device_state(struct device *dev)
 	return dev->type->check_state(dev);
 }
 
-int init_device(struct device *dev, const struct device_type *type, const char *ifname)
+void init_virtual_device(struct device *dev, const struct device_type *type, const char *name)
 {
-	int ret;
-
 	assert(dev);
 	assert(type);
 
-	if (ifname)
-		strncpy(dev->ifname, ifname, IFNAMSIZ);
+	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)
+{
+	int ret;
+
+	init_virtual_device(dev, type, ifname);
 
 	if (!dev->set_state)
 		dev->set_state = set_device_state;
 
-	fprintf(stderr, "Initialize interface '%s'\n", dev->ifname);
-	INIT_LIST_HEAD(&dev->users);
 	dev->avl.key = dev->ifname;
-	dev->type = type;
 
 	ret = avl_insert(&devices, &dev->avl);
 	if (ret < 0)
 		return ret;
 
 	check_device_state(dev);
+
 	return 0;
 }
 
@@ -116,7 +119,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;
 
@@ -141,7 +144,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;
@@ -149,7 +152,8 @@ void cleanup_device(struct device *dev)
 		dep->cb(dep, DEV_EVENT_REMOVE);
 	}
 
-	avl_delete(&devices, &dev->avl);
+	if (dev->avl.key)
+		avl_delete(&devices, &dev->avl);
 }
 
 void set_device_present(struct device *dev, bool state)
@@ -180,9 +184,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);
+	}
+}