X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=alias.c;h=56420c7be27bb33a2bb4a36c7bfe8d12f06d9cc5;hp=cef125f578d4e6da125138180e28e9309772cd42;hb=c007f08413edc15805c248a8d65f075bb5fb0bdd;hpb=f35b76c61baf68dc5dd8440fc06d860f8dfacc44

diff --git a/alias.c b/alias.c
index cef125f..56420c7 100644
--- a/alias.c
+++ b/alias.c
@@ -34,8 +34,15 @@ 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);
@@ -52,12 +59,11 @@ static void alias_set_device(struct alias_device *alias, struct device *dev)
 	alias->dev.hidden = !dev;
 	if (dev) {
 		device_set_ifindex(&alias->dev, dev->ifindex);
-		strcpy(alias->dev.ifname, dev->ifname);
-		device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
+		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);
 	}
 }
 
@@ -112,6 +118,9 @@ alias_device_create(const char *name, 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;
@@ -130,6 +139,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);
 }