X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=7c8a0c258eaabdb29d215750501140a08ef52c6a;hp=0a85e6f049ebd912bffa20ea4187c6a3770d95da;hb=6dfd44e127c153e721a398f22b510be1a5e9d0b0;hpb=2c4b334b450b6587a5c941f40ff484c2a79429af

diff --git a/interface.c b/interface.c
index 0a85e6f..7c8a0c2 100644
--- a/interface.c
+++ b/interface.c
@@ -79,6 +79,11 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 static void
 interface_event(struct interface *iface, enum interface_event ev)
 {
+	struct interface_user *dep, *tmp;
+
+	list_for_each_entry_safe(dep, tmp, &iface->users, list)
+		dep->cb(dep, IFEV_UP);
+
 	interface_queue_event(iface, ev);
 }
 
@@ -115,7 +120,6 @@ __interface_set_up(struct interface *iface)
 	}
 
 	return 0;
-
 }
 
 static void
@@ -169,6 +173,22 @@ interface_set_available(struct interface *iface, bool new_state)
 		__interface_set_down(iface, true);
 }
 
+void
+interface_add_user(struct interface_user *dep, struct interface *iface)
+{
+	dep->iface = iface;
+	list_add(&dep->list, &iface->users);
+	if (iface->state == IFS_UP)
+		dep->cb(dep, IFEV_UP);
+}
+
+void
+interface_remove_user(struct interface_user *dep)
+{
+	list_del_init(&dep->list);
+	dep->iface = NULL;
+}
+
 static void
 interface_claim_device(struct interface *iface)
 {
@@ -186,10 +206,16 @@ interface_claim_device(struct interface *iface)
 static void
 interface_cleanup(struct interface *iface)
 {
+	struct interface_user *dep, *tmp;
+
+	list_for_each_entry_safe(dep, tmp, &iface->users, list)
+		interface_remove_user(dep);
+
 	interface_clear_dns(iface);
 	interface_clear_errors(iface);
 	if (iface->main_dev.dev)
 		device_remove_user(&iface->main_dev);
+	iface->l3_dev = &iface->main_dev;
 	interface_set_proto_state(iface, NULL);
 }
 
@@ -240,6 +266,7 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 		if (iface->state != IFS_SETUP)
 			return;
 
+		system_flush_routes();
 		iface->state = IFS_UP;
 		iface->start_time = system_get_rtime();
 		interface_event(iface, IFEV_UP);
@@ -249,10 +276,13 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 		if (iface->state == IFS_DOWN)
 			return;
 
+		system_flush_routes();
 		mark_interface_down(iface);
 		interface_handle_config_change(iface);
 		if (iface->autostart)
 			__interface_set_up(iface);
+		if (iface->l3_dev->dev)
+			device_release(iface->l3_dev);
 		break;
 	case IFPEV_LINK_LOST:
 		if (iface->state != IFS_UP)
@@ -289,6 +319,7 @@ interface_init(struct interface *iface, const char *name,
 
 	strncpy(iface->name, name, sizeof(iface->name) - 1);
 	INIT_LIST_HEAD(&iface->errors);
+	INIT_LIST_HEAD(&iface->users);
 	INIT_LIST_HEAD(&iface->hotplug_list);
 	INIT_LIST_HEAD(&iface->proto_dns_search);
 	INIT_LIST_HEAD(&iface->proto_dns_servers);
@@ -361,14 +392,15 @@ interface_set_up(struct interface *iface)
 {
 	iface->autostart = true;
 
+	if (iface->state != IFS_DOWN)
+		return 0;
+
+	interface_clear_errors(iface);
 	if (!iface->available) {
 		interface_add_error(iface, "interface", "NO_DEVICE", NULL, 0);
 		return -1;
 	}
 
-	if (iface->state != IFS_DOWN)
-		return 0;
-
 	return __interface_set_up(iface);
 }