X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=alias.c;h=98d54100fef9294eae187275b934850a3a054098;hb=33ec3daaaa52cea628df91eb0eb1701e16172c1e;hp=e4f28e52c277b55a908d7879e3edac2b8d674772;hpb=ed984c7aea436999c38cc40c5ebaf98bd8294df4;p=project%2Fnetifd.git

diff --git a/alias.c b/alias.c
index e4f28e5..98d5410 100644
--- a/alias.c
+++ b/alias.c
@@ -30,13 +30,19 @@ struct alias_device {
 	char name[];
 };
 
-static const struct device_type alias_device_type;
-
 static void alias_set_device(struct alias_device *alias, struct device *dev)
 {
-	if (dev == alias->dep.dev)
+	if (dev == alias->dep.dev) {
+		if (alias->update) {
+			device_remove_user(&alias->new_dep);
+			alias->update = false;
+			if (dev)
+				device_set_present(&alias->dev, true);
+		}
 		return;
+	}
 
+	device_set_present(&alias->dev, false);
 	device_remove_user(&alias->new_dep);
 	if (alias->dev.active) {
 		if (dev)
@@ -50,12 +56,12 @@ static void alias_set_device(struct alias_device *alias, struct device *dev)
 	device_remove_user(&alias->dep);
 	alias->dev.hidden = !dev;
 	if (dev) {
-		strcpy(alias->dev.ifname, dev->ifname);
-		device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
+		device_set_ifindex(&alias->dev, dev->ifindex);
+		device_set_ifname(&alias->dev, dev->ifname);
 		device_add_user(&alias->dep, dev);
 	} else {
-		alias->dev.ifname[0] = 0;
-		device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
+		device_set_ifname(&alias->dev, "");
+		device_set_link(&alias->dev, false);
 	}
 }
 
@@ -81,14 +87,23 @@ alias_device_set_state(struct device *dev, bool state)
 static void alias_device_cb(struct device_user *dep, enum device_event ev)
 {
 	struct alias_device *alias;
-	bool present = false;
 
 	alias = container_of(dep, struct alias_device, dep);
 	switch (ev) {
 	case DEV_EVENT_ADD:
-		present = true;
+		device_set_present(&alias->dev, true);
+		break;
 	case DEV_EVENT_REMOVE:
-		device_set_present(&alias->dev, present);
+		device_set_present(&alias->dev, false);
+		break;
+	case DEV_EVENT_LINK_UP:
+		device_set_link(&alias->dev, true);
+		break;
+	case DEV_EVENT_LINK_DOWN:
+		device_set_link(&alias->dev, false);
+		break;
+	case DEV_EVENT_UPDATE_IFINDEX:
+		device_set_ifindex(&alias->dev, dep->dev->ifindex);
 		break;
 	default:
 		device_broadcast_event(&alias->dev, ev);
@@ -97,15 +112,23 @@ static void alias_device_cb(struct device_user *dep, enum device_event ev)
 }
 
 static struct device *
-alias_device_create(const char *name, struct blob_attr *attr)
+alias_device_create(const char *name, struct device_type *devtype,
+		    struct blob_attr *attr)
 {
 	struct alias_device *alias;
 
 	alias = calloc(1, sizeof(*alias) + strlen(name) + 1);
+	if (!alias)
+		return NULL;
+
 	strcpy(alias->name, name);
 	alias->dev.set_state = alias_device_set_state;
 	alias->dev.hidden = true;
-	device_init_virtual(&alias->dev, &alias_device_type, NULL);
+	if (device_init_virtual(&alias->dev, devtype, NULL) < 0) {
+		free(alias);
+		return NULL;
+	}
+
 	alias->avl.key = alias->name;
 	avl_insert(&aliases, &alias->avl);
 	alias->dep.alias = true;
@@ -120,6 +143,8 @@ static void alias_device_free(struct device *dev)
 	struct alias_device *alias;
 
 	alias = container_of(dev, struct alias_device, dev);
+	device_remove_user(&alias->new_dep);
+	device_remove_user(&alias->dep);
 	avl_delete(&aliases, &alias->avl);
 	free(alias);
 }
@@ -141,7 +166,7 @@ static int alias_check_state(struct device *dev)
 	return 0;
 }
 
-static const struct device_type alias_device_type = {
+static struct device_type alias_device_type = {
 	.name = "Network alias",
 	.create = alias_device_create,
 	.free = alias_device_free,
@@ -153,13 +178,9 @@ 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)
 		alias_set_device(alias, dev);
-
-	device_unlock();
 }
 
 struct device *
@@ -171,7 +192,7 @@ device_alias_get(const char *name)
 	if (alias)
 		return &alias->dev;
 
-	return alias_device_create(name, NULL);
+	return alias_device_create(name, &alias_device_type, NULL);
 }
 
 static void __init alias_init(void)