X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=3820050eff038616e454250b47efecc30fe30700;hp=e12d3569dfe0b4ada12ec8cb4139d0a50eab8841;hb=2152229c45f470a14dee33507b331ac38055e062;hpb=8865846b6bb679ef917d3546113790978eb9f1a0

diff --git a/interface.c b/interface.c
index e12d356..3820050 100644
--- a/interface.c
+++ b/interface.c
@@ -3,13 +3,35 @@
 #include <stdio.h>
 
 #include "netifd.h"
+#include "device.h"
+#include "interface.h"
+#include "interface-ip.h"
 #include "proto.h"
 #include "ubus.h"
+#include "config.h"
 
-static LIST_HEAD(interfaces);
+struct vlist_tree interfaces;
+
+enum {
+	IFACE_ATTR_IFNAME,
+	IFACE_ATTR_PROTO,
+	IFACE_ATTR_AUTO,
+	IFACE_ATTR_MAX
+};
+
+static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
+	[IFACE_ATTR_PROTO] = { .name = "proto", .type = BLOBMSG_TYPE_STRING },
+	[IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
+	[IFACE_ATTR_AUTO] = { .name = "auto", .type = BLOBMSG_TYPE_BOOL },
+};
+
+const struct config_param_list interface_attr_list = {
+	.n_params = IFACE_ATTR_MAX,
+	.params = iface_attrs,
+};
 
 static void
-clear_interface_errors(struct interface *iface)
+interface_clear_errors(struct interface *iface)
 {
 	struct interface_error *error, *tmp;
 
@@ -24,7 +46,7 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 {
 	struct interface_error *error;
 	int i, len = 0;
-	int *datalen;
+	int *datalen = NULL;
 	char *dest;
 
 	if (n_data) {
@@ -56,30 +78,35 @@ 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)
 {
-	release_device(iface->main_dev.dev);
+	vlist_flush_all(&iface->proto_addr);
+	vlist_flush_all(&iface->proto_route);
+	if (iface->main_dev.dev)
+		device_release(&iface->main_dev);
 	iface->state = IFS_DOWN;
 }
 
 static int
-__set_interface_up(struct interface *iface)
+__interface_set_up(struct interface *iface)
 {
 	int ret;
 
 	if (iface->state != IFS_DOWN)
 		return 0;
 
-	ret = claim_device(iface->main_dev.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 = iface->proto->handler(iface->proto, PROTO_CMD_SETUP, false);
+	ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
 	if (ret) {
 		mark_interface_down(iface);
 		return ret;
@@ -90,9 +117,9 @@ __set_interface_up(struct interface *iface)
 }
 
 static void
-__set_interface_down(struct interface *iface, bool force)
+__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)
@@ -100,9 +127,7 @@ __set_interface_down(struct interface *iface, bool force)
 
 	iface->state = IFS_TEARDOWN;
 	interface_event(iface, IFEV_DOWN);
-
-	iface->proto->handler(iface->proto, PROTO_CMD_TEARDOWN, force);
-	release_device(iface->main_dev.dev);
+	interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
 }
 
 static void
@@ -123,16 +148,83 @@ interface_cb(struct device_user *dep, enum device_event ev)
 		return;
 	}
 
-	if (iface->active == new_state)
+	interface_set_available(iface, new_state);
+}
+
+void
+interface_set_available(struct interface *iface, bool new_state)
+{
+	if (iface->available == new_state)
 		return;
 
-	iface->active = new_state;
+	D(INTERFACE, "Interface '%s', available=%d\n", iface->name, new_state);
+	iface->available = new_state;
 
 	if (new_state) {
-		if (iface->autostart)
-			set_interface_up(iface);
+		if (iface->autostart && !config_init)
+			interface_set_up(iface);
 	} else
-		__set_interface_down(iface, true);
+		__interface_set_down(iface, true);
+}
+
+static void
+interface_claim_device(struct interface *iface)
+{
+	struct device *dev;
+
+	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);
+	}
+}
+
+
+static void
+interface_cleanup(struct interface *iface)
+{
+	interface_clear_errors(iface);
+	if (iface->main_dev.dev)
+		device_remove_user(&iface->main_dev);
+	interface_set_proto_state(iface, NULL);
+}
+
+static void
+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);
+}
+
+static void
+interface_do_reload(struct interface *iface)
+{
+	interface_cleanup(iface);
+
+	interface_claim_device(iface);
+	proto_init_interface(iface, iface->config);
+
+	if (iface->autostart && !config_init)
+		interface_set_up(iface);
+}
+
+static void
+interface_handle_config_change(struct interface *iface)
+{
+	switch(iface->config_state) {
+	case IFC_NORMAL:
+		break;
+	case IFC_RELOAD:
+		interface_do_reload(iface);
+		break;
+	case IFC_REMOVE:
+		interface_do_free(iface);
+		break;
+	}
 }
 
 static void
@@ -153,6 +245,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;
 	}
 }
