X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=35f20b087fdee2906296cb29cbbf65045a34d9ea;hp=06206170e990cff8cada328d359d9873a73445ff;hb=26cb3b2a0aebb1b9dc07daf7b54bd8400d6d659b;hpb=ddbd2cc51b3db14f6a8bd46ceebaee9097a50b78

diff --git a/interface.c b/interface.c
index 0620617..35f20b0 100644
--- a/interface.c
+++ b/interface.c
@@ -26,7 +26,6 @@
 
 struct vlist_tree interfaces;
 static LIST_HEAD(iface_all_users);
-static unsigned int interface_serial = 0;
 
 enum {
 	IFACE_ATTR_IFNAME,
@@ -43,6 +42,8 @@ enum {
 	IFACE_ATTR_IP4TABLE,
 	IFACE_ATTR_IP6TABLE,
 	IFACE_ATTR_IP6CLASS,
+	IFACE_ATTR_DELEGATE,
+	IFACE_ATTR_FORCE_LINK,
 	IFACE_ATTR_MAX
 };
 
@@ -61,6 +62,8 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_IP4TABLE] = { .name = "ip4table", .type = BLOBMSG_TYPE_STRING },
 	[IFACE_ATTR_IP6TABLE] = { .name = "ip6table", .type = BLOBMSG_TYPE_STRING },
 	[IFACE_ATTR_IP6CLASS] = { .name = "ip6class", .type = BLOBMSG_TYPE_ARRAY },
+	[IFACE_ATTR_DELEGATE] = { .name = "delegate", .type = BLOBMSG_TYPE_BOOL },
+	[IFACE_ATTR_FORCE_LINK] = { .name = "force_link", .type = BLOBMSG_TYPE_BOOL },
 };
 
 static const struct uci_blob_param_info iface_attr_info[IFACE_ATTR_MAX] = {
@@ -149,15 +152,23 @@ interface_add_data(struct interface *iface, const struct blob_attr *data)
 	if (!blobmsg_check_attr(data, true))
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	n = calloc(1, sizeof(*n) + blob_pad_len(data));
-	memcpy(n->data, data, blob_pad_len(data));
-	n->node.key = blobmsg_name(n->data);
+	const char *name = blobmsg_name(data);
+	unsigned len = blob_pad_len(data);
+
+	o = avl_find_element(&iface->data, name, o, node);
+	if (o) {
+		if (blob_pad_len(o->data) == len && !memcmp(o->data, data, len))
+			return 0;
 
-	o = avl_find_element(&iface->data, n->node.key, o, node);
-	if (o)
 		interface_data_del(iface, o);
+	}
 
+	n = calloc(1, sizeof(*n) + len);
+	memcpy(n->data, data, len);
+	n->node.key = blobmsg_name(n->data);
 	avl_insert(&iface->data, &n->node);
+
+	iface->updated |= IUF_DATA;
 	return 0;
 }
 
@@ -198,6 +209,9 @@ mark_interface_down(struct interface *iface)
 {
 	enum interface_state state = iface->state;
 
+	if (state == IFS_DOWN)
+		return;
+
 	iface->state = IFS_DOWN;
 	if (state == IFS_UP)
 		interface_event(iface, IFEV_DOWN);
@@ -210,42 +224,130 @@ mark_interface_down(struct interface *iface)
 void
 __interface_set_down(struct interface *iface, bool force)
 {
-	if (iface->state == IFS_DOWN ||
-		iface->state == IFS_TEARDOWN)
+	enum interface_state state = iface->state;
+	switch (state) {
+	case IFS_UP:
+	case IFS_SETUP:
+		iface->state = IFS_TEARDOWN;
+		if (state == IFS_UP)
+			interface_event(iface, IFEV_DOWN);
+
+		interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
+		if (force)
+			interface_flush_state(iface);
+
+		if (iface->dynamic)
+			vlist_delete(&interfaces, &iface->node);
+		break;
+
+	case IFS_DOWN:
+		if (iface->main_dev.dev)
+			device_release(&iface->main_dev);
+	case IFS_TEARDOWN:
+	default:
+		break;
+	}
+}
+
+static int
+__interface_set_up(struct interface *iface)
+{
+	int ret;
+
+	netifd_log_message(L_NOTICE, "Interface '%s' is setting up now\n", iface->name);
+
+	iface->state = IFS_SETUP;
+	ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
+	if (ret)
+		mark_interface_down(iface);
+
+	return ret;
+}
+
+static void
+interface_check_state(struct interface *iface)
+{
+	bool link_state = iface->link_state || iface->force_link;
+
+	switch (iface->state) {
+	case IFS_UP:
+		if (!iface->enabled || !link_state) {
+			interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, false);
+			mark_interface_down(iface);
+		}
+		break;
+	case IFS_DOWN:
+		if (!iface->available)
+			return;
+
+		if (iface->autostart && iface->enabled && link_state && !config_init)
+			__interface_set_up(iface);
+		break;
+	default:
+		break;
+	}
+}
+
+static void
+interface_set_enabled(struct interface *iface, bool new_state)
+{
+	if (iface->enabled == new_state)
 		return;
 
-	if (iface->state == IFS_UP)
-		interface_event(iface, IFEV_DOWN);
-	iface->state = IFS_TEARDOWN;
-	interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
-	if (force)
-		interface_flush_state(iface);
+	netifd_log_message(L_NOTICE, "Interface '%s' is %s\n", iface->name, new_state ? "enabled" : "disabled");
+	iface->enabled = new_state;
+	interface_check_state(iface);
+}
 
