X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=alias.c;h=56420c7be27bb33a2bb4a36c7bfe8d12f06d9cc5;hb=e7dbda3d64e98276570cba3b0c0f94461f77d645;hp=185a5d25b3a37908ec142c41cac4861853c43720;hpb=f054a655c331342200b5929f533792d528ac6002;p=project%2Fnetifd.git

diff --git a/alias.c b/alias.c
index 185a5d2..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);
@@ -51,12 +58,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);
 	}
 }
 
@@ -82,14 +89,22 @@ 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;
+	bool new_state = false;
 
 	alias = container_of(dep, struct alias_device, dep);
 	switch (ev) {
 	case DEV_EVENT_ADD:
-		present = true;
+		new_state = true;
 	case DEV_EVENT_REMOVE:
-		device_set_present(&alias->dev, present);
+		device_set_present(&alias->dev, new_state);
+		break;
+	case DEV_EVENT_LINK_UP:
+		new_state = true;
+	case DEV_EVENT_LINK_DOWN:
+		device_set_link(&alias->dev, new_state);
+		break;
+	case DEV_EVENT_UPDATE_IFINDEX:
+		device_set_ifindex(&alias->dev, dep->dev->ifindex);
 		break;
 	default:
 		device_broadcast_event(&alias->dev, ev);
@@ -103,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;
@@ -121,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);
 }