@@ -160,7 +260,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) {
-		iface->proto->handler(iface->proto, PROTO_CMD_TEARDOWN, true);
 		iface->proto->free(iface->proto);
 		iface->proto = NULL;
 	}
@@ -173,91 +272,87 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s
 	state->iface = iface;
 }
 
-struct interface *
-alloc_interface(const char *name)
+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;
+	const char *proto_name = NULL;
 
-	iface = get_interface(name);
-	if (iface)
-		return iface;
+	strncpy(iface->name, name, sizeof(iface->name) - 1);
+	INIT_LIST_HEAD(&iface->errors);
+	INIT_LIST_HEAD(&iface->hotplug_list);
 
-	iface = calloc(1, sizeof(*iface));
+	iface->main_dev.cb = interface_cb;
+	iface->l3_dev = &iface->main_dev;
 
-	interface_set_proto_state(iface, get_default_proto());
-	if (!iface->proto) {
-		free(iface);
-		return NULL;
-	}
+	blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
+		      blob_data(config), blob_len(config));
 
-	iface->main_dev.cb = interface_cb;
-	iface->l3_iface = &iface->main_dev;
-	strncpy(iface->name, name, sizeof(iface->name) - 1);
-	list_add(&iface->list, &interfaces);
-	INIT_LIST_HEAD(&iface->errors);
+	if ((cur = tb[IFACE_ATTR_PROTO]))
+		proto_name = blobmsg_data(cur);
 
-	netifd_ubus_add_interface(iface);
+	proto_attach_interface(iface, proto_name);
 
-	return iface;
+	if ((cur = tb[IFACE_ATTR_AUTO]))
+		iface->autostart = blobmsg_get_bool(cur);
+	else
+		iface->autostart = true;
+	iface->config_autostart = iface->autostart;
 }
 
 void
-free_interface(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 interface *
-get_interface(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;
-	}
-	return NULL;
+	if ((cur = tb[IFACE_ATTR_IFNAME]))
+		iface->ifname = blobmsg_data(cur);
+
+	iface->config = config;
+	vlist_add(&interfaces, &iface->node);
 }
 
 void
-interface_remove_link(struct interface *iface, struct device *llif)
+interface_remove_link(struct interface *iface, struct device *dev)
 {
-	struct device *dev = iface->main_dev.dev;
+	struct device *mdev = iface->main_dev.dev;
 
-	if (dev && dev->hotplug_ops) {
-		dev->hotplug_ops->del(dev, llif);
+	if (mdev && mdev->hotplug_ops) {
+		mdev->hotplug_ops->del(mdev, dev);
 		return;
 	}
 
-	remove_device_user(&iface->main_dev);
+	device_remove_user(&iface->main_dev);
 }
 
 int
-interface_add_link(struct interface *iface, struct device *llif)
+interface_add_link(struct interface *iface, struct device *dev)
 {
-	struct device *dev = iface->main_dev.dev;
+	struct device *mdev = iface->main_dev.dev;
 
-	if (dev && dev->hotplug_ops)
-		return dev->hotplug_ops->add(dev, llif);
+	if (mdev && mdev->hotplug_ops)
+		return mdev->hotplug_ops->add(mdev, dev);
 
 	if (iface->main_dev.dev)
 		interface_remove_link(iface, NULL);
 
-	add_device_user(&iface->main_dev, llif);
+	device_add_user(&iface->main_dev, dev);
 
 	return 0;
 }
 
 int
-set_interface_up(struct interface *iface)
+interface_set_up(struct interface *iface)
 {
 	iface->autostart = true;
 
-	if (!iface->active) {
+	if (!iface->available) {
 		interface_add_error(iface, "interface", "NO_DEVICE", NULL, 0);
 		return -1;
 	}
@@ -265,14 +360,114 @@ set_interface_up(struct interface *iface)
 	if (iface->state != IFS_DOWN)
 		return 0;
 
-	return __set_interface_up(iface);
+	return __interface_set_up(iface);
 }
 
 int
-set_interface_down(struct interface *iface)
+interface_set_down(struct interface *iface)
 {
-	iface->autostart = false;
-	__set_interface_down(iface, false);
+	if (!iface) {
+		vlist_for_each_element(&interfaces, iface, node)
+			__interface_set_down(iface, false);
+	} else {
+		iface->autostart = false;
+		__interface_set_down(iface, false);
+	}
 
 	return 0;
 }
+
+void
+interface_start_pending(void)
+{
+	struct interface *iface;
+
+	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, false);
+}
+
+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 (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);
+}
+
+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) {
+		D(INTERFACE, "Update interface '%s'\n", if_new->name);
+		interface_change_config(if_old, if_new);
+	} else if (node_old) {
+		D(INTERFACE, "Remove interface '%s'\n", if_old->name);
+		set_config_state(if_old, IFC_REMOVE);
+	} else if (node_new) {
+		D(INTERFACE, "Create interface '%s'\n", if_new->name);
+		interface_claim_device(if_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;
+}