X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=1c0736f67ce05260d5c1d3800f6bd52dec4140fd;hp=7958fed7b4cc8df8413ff0efa9d6f68a397a4867;hb=b35fd5d5788184f685520352962f1a727ea91c1e;hpb=1850d0350d3af11514744961d827a8b9facdaf00

diff --git a/device.c b/device.c
index 7958fed..1c0736f 100644
--- a/device.c
+++ b/device.c
@@ -29,17 +29,6 @@
 #include "config.h"
 
 static struct avl_tree devices;
-static struct avl_tree aliases;
-
-struct alias_device {
-	struct avl_node avl;
-	struct device dev;
-	struct device_user dep;
-	bool cleanup;
-	char name[];
-};
-
-static const struct device_type alias_device_type;
 
 static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
 	[DEV_ATTR_TYPE] = { "type", BLOBMSG_TYPE_STRING },
@@ -137,54 +126,6 @@ const struct device_type simple_device_type = {
 	.free = simple_device_free,
 };
 
-static int
-alias_device_set_state(struct device *dev, bool state)
-{
-	struct alias_device *alias;
-
-	alias = container_of(dev, struct alias_device, dev);
-	if (!alias->dep.dev)
-		return -1;
-
-	if (state)
-		return device_claim(&alias->dep);
-
-	device_release(&alias->dep);
-	if (alias->cleanup)
-		device_remove_user(&alias->dep);
-	return 0;
-}
-
-static struct device *
-alias_device_create(const char *name, struct blob_attr *attr)
-{
-	struct alias_device *alias;
-
-	alias = calloc(1, sizeof(*alias) + strlen(name) + 1);
-	strcpy(alias->name, name);
-	alias->dev.set_state = alias_device_set_state;
-	device_init_virtual(&alias->dev, &alias_device_type, NULL);
-	alias->avl.key = alias->name;
-	avl_insert(&aliases, &alias->avl);
-
-	return &alias->dev;
-}
-
-static void alias_device_free(struct device *dev)
-{
-	struct alias_device *alias;
-
-	alias = container_of(dev, struct alias_device, dev);
-	avl_delete(&aliases, &alias->avl);
-	free(alias);
-}
-
-static const struct device_type alias_device_type = {
-	.name = "Network alias",
-	.create = alias_device_create,
-	.free = alias_device_free,
-};
-
 static void
 device_merge_settings(struct device *dev, struct device_settings *n)
 {
@@ -237,47 +178,24 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
 static void __init dev_init(void)
 {
 	avl_init(&devices, avl_strcmp, true, NULL);
-	avl_init(&aliases, avl_strcmp, false, NULL);
 }
 
-static void device_broadcast_event(struct device *dev, enum device_event ev)
+static int device_broadcast_cb(void *ctx, struct safe_list *list)
 {
-	struct device_user *dep, *tmp;
-
-	list_for_each_entry_safe(dep, tmp, &dev->users, list) {
-		if (!dep->cb)
-			continue;
+	struct device_user *dep = container_of(list, struct device_user, list);
+	int *ev = ctx;
 
-		dep->cb(dep, ev);
-	}
+	if (dep->cb)
+		dep->cb(dep, *ev);
+	return 0;
 }
 
-void
-alias_notify_device(const char *name, struct device *dev)
+void device_broadcast_event(struct device *dev, enum device_event ev)
 {
-	struct alias_device *alias;
-
-	device_lock();
-
-	alias = avl_find_element(&aliases, name, alias, avl);
-	if (!alias)
-		return;
-
-	alias->cleanup = !dev;
-	if (dev) {
-		if (dev != alias->dep.dev) {
-			device_remove_user(&alias->dep);
-			strcpy(alias->dev.ifname, dev->ifname);
-			device_add_user(&alias->dep, dev);
-		}
-	}
+	int dev_ev = ev;
 
-	device_set_present(&alias->dev, !!dev);
-
-	if (!dev && alias->dep.dev && !alias->dep.dev->active)
-		device_remove_user(&alias->dep);
-
-	device_unlock();
+	safe_list_for_each(&dev->aliases, device_broadcast_cb, &dev_ev);
+	safe_list_for_each(&dev->users, device_broadcast_cb, &dev_ev);
 }
 
 int device_claim(struct device_user *dep)
@@ -344,8 +262,12 @@ void device_init_virtual(struct device *dev, const struct device_type *type, con
 		strncpy(dev->ifname, name, IFNAMSIZ);
 
 	D(DEVICE, "Initialize device '%s'\n", dev->ifname);
-	INIT_LIST_HEAD(&dev->users);
+	INIT_SAFE_LIST(&dev->users);
+	INIT_SAFE_LIST(&dev->aliases);
 	dev->type = type;
+
+	if (!dev->set_state)
+		dev->set_state = set_device_state;
 }
 
 int device_init(struct device *dev, const struct device_type *type, const char *ifname)
@@ -354,9 +276,6 @@ int device_init(struct device *dev, const struct device_type *type, const char *
 
 	device_init_virtual(dev, type, ifname);
 
-	if (!dev->set_state)
-		dev->set_state = set_device_state;
-
 	dev->avl.key = dev->ifname;
 
 	ret = avl_insert(&devices, &dev->avl);
@@ -374,6 +293,9 @@ device_create_default(const char *name, bool external)
 {
 	struct device *dev;
 
+	if (!external && system_if_force_external(name))
+		return NULL;
+
 	D(DEVICE, "Create simple device '%s'\n", name);
 	dev = calloc(1, sizeof(*dev));
 	dev->external = external;
@@ -383,18 +305,6 @@ device_create_default(const char *name, bool external)
 	return dev;
 }
 
-static struct device *
-device_alias_get(const char *name)
-{
-	struct alias_device *alias;
-
-	alias = avl_find_element(&aliases, name, alias, avl);
-	if (alias)
-		return &alias->dev;
-
-	return alias_device_create(name, NULL);
-}
-
 struct device *
 device_get(const char *name, int create)
 {
@@ -407,8 +317,13 @@ device_get(const char *name, int create)
 		return device_alias_get(name + 1);
 
 	dev = avl_find_element(&devices, name, dev, avl);
-	if (dev)
+	if (dev) {
+		if (create > 1 && !dev->external) {
+			dev->external = true;
+			device_set_present(dev, true);
+		}
 		return dev;
+	}
 
 	if (!create)
 		return NULL;
@@ -427,19 +342,21 @@ device_delete(struct device *dev)
 	dev->avl.key = NULL;
 }
 
-void device_cleanup(struct device *dev)
+static int device_cleanup_cb(void *ctx, struct safe_list *list)
 {
-	struct device_user *dep, *tmp;
-
-	D(DEVICE, "Clean up device '%s'\n", dev->ifname);
-	list_for_each_entry_safe(dep, tmp, &dev->users, list) {
-		if (!dep->cb)
-			continue;
-
+	struct device_user *dep = container_of(list, struct device_user, list);
+	if (dep->cb)
 		dep->cb(dep, DEV_EVENT_REMOVE);
-		device_release(dep);
-	}
 
+	device_release(dep);
+	return 0;
+}
+
+void device_cleanup(struct device *dev)
+{
+	D(DEVICE, "Clean up device '%s'\n", 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);
 }
 
@@ -473,8 +390,24 @@ void device_set_present(struct device *dev, bool state)
 	device_refresh_present(dev);
 }
 
+static int device_refcount(struct device *dev)
+{
+	struct list_head *list;
+	int count = 0;
+
+	list_for_each(list, &dev->users.list)
+		count++;
+
+	list_for_each(list, &dev->aliases.list)
+		count++;
+
+	return count;
+}
+
 void device_add_user(struct device_user *dep, struct device *dev)
 {
+	struct safe_list *head;
+
 	if (dep->dev)
 		device_remove_user(dep);
 
@@ -482,7 +415,15 @@ void device_add_user(struct device_user *dep, struct device *dev)
 		return;
 
 	dep->dev = dev;
-	list_add_tail(&dep->list, &dev->users);
+
+	if (dep->alias)
+		head = &dev->aliases;
+	else
+		head = &dev->users;
+
+	safe_list_add(&dep->list, head);
+	D(DEVICE, "Add user for device '%s', refcount=%d\n", dev->ifname, device_refcount(dev));
+
 	if (dep->cb && dev->present) {
 		dep->cb(dep, DEV_EVENT_ADD);
 		if (dev->active)
@@ -503,7 +444,9 @@ device_free(struct device *dev)
 static void
 __device_free_unused(struct device *dev)
 {
-	if (!list_empty(&dev->users) || dev->current_config || __devlock)
+	if (!safe_list_empty(&dev->users) ||
+		!safe_list_empty(&dev->aliases) ||
+	    dev->current_config || __devlock)
 		return;
 
 	device_free(dev);
@@ -520,8 +463,9 @@ void device_remove_user(struct device_user *dep)
 	if (dep->claimed)
 		device_release(dep);
 
-	list_del(&dep->list);
+	safe_list_del(&dep->list);
 	dep->dev = NULL;
+	D(DEVICE, "Remove user for device '%s', refcount=%d\n", dev->ifname, device_refcount(dev));
 	__device_free_unused(dev);
 }
 
@@ -595,9 +539,10 @@ device_replace(struct device *dev, struct device *odev)
 	if (present)
 		device_set_present(odev, false);
 
-	list_for_each_entry_safe(dep, tmp, &odev->users, list) {
+	list_for_each_entry_safe(dep, tmp, &odev->users.list, list.list) {
 		device_release(dep);
-		list_move_tail(&dep->list, &dev->users);
+		safe_list_del(&dep->list);
+		safe_list_add(&dep->list, &dev->users);
 		dep->dev = dev;
 	}
 	device_free(odev);
@@ -647,6 +592,10 @@ device_create(const char *name, const struct device_type *type,
 	if (odev) {
 		odev->current_config = true;
 		change = device_set_config(odev, type, config);
+		if (odev->external) {
+			system_if_apply_settings(odev, &odev->settings);
+			change = DEV_CONFIG_APPLIED;
+		}
 		switch (change) {
 		case DEV_CONFIG_RESTART:
 		case DEV_CONFIG_APPLIED:
@@ -721,7 +670,7 @@ device_dump_status(struct blob_buf *b, struct device *dev)
 		if (st.flags & DEV_OPT_MTU)
 			blobmsg_add_u32(b, "mtu", st.mtu);
 		if (st.flags & DEV_OPT_MACADDR)
-			blobmsg_add_string(b, "macaddr", ether_ntoa((struct ether_addr *) st.macaddr));
+			blobmsg_add_string(b, "macaddr", format_macaddr(st.macaddr));
 		if (st.flags & DEV_OPT_TXQUEUELEN)
 			blobmsg_add_u32(b, "txqueuelen", st.txqueuelen);
 	}