X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=befb194af59f06b33a3e7d6aa3d22693901050d8;hp=9454dc1b1de9a525618b0d81bfc66d3eeb805b5f;hb=d16871c7a55370174eb672edee24feade74cd37e;hpb=1d2107528d9ffa2c7382f3e4290e86c166bd3324

diff --git a/interface.c b/interface.c
index 9454dc1..befb194 100644
--- a/interface.c
+++ b/interface.c
@@ -9,6 +9,7 @@
 #include "proto.h"
 #include "ubus.h"
 #include "config.h"
+#include "system.h"
 
 struct vlist_tree interfaces;
 
@@ -78,16 +79,28 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 static void
 interface_event(struct interface *iface, enum interface_event ev)
 {
-	/* TODO */
+	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);
 }
 
 static void
-mark_interface_down(struct interface *iface)
+interface_flush_state(struct interface *iface)
 {
+	interface_clear_dns(iface);
 	vlist_flush_all(&iface->proto_addr);
 	vlist_flush_all(&iface->proto_route);
 	if (iface->main_dev.dev)
 		device_release(&iface->main_dev);
+}
+
+static void
+mark_interface_down(struct interface *iface)
+{
+	interface_flush_state(iface);
 	iface->state = IFS_DOWN;
 }
 
@@ -113,10 +126,9 @@ __interface_set_up(struct interface *iface)
 	}
 
 	return 0;
-
 }
 
-static void
+void
 __interface_set_down(struct interface *iface, bool force)
 {
 	interface_clear_errors(iface);
@@ -128,6 +140,8 @@ __interface_set_down(struct interface *iface, bool force)
 	iface->state = IFS_TEARDOWN;
 	interface_event(iface, IFEV_DOWN);
 	interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
+	if (force)
+		interface_flush_state(iface);
 }
 
 static void
@@ -167,12 +181,28 @@ 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)
 {
 	struct device *dev;
 
-	if (iface->proto_handler &&
+	if (iface->ifname && iface->proto_handler &&
 		!(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
 		dev = device_get(iface->ifname, true);
 		if (dev)
@@ -184,9 +214,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);
 }
 
@@ -196,6 +233,7 @@ interface_do_free(struct interface *iface)
 	interface_cleanup(iface);
 	free(iface->config);
 	netifd_ubus_remove_interface(iface);
+	avl_delete(&interfaces.avl, &iface->node.avl);
 	free(iface);
 }
 
@@ -207,7 +245,7 @@ interface_do_reload(struct interface *iface)
 	interface_claim_device(iface);
 	proto_init_interface(iface, iface->config);
 
-	if (iface->autostart)
+	if (iface->autostart && !config_init)
 		interface_set_up(iface);
 }
 
@@ -236,20 +274,31 @@ 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);
+		interface_write_resolv_conf();
+		netifd_log_message(L_NOTICE, "Interface '%s' is now up\n", iface->name);
 		break;
 	case IFPEV_DOWN:
 		if (iface->state == IFS_DOWN)
 			return;
 
+		netifd_log_message(L_NOTICE, "Interface '%s' is now down\n", iface->name);
+		system_flush_routes();
 		mark_interface_down(iface);
 		interface_handle_config_change(iface);
+		if (iface->l3_dev->dev)
+			device_release(iface->l3_dev);
+		if (iface->autostart && iface->available)
+			__interface_set_up(iface);
 		break;
 	case IFPEV_LINK_LOST:
 		if (iface->state != IFS_UP)
 			return;
 
+		netifd_log_message(L_NOTICE, "Interface '%s' has lost the connection\n", iface->name);
 		iface->state = IFS_SETUP;
 		interface_event(iface, IFEV_DOWN);
 		break;
@@ -281,6 +330,10 @@ 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);
 
 	iface->main_dev.cb = interface_cb;
 	iface->l3_dev = &iface->main_dev;
@@ -350,14 +403,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);
 }
 
@@ -400,6 +454,8 @@ static void
 interface_change_config(struct interface *if_old, struct interface *if_new)
 {
 	struct blob_attr *old_config = if_old->config;
+	const char *old_ifname = if_old->ifname;
+	const struct proto_handler *proto = if_old->proto_handler;
 
 	interface_clear_errors(if_old);
 	if_old->config = if_new->config;
@@ -408,8 +464,30 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 
 	if_old->config_autostart = if_new->config_autostart;
 	if_old->ifname = if_new->ifname;
+	if_old->proto_handler = if_new->proto_handler;
+
+	if (strcmp(old_ifname, if_new->ifname) != 0 ||
+		proto != if_new->proto_handler) {
+		D(INTERFACE, "Reload interface '%s' because of ifname/proto change\n",
+		  if_old->name);
+		goto reload;
+	}
+
+	if (!proto->config_params)
+		D(INTERFACE, "No config parameters for interface '%s'\n",
+		  if_old->name);
+	else if (!config_check_equal(old_config, if_new->config,
+				proto->config_params)) {
+		D(INTERFACE, "Reload interface '%s because of config changes\n",
+		  if_old->name);
+		goto reload;
+	}
+
+	goto out;
 
+reload:
 	set_config_state(if_old, IFC_RELOAD);
+out:
 	free(old_config);
 	free(if_new);
 }