X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=e67c695228b71decd1e8e26d76c8cf3734038d4d;hp=4b22807f4a4a1c0b6e568bfd00395292544b3b3f;hb=9c0553eebbd86a78e098a2928b178effa31104e1;hpb=a323f3adf275954727f32895eea37bfcf0aa9fb7

diff --git a/interface.c b/interface.c
index 4b22807..e67c695 100644
--- a/interface.c
+++ b/interface.c
@@ -10,7 +10,7 @@
 #include "ubus.h"
 #include "config.h"
 
-static LIST_HEAD(interfaces);
+struct vlist_tree interfaces;
 
 enum {
 	IFACE_ATTR_IFNAME,
@@ -86,7 +86,8 @@ mark_interface_down(struct interface *iface)
 {
 	vlist_flush_all(&iface->proto_addr);
 	vlist_flush_all(&iface->proto_route);
-	device_release(&iface->main_dev);
+	if (iface->main_dev.dev)
+		device_release(&iface->main_dev);
 	iface->state = IFS_DOWN;
 }
 
@@ -98,9 +99,11 @@ __interface_set_up(struct interface *iface)
 	if (iface->state != IFS_DOWN)
 		return 0;
 
-	ret = device_claim(&iface->main_dev);
-	if (ret)
-		return ret;
+	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);
@@ -145,6 +148,12 @@ interface_cb(struct device_user *dep, enum device_event ev)
 		return;
 	}
 
+	interface_set_available(iface, new_state);
+}
+
+void
+interface_set_available(struct interface *iface, bool new_state)
+{
 	if (iface->available == new_state)
 		return;
 
@@ -158,6 +167,33 @@ interface_cb(struct device_user *dep, enum device_event ev)
 }
 
 static void
+interface_do_free(struct interface *iface)
+{
+	if (iface->main_dev.dev)
+		device_remove_user(&iface->main_dev);
+	interface_set_proto_state(iface, NULL);
+	free(iface->config);
+	netifd_ubus_remove_interface(iface);
+	free(iface);
+}
+
+static void
+interface_handle_config_change(struct interface *iface)
+{
+	switch(iface->config_state) {
+	case IFC_NORMAL:
+		break;
+	case IFC_RELOAD:
+		if (iface->autostart)
+			interface_set_up(iface);
+		break;
+	case IFC_REMOVE:
+		interface_do_free(iface);
+		break;
+	}
+}
+
+static void
 interface_proto_cb(struct interface_proto_state *state, enum interface_proto_event ev)
 {
 	struct interface *iface = state->iface;
@@ -175,6 +211,14 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 			return;
 
 		mark_interface_down(iface);
+		interface_handle_config_change(iface);
+		break;
+	case IFPEV_LINK_LOST:
+		if (iface->state != IFS_UP)
+			return;
+
+		iface->state = IFS_SETUP;
+		interface_event(iface, IFEV_DOWN);
 		break;
 	}
 }
@@ -182,7 +226,6 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state)
 {
 	if (iface->proto) {
-		interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, true);
 		iface->proto->free(iface->proto);
 		iface->proto = NULL;
 	}
@@ -195,73 +238,58 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s
 	state->iface = iface;
 }
 
-struct interface *
-interface_alloc(const char *name, struct blob_attr *attr)
+void
+interface_init(struct interface *iface, const char *name,
+	       struct blob_attr *config)
 {
-	struct interface *iface;
 	struct blob_attr *tb[IFACE_ATTR_MAX];
 	struct blob_attr *cur;
-	struct device *dev;
 	const char *proto_name = NULL;
 
-	iface = interface_get(name);
-	if (iface)
-		return iface;
-
-	iface = calloc(1, sizeof(*iface));
-	iface->main_dev.cb = interface_cb;
-	iface->l3_iface = &iface->main_dev;
 	strncpy(iface->name, name, sizeof(iface->name) - 1);
-	list_add_tail(&iface->list, &interfaces);
 	INIT_LIST_HEAD(&iface->errors);
 
-	interface_ip_init(iface);
+	iface->main_dev.cb = interface_cb;
+	iface->l3_dev = &iface->main_dev;
 
 	blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
-		      blob_data(attr), blob_len(attr));
+		      blob_data(config), blob_len(config));
 
 	if ((cur = tb[IFACE_ATTR_PROTO]))
 		proto_name = blobmsg_data(cur);
 
 	proto_attach_interface(iface, proto_name);
 