-	if (iface->dynamic)
-		vlist_delete(&interfaces, &iface->node);
+static void
+interface_set_link_state(struct interface *iface, bool new_state)
+{
+	if (iface->link_state == new_state)
+		return;
+
+	netifd_log_message(L_NOTICE, "Interface '%s' has link connectivity %s\n", iface->name, new_state ? "" : "loss");
+	iface->link_state = new_state;
+	interface_check_state(iface);
+}
+
+static void
+interface_ext_cb(struct device_user *dep, enum device_event ev)
+{
+	if (ev == DEV_EVENT_REMOVE)
+		device_remove_user(dep);
 }
 
 static void
 interface_cb(struct device_user *dep, enum device_event ev)
 {
 	struct interface *iface;
-	bool new_state;
+	bool new_state = false;
 
 	iface = container_of(dep, struct interface, main_dev);
 	switch (ev) {
 	case DEV_EVENT_ADD:
 		new_state = true;
-		break;
 	case DEV_EVENT_REMOVE:
-		new_state = false;
+		interface_set_available(iface, new_state);
+		if (!new_state && dep->dev && dep->dev->external)
+			interface_set_main_dev(iface, NULL);
 		break;
-	default:
+	case DEV_EVENT_UP:
+		new_state = true;
+	case DEV_EVENT_DOWN:
+		interface_set_enabled(iface, new_state);
+		break;
+	case DEV_EVENT_LINK_UP:
+		new_state = true;
+	case DEV_EVENT_LINK_DOWN:
+		interface_set_link_state(iface, new_state);
+		break;
+	case DEV_EVENT_TOPO_CHANGE:
+		interface_proto_event(iface->proto, PROTO_CMD_RENEW, false);
 		return;
+	default:
+		break;
 	}
-
-	interface_set_available(iface, new_state);
-	if (!new_state && dep->dev->external)
-		interface_set_main_dev(iface, NULL);
 }
 
 void
@@ -399,6 +501,8 @@ interface_claim_device(struct interface *iface)
 	} else if (iface->ifname &&
 		!(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
 		dev = device_get(iface->ifname, true);
+	} else {
+		dev = iface->ext_dev.dev;
 	}
 
 	if (dev)
@@ -417,8 +521,8 @@ interface_cleanup_state(struct interface *iface)
 	interface_clear_errors(iface);
 	interface_set_proto_state(iface, NULL);
 
-	if (iface->main_dev.dev)
-		interface_set_main_dev(iface, NULL);
+	interface_set_main_dev(iface, NULL);
+	interface_set_l3_dev(iface, NULL);
 }
 
 static void
@@ -426,6 +530,9 @@ interface_cleanup(struct interface *iface)
 {
 	struct interface_user *dep, *tmp;
 
+	uloop_timeout_cancel(&iface->remove_timer);
+	device_remove_user(&iface->ext_dev);
+
 	if (iface->parent_iface.iface)
 		interface_remove_user(&iface->parent_iface);
 
@@ -489,6 +596,9 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 			return;
 		}
 
+		if (!iface->l3_dev.dev)
+			interface_set_l3_dev(iface, iface->main_dev.dev);
+
 		interface_ip_set_enabled(&iface->config_ip, true);
 		system_flush_routes();
 		iface->state = IFS_UP;
