X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=alias.c;h=4e0a6be0d7fb78659e0f9f4f5aa5bf3bea061a94;hp=72018d4d26de70072f76d761369a86da926df934;hb=37769eb666aa614b76df9b537db35c2c70e3ac7a;hpb=30e9a048af138b39ee0d53451da43eddd6f48fda

diff --git a/alias.c b/alias.c
index 72018d4..4e0a6be 100644
--- a/alias.c
+++ b/alias.c
@@ -17,6 +17,7 @@
 
 #include "netifd.h"
 #include "device.h"
+#include "interface.h"
 
 static struct avl_tree aliases;
 
@@ -24,12 +25,42 @@ struct alias_device {
 	struct avl_node avl;
 	struct device dev;
 	struct device_user dep;
-	bool cleanup;
+	struct device_user new_dep;
+	bool update;
 	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)
+		return;
+
+	device_set_present(&alias->dev, false);
+	device_remove_user(&alias->new_dep);
+	if (alias->dev.active) {
+		if (dev)
+			device_add_user(&alias->new_dep, dev);
+
+		alias->update = true;
+		return;
+	}
+
+	alias->update = false;
+	device_remove_user(&alias->dep);
+	alias->dev.hidden = !dev;
+	if (dev) {
+		alias->dev.ifindex = dev->ifindex;
+		strcpy(alias->dev.ifname, dev->ifname);
+		device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
+		device_add_user(&alias->dep, dev);
+	} else {
+		alias->dev.ifname[0] = 0;
+		device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
+	}
+}
+
 static int
 alias_device_set_state(struct device *dev, bool state)
 {
@@ -43,8 +74,9 @@ alias_device_set_state(struct device *dev, bool state)
 		return device_claim(&alias->dep);
 
 	device_release(&alias->dep);
-	if (alias->cleanup)
-		device_remove_user(&alias->dep);
+	if (alias->update)
+		alias_set_device(alias, alias->new_dep.dev);
+
 	return 0;
 }
 
@@ -80,6 +112,7 @@ alias_device_create(const char *name, struct blob_attr *attr)
 	avl_insert(&aliases, &alias->avl);
 	alias->dep.alias = true;
 	alias->dep.cb = alias_device_cb;
+	device_check_state(&alias->dev);
 
 	return &alias->dev;
 }
@@ -93,10 +126,28 @@ static void alias_device_free(struct device *dev)
 	free(alias);
 }
 
+static int alias_check_state(struct device *dev)
+{
+	struct alias_device *alias;
+	struct interface *iface;
+	struct device *ndev = NULL;
+
+	alias = container_of(dev, struct alias_device, dev);
+
+	iface = vlist_find(&interfaces, alias->name, iface, node);
+	if (iface && iface->state == IFS_UP)
+		ndev = iface->l3_dev.dev;
+
+	alias_set_device(alias, ndev);
+
+	return 0;
+}
+
 static const struct device_type alias_device_type = {
 	.name = "Network alias",
 	.create = alias_device_create,
 	.free = alias_device_free,
+	.check_state = alias_check_state,
 };
 
 void
@@ -107,28 +158,9 @@ alias_notify_device(const char *name, struct device *dev)
 	device_lock();
 
 	alias = avl_find_element(&aliases, name, alias, avl);
-	if (!alias)
-		goto out;
-
-	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);
-			alias->dev.hidden = false;
-			device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
-		}
-	}
-
-	if (!dev && alias->dep.dev && !alias->dep.dev->active) {
-		device_remove_user(&alias->dep);
-		alias->dev.hidden = true;
-		alias->dev.ifname[0] = 0;
-		device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
-	}
+	if (alias)
+		alias_set_device(alias, dev);
 
-out:
 	device_unlock();
 }