-	if ((cur = tb[IFACE_ATTR_IFNAME])) {
-		dev = device_get(blobmsg_data(cur), true);
-		if (dev)
-			device_add_user(&iface->main_dev, dev);
-	}
-
 	if ((cur = tb[IFACE_ATTR_AUTO]))
 		iface->autostart = blobmsg_get_bool(cur);
 	else
 		iface->autostart = true;
-
-	netifd_ubus_add_interface(iface);
-	config_set_state(&iface->config, attr);
-
-	return iface;
+	iface->config_autostart = iface->autostart;
 }
 
 void
-interface_free(struct interface *iface)
+interface_add(struct interface *iface, struct blob_attr *config)
 {
-	netifd_ubus_remove_interface(iface);
-	list_del(&iface->list);
-	if (iface->proto->free)
-		iface->proto->free(iface->proto);
-	free(iface);
-}
+	struct blob_attr *tb[IFACE_ATTR_MAX];
+	struct blob_attr *cur;
+	struct device *dev;
 
-struct interface *
-interface_get(const char *name)
-{
-	struct interface *iface;
+	blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
+		      blob_data(config), blob_len(config));
 
-	list_for_each_entry(iface, &interfaces, list) {
-		if (!strcmp(iface->name, name))
-			return iface;
+	if ((cur = tb[IFACE_ATTR_IFNAME])) {
+		iface->ifname = blobmsg_data(cur);
+
+		if (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);
+		}
 	}
-	return NULL;
+
+	iface->config = config;
+	vlist_add(&interfaces, &iface->node);
 }
 
 void
@@ -313,7 +341,7 @@ int
 interface_set_down(struct interface *iface)
 {
 	if (!iface) {
-		list_for_each_entry(iface, &interfaces, list)
+		vlist_for_each_element(&interfaces, iface, node)
 			__interface_set_down(iface, false);
 	} else {
 		iface->autostart = false;
@@ -328,8 +356,63 @@ interface_start_pending(void)
 {
 	struct interface *iface;
 
-	list_for_each_entry(iface, &interfaces, list) {
+	vlist_for_each_element(&interfaces, iface, node) {
 		if (iface->available && iface->autostart)
 			interface_set_up(iface);
 	}
 }
+
+static void
+set_config_state(struct interface *iface, enum interface_config_state s)
+{
+	iface->config_state = s;
+	if (iface->state == IFS_DOWN)
+		interface_handle_config_change(iface);
+	else
+		interface_set_down(iface);
+}
+
+static void
+interface_change_config(struct interface *if_old, struct interface *if_new)
+{
+	struct blob_attr *old_config = if_old->config;
+
+	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;
+
+	set_config_state(if_old, IFC_RELOAD);
+	free(old_config);
+	free(if_new);
+}
+
+static void
+interface_update(struct vlist_tree *tree, struct vlist_node *node_new,
+		 struct vlist_node *node_old)
+{
+	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)
+		interface_change_config(if_old, if_new);
+	else if (node_old)
+		set_config_state(if_old, IFC_REMOVE);
+	else if (node_new) {
+		proto_init_interface(if_new, if_new->config);
+		interface_ip_init(if_new);
+		netifd_ubus_add_interface(if_new);
+	}
+}
+
+
+static void __init
+interface_init_list(void)
+{
+	vlist_init(&interfaces, avl_strcmp, interface_update,
+		   struct interface, node, name);
+	interfaces.keep_old = true;
+	interfaces.no_delete = true;
+}