@@ -504,6 +614,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 		mark_interface_down(iface);
 		if (iface->main_dev.dev)
 			device_release(&iface->main_dev);
+		if (iface->l3_dev.dev)
+			device_remove_user(&iface->l3_dev);
 		interface_handle_config_change(iface);
 		break;
 	case IFPEV_LINK_LOST:
@@ -514,6 +626,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 		mark_interface_down(iface);
 		iface->state = IFS_SETUP;
 		break;
+	default:
+		return;
 	}
 
 	interface_write_resolv_conf();
@@ -534,15 +648,18 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s
 	state->iface = iface;
 }
 
-void
-interface_init(struct interface *iface, const char *name,
-	       struct blob_attr *config, bool dynamic)
+struct interface *
+interface_alloc(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;
+	char *iface_name;
+	bool force_link = false;
 
-	strncpy(iface->name, name, sizeof(iface->name) - 1);
+	iface = calloc_a(sizeof(*iface), &iface_name, strlen(name) + 1);
+	iface->name = strcpy(iface_name, name);
 	INIT_LIST_HEAD(&iface->errors);
 	INIT_LIST_HEAD(&iface->users);
 	INIT_LIST_HEAD(&iface->hotplug_list);
@@ -552,6 +669,7 @@ interface_init(struct interface *iface, const char *name,
 	iface->config_ip.enabled = false;
 
 	iface->main_dev.cb = interface_cb;
+	iface->ext_dev.cb = interface_ext_cb;
 
 	blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
 		      blob_data(config), blob_len(config));
@@ -560,8 +678,11 @@ interface_init(struct interface *iface, const char *name,
 		proto_name = blobmsg_data(cur);
 
 	proto_attach_interface(iface, proto_name);
+	if (iface->proto_handler->flags & PROTO_FLAG_FORCE_LINK_DEFAULT)
+		force_link = true;
 
 	iface->autostart = blobmsg_get_bool_default(tb[IFACE_ATTR_AUTO], true);
+	iface->force_link = blobmsg_get_bool_default(tb[IFACE_ATTR_FORCE_LINK], force_link);
 	iface->proto_ip.no_defaultroute =
 		!blobmsg_get_bool_default(tb[IFACE_ATTR_DEFAULTROUTE], true);
 	iface->proto_ip.no_dns =
@@ -593,23 +714,22 @@ interface_init(struct interface *iface, const char *name,
 			DPRINTF("Failed to resolve routing table: %s\n", (char *) blobmsg_data(cur));
 	}
 
-	// Set a default exteranl routing table for IPv6 to do source-based-filtering
-	struct interface *iface_old = vlist_find(&interfaces, name, iface_old, node);
-	if (iface_old && iface_old->ip6table > 1000 && iface_old->ip6table < 2000)
-		iface->ip6table = iface_old->ip6table;
-	else
-		iface->ip6table = 1000 + ++interface_serial;
-
 	if ((cur = tb[IFACE_ATTR_IP6TABLE])) {
 		if (!system_resolve_rt_table(blobmsg_data(cur), &iface->ip6table))
 			DPRINTF("Failed to resolve routing table: %s\n", (char *) blobmsg_data(cur));
 	}
 
+	iface->proto_ip.no_delegation = !blobmsg_get_bool_default(tb[IFACE_ATTR_DELEGATE], true);
+
 	iface->config_autostart = iface->autostart;
-	iface->dynamic = dynamic;
+	return iface;
+}
 
-	if (iface->dynamic)
-		iface->node.version = -1; // Don't delete on reload
+void interface_set_dynamic(struct interface *iface)
+{
+	iface->dynamic = true;
+	iface->autostart = true;
+	iface->node.version = -1; // Don't delete on reload
 }
 
 static bool __interface_add(struct interface *iface, struct blob_attr *config, bool alias)
@@ -666,8 +786,10 @@ interface_set_l3_dev(struct interface *iface, struct device *dev)
 	device_add_user(&iface->l3_dev, dev);
 
 	if (dev) {
-		if (claimed)
-			device_claim(&iface->l3_dev);
+		if (claimed) {
+			if (device_claim(&iface->l3_dev) < 0)
+				return;
+		}
 		interface_ip_set_enabled(&iface->config_ip, enabled);
 	}
 }
