X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=428d0019d752edb813b269b18da538b631e06277;hp=ac0954df43b4c227872872e90c8ed74627683c9f;hb=fb0e4138070d7c2ce723af5780e763af3a1353d8;hpb=3de7978b64876a1dc5e3eab8735a801971423820

diff --git a/device.c b/device.c
index ac0954d..428d001 100644
--- a/device.c
+++ b/device.c
@@ -16,10 +16,20 @@
 #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_NAME] = { "name", BLOBMSG_TYPE_STRING },
 	[DEV_ATTR_IFNAME] = { "ifname", BLOBMSG_TYPE_ARRAY },
 	[DEV_ATTR_MTU] = { "mtu", BLOBMSG_TYPE_INT32 },
 	[DEV_ATTR_MACADDR] = { "macaddr", BLOBMSG_TYPE_STRING },
@@ -31,21 +41,27 @@ const struct config_param_list device_attr_list = {
 	.params = dev_attrs,
 };
 
+static int __devlock = 0;
+
+void device_lock(void)
+{
+	__devlock++;
+}
+
+void device_unlock(void)
+{
+	__devlock--;
+	if (!__devlock)
+		device_free_unused(NULL);
+}
+
 static struct device *
-simple_device_create(struct blob_attr *attr)
+simple_device_create(const char *name, struct blob_attr *attr)
 {
 	struct blob_attr *tb[__DEV_ATTR_MAX];
 	struct device *dev = NULL;
-	const char *name;
 
 	blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb, blob_data(attr), blob_len(attr));
-	if (!tb[DEV_ATTR_NAME])
-		return NULL;
-
-	name = blobmsg_data(tb[DEV_ATTR_NAME]);
-	if (!name)
-		return NULL;
-
 	dev = device_get(name, true);
 	if (!dev)
 		return NULL;
@@ -70,6 +86,56 @@ 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;
+
+	device_cleanup(dev);
+
+	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,
+};
+
 void
 device_init_settings(struct device *dev, struct blob_attr **tb)
 {
@@ -100,6 +166,7 @@ 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)
@@ -114,6 +181,34 @@ static void device_broadcast_event(struct device *dev, enum device_event ev)
 	}
 }
 
+void
+alias_notify_device(const char *name, struct device *dev)
+{
+	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);
+
+	if (!dev && alias->dep.dev && !alias->dep.dev->active)
+		device_remove_user(&alias->dep);
+
+	device_unlock();
+}
+
 static int set_device_state(struct device *dev, bool state)
 {
 	if (state)
@@ -133,7 +228,7 @@ int device_claim(struct device_user *dep)
 		return 0;
 
 	dep->claimed = true;
-	D(DEVICE, "claim device %s, new refcount: %d\n", dev->ifname, dev->active + 1);
+	D(DEVICE, "Claim %s %s, new refcount: %d\n", dev->type->name, dev->ifname, dev->active + 1);
 	if (++dev->active != 1)
 		return 0;
 
@@ -159,7 +254,7 @@ void device_release(struct device_user *dep)
 
 	dep->claimed = false;
 	dev->active--;
-	D(DEVICE, "release device %s, new refcount: %d\n", dev->ifname, dev->active);
+	D(DEVICE, "Release %s %s, new refcount: %d\n", dev->type->name, dev->ifname, dev->active);
 	assert(dev->active >= 0);
 
 	if (dev->active)
@@ -206,31 +301,48 @@ int device_init(struct device *dev, const struct device_type *type, const char *
 	if (ret < 0)
 		return ret;
 
+	system_if_clear_state(dev);
 	device_check_state(dev);
 
 	return 0;
 }
 
 static struct device *
-device_create_default(const char *name)
+device_create_default(const char *name, bool external)
 {
 	struct device *dev;
 
 	D(DEVICE, "Create simple device '%s'\n", name);
 	dev = calloc(1, sizeof(*dev));
+	dev->external = external;
 	device_init(dev, &simple_device_type, name);
 	dev->default_config = true;
 	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, bool create)
+device_get(const char *name, int create)
 {
 	struct device *dev;
 
 	if (strchr(name, '.'))
 		return get_vlan_device_chain(name, create);
 
+	if (name[0] == '@')
+		return device_alias_get(name + 1);
+
 	dev = avl_find_element(&devices, name, dev, avl);
 	if (dev)
 		return dev;
@@ -238,7 +350,7 @@ device_get(const char *name, bool create)
 	if (!create)
 		return NULL;
 
-	return device_create_default(name);
+	return device_create_default(name, create > 1);
 }
 
 static void
@@ -273,7 +385,7 @@ void device_set_present(struct device *dev, bool state)
 	if (dev->present == state)
 		return;
 
-	D(DEVICE, "Device '%s' %s present\n", dev->ifname, state ? "is now" : "is no longer" );
+	D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
 	dev->present = state;
 	device_broadcast_event(dev, state ? DEV_EVENT_ADD : DEV_EVENT_REMOVE);
 }
