X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=56fc3f787713ce5eb0d9e3bf6833b460d1d264cd;hp=0560a708705772cd74ea562179163cc1833c000c;hb=134775b1f41fa19a816768268b9d0f8dad86bd90;hpb=b7d1c27b752df3e6c5dfe6a5b789d6cb0c87d0f6

diff --git a/device.c b/device.c
index 0560a70..56fc3f7 100644
--- a/device.c
+++ b/device.c
@@ -1,3 +1,16 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -16,28 +29,17 @@
 #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 },
-	[DEV_ATTR_IFNAME] = { "ifname", BLOBMSG_TYPE_ARRAY },
-	[DEV_ATTR_MTU] = { "mtu", BLOBMSG_TYPE_INT32 },
-	[DEV_ATTR_MACADDR] = { "macaddr", BLOBMSG_TYPE_STRING },
-	[DEV_ATTR_TXQUEUELEN] = { "txqueuelen", BLOBMSG_TYPE_INT32 },
-	[DEV_ATTR_ENABLED] = { "enabled", BLOBMSG_TYPE_BOOL },
+	[DEV_ATTR_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING },
+	[DEV_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_ARRAY },
+	[DEV_ATTR_MTU] = { .name = "mtu", .type = BLOBMSG_TYPE_INT32 },
+	[DEV_ATTR_MACADDR] = { .name = "macaddr", .type = BLOBMSG_TYPE_STRING },
+	[DEV_ATTR_TXQUEUELEN] = { .name = "txqueuelen", .type = BLOBMSG_TYPE_INT32 },
+	[DEV_ATTR_ENABLED] = { .name = "enabled", .type = BLOBMSG_TYPE_BOOL },
 };
 
-const struct config_param_list device_attr_list = {
+const struct uci_blob_param_list device_attr_list = {
 	.n_params = __DEV_ATTR_MAX,
 	.params = dev_attrs,
 };
@@ -124,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)
 {
@@ -224,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;
+	struct device_user *dep = container_of(list, struct device_user, list);
+	int *ev = ctx;
 
-	list_for_each_entry_safe(dep, tmp, &dev->users, list) {
-		if (!dep->cb)
-			continue;
-
-		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);
-		}
-	}
-
-	device_set_present(&alias->dev, !!dev);
+	int dev_ev = ev;
 
-	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)
@@ -285,7 +216,7 @@ int device_claim(struct device_user *dep)
 	if (ret == 0)
 		device_broadcast_event(dev, DEV_EVENT_UP);
 	else {
-		D(DEVICE, "claim device %s failed: %d\n", dev->ifname, ret);
+		D(DEVICE, "claim %s %s failed: %d\n", dev->type->name, dev->ifname, ret);
 		dev->active = 0;
 		dep->claimed = false;
 	}
@@ -331,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)
@@ -341,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);
@@ -361,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;
@@ -370,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)
 {
@@ -394,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;
@@ -414,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);
 }
 
@@ -439,30 +369,48 @@ static void __device_set_present(struct device *dev, bool state)
 	device_broadcast_event(dev, state ? DEV_EVENT_ADD : DEV_EVENT_REMOVE);
 }
 
+void
+device_refresh_present(struct device *dev)
+{
+	bool state = dev->sys_present;
+
+	if (dev->disabled || dev->deferred)
+		state = false;
+
+	__device_set_present(dev, state);
+}
+
 void device_set_present(struct device *dev, bool state)
 {
 	if (dev->sys_present == state)
 		return;
 
-	dev->sys_present = state;
 	D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
-
-	if (state && dev->disabled)
-		return;
-
-	__device_set_present(dev, state);
+	dev->sys_present = state;
+	device_refresh_present(dev);
 }
 
-void
-device_set_disabled(struct device *dev, bool value)
+static int device_refcount(struct device *dev)
 {
-	dev->disabled = value;
-	if (dev->sys_present)
-		__device_set_present(dev, !value);
+	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 == dev)
+		return;
+
 	if (dep->dev)
 		device_remove_user(dep);
 
@@ -470,7 +418,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)
@@ -491,7 +447,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);
@@ -508,8 +466,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);
 }
 
@@ -543,9 +502,9 @@ static enum dev_change_type
 device_reload_config(struct device *dev, struct blob_attr *attr)
 {
 	struct blob_attr *tb[__DEV_ATTR_MAX];
-	const struct config_param_list *cfg = dev->type->config_params;
+	const struct uci_blob_param_list *cfg = dev->type->config_params;
 
-	if (config_check_equal(dev->config, attr, cfg))
+	if (uci_blob_check_equal(dev->config, attr, cfg))
 		return DEV_CONFIG_NO_CHANGE;
 
 	if (cfg == &device_attr_list) {
@@ -583,9 +542,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);
@@ -627,7 +587,7 @@ device_create(const char *name, const struct device_type *type,
 	struct device *odev = NULL, *dev;
 	enum dev_change_type change;
 
-	config = config_memdup(config);
+	config = blob_memdup(config);
 	if (!config)
 		return NULL;
 
@@ -635,6 +595,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:
@@ -691,10 +655,13 @@ device_dump_status(struct blob_buf *b, struct device *dev)
 		return;
 	}
 
+	blobmsg_add_u8(b, "external", dev->external);
+	blobmsg_add_u8(b, "present", dev->present);
+	blobmsg_add_string(b, "type", dev->type->name);
+
 	if (!dev->present)
 		return;
 
-	blobmsg_add_string(b, "type", dev->type->name);
 	blobmsg_add_u8(b, "up", !!dev->active);
 	if (dev->type->dump_info)
 		dev->type->dump_info(dev, b);
@@ -706,7 +673,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);
 	}