X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=alias.c;h=e77defff5e42836d269a10d12c284929e964a79c;hp=338ece6695dfbdc8fadc7ff1564167b210a3c073;hb=74de0901a05271f51ec42beef649e1cc0abc917f;hpb=4bf10a76e01d2f2971a86765722a4c4a65b584a7;ds=sidebyside

diff --git a/alias.c b/alias.c
index 338ece6..e77deff 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;
 
@@ -48,6 +49,24 @@ alias_device_set_state(struct device *dev, bool state)
 	return 0;
 }
 
+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;
+	case DEV_EVENT_REMOVE:
+		device_set_present(&alias->dev, present);
+		break;
+	default:
+		device_broadcast_event(&alias->dev, ev);
+		break;
+	}
+}
+
 static struct device *
 alias_device_create(const char *name, struct blob_attr *attr)
 {
@@ -60,6 +79,9 @@ alias_device_create(const char *name, struct blob_attr *attr)
 	device_init_virtual(&alias->dev, &alias_device_type, NULL);
 	alias->avl.key = alias->name;
 	avl_insert(&aliases, &alias->avl);
+	alias->dep.alias = true;
+	alias->dep.cb = alias_device_cb;
+	device_check_state(&alias->dev);
 
 	return &alias->dev;
 }
@@ -73,23 +95,8 @@ static void alias_device_free(struct device *dev)
 	free(alias);
 }
 
-static const struct device_type alias_device_type = {
-	.name = "Network alias",
-	.create = alias_device_create,
-	.free = alias_device_free,
-};
-
-void
-alias_notify_device(const char *name, struct device *dev)
+static void __alias_notify_device(struct alias_device *alias, 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) {
@@ -101,14 +108,48 @@ alias_notify_device(const char *name, struct device *dev)
 		}
 	}
 
-	device_set_present(&alias->dev, !!dev);
-
 	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);
 	}
+}
+
+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_notify_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
+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_notify_device(alias, dev);
 
 	device_unlock();
 }