@@ -292,7 +404,7 @@ void device_add_user(struct device_user *dep, struct device *dev)
 static void
 __device_free_unused(struct device *dev)
 {
-	if (!list_empty(&dev->users) || dev->current_config)
+	if (!list_empty(&dev->users) || dev->current_config || __devlock)
 		return;
 
 	device_free(dev);
@@ -302,6 +414,10 @@ void device_remove_user(struct device_user *dep)
 {
 	struct device *dev = dep->dev;
 
+	if (!dep->dev)
+		return;
+
+	dep->hotplug = false;
 	if (dep->claimed)
 		device_release(dep);
 
@@ -336,7 +452,7 @@ device_init_pending(void)
 	}
 }
 
-enum dev_change_type
+static enum dev_change_type
 device_reload_config(struct device *dev, struct blob_attr *attr)
 {
 	struct blob_attr *tb[__DEV_ATTR_MAX];
@@ -348,7 +464,7 @@ device_reload_config(struct device *dev, struct blob_attr *attr)
 	if (cfg == &device_attr_list) {
 		memset(tb, 0, sizeof(tb));
 
-		if (dev->config)
+		if (attr)
 			blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb,
 				blob_data(attr), blob_len(attr));
 
@@ -358,9 +474,9 @@ device_reload_config(struct device *dev, struct blob_attr *attr)
 		return DEV_CONFIG_RECREATE;
 }
 
-static enum dev_change_type
-device_check_config(struct device *dev, const struct device_type *type,
-		    struct blob_attr *attr)
+enum dev_change_type
+device_set_config(struct device *dev, const struct device_type *type,
+		  struct blob_attr *attr)
 {
 	if (type != dev->type)
 		return DEV_CONFIG_RECREATE;
@@ -412,7 +528,7 @@ device_reset_old(void)
 		if (dev->type != &simple_device_type)
 			continue;
 
-		ndev = device_create_default(dev->ifname);
+		ndev = device_create_default(dev->ifname, dev->external);
 		device_replace(ndev, dev);
 	}
 }
@@ -424,7 +540,6 @@ device_create(const char *name, const struct device_type *type,
 	struct device *odev = NULL, *dev;
 	enum dev_change_type change;
 
-	D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
 	config = config_memdup(config);
 	if (!config)
 		return NULL;
@@ -432,7 +547,7 @@ device_create(const char *name, const struct device_type *type,
 	odev = device_get(name, false);
 	if (odev) {
 		odev->current_config = true;
-		change = device_check_config(odev, type, config);
+		change = device_set_config(odev, type, config);
 		switch (change) {
 		case DEV_CONFIG_APPLIED:
 			D(DEVICE, "Device '%s': config applied\n", odev->ifname);
@@ -452,9 +567,10 @@ device_create(const char *name, const struct device_type *type,
 			device_delete(odev);
 			break;
 		}
-	}
+	} else
+		D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
 
-	dev = type->create(config);
+	dev = type->create(name, config);
 	if (!dev)
 		return NULL;
 
@@ -468,3 +584,36 @@ device_create(const char *name, const struct device_type *type,
 
 	return dev;
 }
+
+void
+device_dump_status(struct blob_buf *b, struct device *dev)
+{
+	void *c, *s;
+
+	if (!dev) {
+		avl_for_each_element(&devices, dev, avl) {
+			if (!dev->present)
+				continue;
+			c = blobmsg_open_table(b, dev->ifname);
+			device_dump_status(b, dev);
+			blobmsg_close_table(b, c);
+		}
+
+		return;
+	}
+
+	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);
+
+	s = blobmsg_open_table(b, "statistics");
+	if (dev->type->dump_stats)
+		dev->type->dump_stats(dev, b);
+	else
+		system_if_dump_stats(dev, b);
+	blobmsg_close_table(b, s);
+}