@@ -675,21 +797,22 @@ interface_set_l3_dev(struct interface *iface, struct device *dev)
 void
 interface_set_main_dev(struct interface *iface, struct device *dev)
 {
-	bool set_l3 = (iface->main_dev.dev == iface->l3_dev.dev);
 	bool claimed = iface->l3_dev.claimed;
 
 	if (iface->main_dev.dev == dev)
 		return;
 
-	if (set_l3)
-		interface_set_l3_dev(iface, dev);
-
+	interface_set_available(iface, false);
 	device_add_user(&iface->main_dev, dev);
-	if (!dev)
+	if (!dev) {
+		interface_set_link_state(iface, false);
 		return;
+	}
 
-	if (claimed)
-		device_claim(&iface->l3_dev);
+	if (claimed) {
+		if (device_claim(&iface->l3_dev) < 0)
+			return;
+	}
 
 	if (!iface->l3_dev.dev)
 		interface_set_l3_dev(iface, dev);
@@ -703,18 +826,21 @@ interface_remove_link(struct interface *iface, struct device *dev)
 	if (mdev && mdev->hotplug_ops)
 		return mdev->hotplug_ops->del(mdev, dev);
 
+	if (dev == iface->ext_dev.dev)
+		device_remove_user(&iface->ext_dev);
+
 	if (!iface->main_dev.hotplug)
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
 	if (dev != iface->main_dev.dev)
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	device_remove_user(&iface->main_dev);
+	interface_set_main_dev(iface, NULL);
 	return 0;
 }
 
-int
-interface_add_link(struct interface *iface, struct device *dev)
+static int
+interface_add_link(struct interface *iface, struct device *dev, bool link_ext)
 {
 	struct device *mdev = iface->main_dev.dev;
 
@@ -731,12 +857,46 @@ interface_add_link(struct interface *iface, struct device *dev)
 			return UBUS_STATUS_NOT_SUPPORTED;
 	}
 
+	if (link_ext)
+		device_add_user(&iface->ext_dev, dev);
+
 	interface_set_main_dev(iface, dev);
 	iface->main_dev.hotplug = true;
 	return 0;
 }
 
 int
+interface_handle_link(struct interface *iface, const char *name, bool add, bool link_ext)
+{
+	struct device *dev;
+	int ret;
+
+	device_lock();
+
+	dev = device_get(name, add ? (link_ext ? 2 : 1) : 0);
+	if (!dev) {
+		ret = UBUS_STATUS_NOT_FOUND;
+		goto out;
+	}
+
+	if (add) {
+		device_set_present(dev, true);
+		if (iface->device_config)
+			device_set_config(dev, &simple_device_type, iface->config);
+
+		system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
+		ret = interface_add_link(iface, dev, link_ext);
+	} else {
+		ret = interface_remove_link(iface, dev);
+	}
+
+out:
+	device_unlock();
+
+	return ret;
+}
+
+int
 interface_set_up(struct interface *iface)
 {
 	int ret;
@@ -754,18 +914,13 @@ interface_set_up(struct interface *iface)
 
 	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;
+		if (!ret)
+			interface_check_state(iface);
 	}
+	else
+		ret = __interface_set_up(iface);
 
-	return 0;
+	return ret;
 }
 
 int
@@ -806,6 +961,7 @@ set_config_state(struct interface *iface, enum interface_config_state s)
 void
 interface_update_start(struct interface *iface)
 {
+	iface->updated = 0;
 	interface_ip_update_start(&iface->proto_ip);
 }
 
@@ -865,6 +1021,7 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 	if_old->ifname = if_new->ifname;
 	if_old->parent_ifname = if_new->parent_ifname;
 	if_old->proto_handler = if_new->proto_handler;
+	if_old->force_link = if_new->force_link;
 
 	if_old->proto_ip.no_dns = if_new->proto_ip.no_dns;
 	interface_replace_dns(&if_old->config_ip, &if_new->config_ip);
@@ -878,7 +1035,7 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 #undef UPDATE
 
 	if (reload) {
-		D(INTERFACE, "Reload interface '%s because of config changes\n",
+		D(INTERFACE, "Reload interface '%s' because of config changes\n",
 		  if_old->name);
 		interface_clear_errors(if_old);
 		set_config_state(if_old, IFC_RELOAD);
@@ -893,6 +1050,8 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 	}
 
 	interface_write_resolv_conf();
+	if (if_old->main_dev.dev)
+		interface_check_state(if_old);
 
 out:
 	if_new->config = NULL;