X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=e0c2c789dcdc402afcd1843f2d85b96695d1c6cb;hp=eb2f754420f28f90c9b8c742279741e33b80ba61;hb=2f976c53919e49b9008e9d5f23349be3c992e87b;hpb=d6ea48d146b4fa2905afa4acc2ff34b37ce5a623

diff --git a/interface.c b/interface.c
index eb2f754..e0c2c78 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,12 +79,13 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 static void
 interface_event(struct interface *iface, enum interface_event ev)
 {
-	/* TODO */
+	interface_queue_event(iface, ev);
 }
 
 static void
 mark_interface_down(struct interface *iface)
 {
+	interface_clear_dns(iface);
 	vlist_flush_all(&iface->proto_addr);
 	vlist_flush_all(&iface->proto_route);
 	if (iface->main_dev.dev)
@@ -184,6 +186,7 @@ interface_claim_device(struct interface *iface)
 static void
 interface_cleanup(struct interface *iface)
 {
+	interface_clear_dns(iface);
 	interface_clear_errors(iface);
 	if (iface->main_dev.dev)
 		device_remove_user(&iface->main_dev);
@@ -196,6 +199,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);
 }
 
@@ -236,15 +240,21 @@ 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();
 		break;
 	case IFPEV_DOWN:
 		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);
 		break;
 	case IFPEV_LINK_LOST:
 		if (iface->state != IFS_UP)
@@ -281,6 +291,9 @@ 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->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;
@@ -400,6 +413,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 +423,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);
 }