X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=34ad9adb1603c19558d02851b4064a8fcec72d2e;hp=7958fed7b4cc8df8413ff0efa9d6f68a397a4867;hb=4bf10a76e01d2f2971a86765722a4c4a65b584a7;hpb=1850d0350d3af11514744961d827a8b9facdaf00

diff --git a/device.c b/device.c
index 7958fed..34ad9ad 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,10 +178,9 @@ 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)
+void device_broadcast_event(struct device *dev, enum device_event ev)
 {
 	struct device_user *dep, *tmp;
 
@@ -252,34 +192,6 @@ 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();
-}
-
 int device_claim(struct device_user *dep)
 {
 	struct device *dev = dep->dev;
@@ -346,6 +258,9 @@ void device_init_virtual(struct device *dev, const struct device_type *type, con
 	D(DEVICE, "Initialize device '%s'\n", dev->ifname);
 	INIT_LIST_HEAD(&dev->users);
 	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 +269,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 +286,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 +298,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)
 {