X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=787d7d9284fc66bfb484835c3153797e84a79867;hp=59b7ea23cae88dd85409109a0234ee8ae36b0421;hb=6803aef644a5112f331e6de4d37d78718b76a9bf;hpb=f2d8d143f29d3807532e137813d0b4a0dd2a753c

diff --git a/interface.c b/interface.c
index 59b7ea2..787d7d9 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;
 
@@ -31,7 +32,7 @@ const struct config_param_list interface_attr_list = {
 };
 
 static void
-clear_interface_errors(struct interface *iface)
+interface_clear_errors(struct interface *iface)
 {
 	struct interface_error *error, *tmp;
 
@@ -78,48 +79,35 @@ 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)
 {
-	vlist_flush_all(&iface->proto_addr);
-	vlist_flush_all(&iface->proto_route);
+	interface_ip_flush(&iface->proto_ip);
 	if (iface->main_dev.dev)
 		device_release(&iface->main_dev);
-	iface->state = IFS_DOWN;
+	if (iface->l3_dev != &iface->main_dev && iface->l3_dev->dev)
+		device_release(iface->l3_dev);
 }
 
-static int
-__interface_set_up(struct interface *iface)
+static void
+mark_interface_down(struct interface *iface)
 {
-	int ret;
-
-	if (iface->state != IFS_DOWN)
-		return 0;
-
-	if (iface->main_dev.dev) {
-		ret = device_claim(&iface->main_dev);
-		if (ret)
-			return ret;
-	}
-
-	iface->state = IFS_SETUP;
-	ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
-	if (ret) {
-		mark_interface_down(iface);
-		return ret;
-	}
-
-	return 0;
-
+	interface_flush_state(iface);
+	iface->state = IFS_DOWN;
 }
 
-static void
+void
 __interface_set_down(struct interface *iface, bool force)
 {
-	clear_interface_errors(iface);
+	interface_clear_errors(iface);
 
 	if (iface->state == IFS_DOWN ||
 		iface->state == IFS_TEARDOWN)
@@ -128,6 +116,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
@@ -157,6 +147,7 @@ interface_set_available(struct interface *iface, bool new_state)
 	if (iface->available == new_state)
 		return;
 
+	D(INTERFACE, "Interface '%s', available=%d\n", iface->name, new_state);
 	iface->available = new_state;
 
 	if (new_state) {
@@ -166,25 +157,52 @@ 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)
 			device_add_user(&iface->main_dev, dev);
 	}
+	if (iface->proto_handler->flags & PROTO_FLAG_INIT_AVAILABLE)
+		interface_set_available(iface, true);
 }
 
 
 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_ip_flush(&iface->config_ip);
+	interface_flush_state(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);
 }
 
@@ -194,6 +212,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);
 }
 
@@ -201,12 +220,8 @@ static void
 interface_do_reload(struct interface *iface)
 {
 	interface_cleanup(iface);
-
-	interface_claim_device(iface);
 	proto_init_interface(iface, iface->config);
-
-	if (iface->autostart)
-		interface_set_up(iface);
+	interface_claim_device(iface);
 }
 
 static void
@@ -220,8 +235,10 @@ interface_handle_config_change(struct interface *iface)
 		break;
 	case IFC_REMOVE:
 		interface_do_free(iface);
-		break;
+		return;
 	}
+	if (iface->autostart && iface->available)
+		interface_set_up(iface);
 }
 
 static void
@@ -234,13 +251,21 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 		if (iface->state != IFS_SETUP)
 			return;
 
+		interface_ip_set_enabled(&iface->config_ip, true);
+		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);
+		interface_ip_set_enabled(&iface->config_ip, false);
+		system_flush_routes();
 		mark_interface_down(iface);
 		interface_handle_config_change(iface);
 		break;
@@ -248,6 +273,7 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 		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;
@@ -279,6 +305,11 @@ 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);
+	interface_ip_init(&iface->proto_ip, iface);
+	interface_ip_init(&iface->config_ip, iface);
+	iface->config_ip.enabled = false;
 
 	iface->main_dev.cb = interface_cb;
 	iface->l3_dev = &iface->main_dev;
@@ -307,11 +338,9 @@ interface_add(struct interface *iface, struct blob_attr *config)
 	blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
 		      blob_data(config), blob_len(config));
 
-	if ((cur = tb[IFACE_ATTR_IFNAME])) {
+	if ((cur = tb[IFACE_ATTR_IFNAME]))
 		iface->ifname = blobmsg_data(cur);
 
-	}
-
 	iface->config = config;
 	vlist_add(&interfaces, &iface->node);
 }
@@ -348,17 +377,33 @@ interface_add_link(struct interface *iface, struct device *dev)
 int
 interface_set_up(struct interface *iface)
 {
+	int ret;
+
 	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;
+	if (iface->main_dev.dev) {
+		ret = device_claim(&iface->main_dev);
+		if (ret)
+			return ret;
+	}
+
+	iface->state = IFS_SETUP;
+	ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
+	if (ret) {
+		mark_interface_down(iface);
+		return ret;
+	}
 
-	return __interface_set_up(iface);
+	return 0;
 }
 
 int
@@ -393,22 +438,68 @@ set_config_state(struct interface *iface, enum interface_config_state s)
 	if (iface->state == IFS_DOWN)
 		interface_handle_config_change(iface);
 	else
-		interface_set_down(iface);
+		__interface_set_down(iface, false);
+}
+
+void
+interface_update_start(struct interface *iface)
+{
+	interface_ip_update_start(&iface->proto_ip);
+}
+
+void
+interface_update_complete(struct interface *iface)
+{
+	struct device_route *route;
+
+	interface_ip_update_complete(&iface->proto_ip);
+	vlist_for_each_element(&iface->config_ip.route, route, node) {
+		if (iface->l3_dev->dev) {
+			system_add_route(iface->l3_dev->dev, route);
+			route->enabled = true;
+		}
+	}
 }
 
 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;
 	if (!if_old->config_autostart && if_new->config_autostart)
 		if_old->autostart = true;
 
 	if_old->config_autostart = if_new->config_autostart;
 	if_old->ifname = if_new->ifname;
+	if_old->proto_handler = if_new->proto_handler;
+
+	if ((!!old_ifname != !!if_new->ifname) ||
+	    (old_ifname && 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);
 }
@@ -420,14 +511,16 @@ interface_update(struct vlist_tree *tree, struct vlist_node *node_new,
 	struct interface *if_old = container_of(node_old, struct interface, node);
 	struct interface *if_new = container_of(node_new, struct interface, node);
 
-	if (node_old && node_new)
+	if (node_old && node_new) {
+		D(INTERFACE, "Update interface '%s'\n", if_new->name);
 		interface_change_config(if_old, if_new);
-	else if (node_old)
+	} else if (node_old) {
+		D(INTERFACE, "Remove interface '%s'\n", if_old->name);
 		set_config_state(if_old, IFC_REMOVE);
-	else if (node_new) {
-		interface_claim_device(if_new);
+	} else if (node_new) {
+		D(INTERFACE, "Create interface '%s'\n", if_new->name);
 		proto_init_interface(if_new, if_new->config);
-		interface_ip_init(if_new);
+		interface_claim_device(if_new);
 		netifd_ubus_add_interface(if_new);
 	}
 }