X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=4c92f10962db451fe23bbceb6a82c48d34ac4c7c;hp=42e5a8248c6d37b9382fb8a30c57411e34ccc0a1;hb=3f88c1dc2f738bc50dfa47038fde2565daf84385;hpb=2f31bff38d4dc2f36006ded6b8a7d039cb569eaa

diff --git a/interface.c b/interface.c
index 42e5a82..4c92f10 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,
@@ -42,6 +41,9 @@ enum {
 	IFACE_ATTR_IP6HINT,
 	IFACE_ATTR_IP4TABLE,
 	IFACE_ATTR_IP6TABLE,
+	IFACE_ATTR_IP6CLASS,
+	IFACE_ATTR_DELEGATE,
+	IFACE_ATTR_FORCE_LINK,
 	IFACE_ATTR_MAX
 };
 
@@ -59,13 +61,17 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_IP6HINT] = { .name = "ip6hint", .type = BLOBMSG_TYPE_STRING },
 	[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 union config_param_info iface_attr_info[IFACE_ATTR_MAX] = {
+static const struct uci_blob_param_info iface_attr_info[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_DNS] = { .type = BLOBMSG_TYPE_STRING },
+	[IFACE_ATTR_IP6CLASS] = { .type = BLOBMSG_TYPE_STRING },
 };
 
-const struct config_param_list interface_attr_list = {
+const struct uci_blob_param_list interface_attr_list = {
 	.n_params = IFACE_ATTR_MAX,
 	.params = iface_attrs,
 	.info = iface_attr_info,
@@ -146,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(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;
 }
 
@@ -195,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);
@@ -207,39 +224,120 @@ 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) {
+			mark_interface_down(iface);
+			interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, false);
+		}
+		break;
+	case IFS_DOWN:
+		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);
+}
+
+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_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
@@ -280,6 +378,77 @@ interface_remove_user(struct interface_user *dep)
 }
 
 static void
+interface_add_assignment_classes(struct interface *iface, struct blob_attr *list)
+{
+	struct blob_attr *cur;
+	int rem;
+
+	blobmsg_for_each_attr(cur, list, rem) {
+		if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
+			continue;
+
+		if (!blobmsg_check_attr(cur, NULL))
+			continue;
+
+		struct interface_assignment_class *c = malloc(sizeof(*c) + blobmsg_data_len(cur));
+		memcpy(c->name, blobmsg_data(cur), blobmsg_data_len(cur));
+		list_add(&c->head, &iface->assignment_classes);
+	}
+}
+
+static void
+interface_clear_assignment_classes(struct interface *iface)
+{
+	while (!list_empty(&iface->assignment_classes)) {
+		struct interface_assignment_class *c = list_first_entry(&iface->assignment_classes,
+				struct interface_assignment_class, head);
+		list_del(&c->head);
+		free(c);
+	}
+}
+
+static void
+interface_merge_assignment_data(struct interface *old, struct interface *new)
+{
+	bool changed = (old->assignment_hint != new->assignment_hint ||
+			old->assignment_length != new->assignment_length ||
+			list_empty(&old->assignment_classes) != list_empty(&new->assignment_classes));
+
+	struct interface_assignment_class *c;
+	list_for_each_entry(c, &new->assignment_classes, head) {
+		// Compare list entries one-by-one to see if there was a change
+		if (list_empty(&old->assignment_classes)) // The new list is longer
+			changed = true;
+
+		if (changed)
+			break;
+
+		struct interface_assignment_class *c_old = list_first_entry(&old->assignment_classes,
+				struct interface_assignment_class, head);
+
+		if (strcmp(c_old->name, c->name)) // An entry didn't match
+			break;
+
+		list_del(&c_old->head);
+		free(c_old);
+	}
+
+	// The old list was longer than the new one or the last entry didn't match
+	if (!list_empty(&old->assignment_classes)) {
+		interface_clear_assignment_classes(old);
+		changed = true;
+	}
+
+	list_splice_init(&new->assignment_classes, &old->assignment_classes);
+
+	if (changed) {
+		old->assignment_hint = new->assignment_hint;
+		old->assignment_length = new->assignment_length;
+		interface_refresh_assignments(true);
+	}
+}
+
+static void
 interface_alias_cb(struct interface_user *dep, struct interface *iface, enum interface_event ev)
 {
 	struct interface *alias = container_of(dep, struct interface, parent_iface);
@@ -301,6 +470,7 @@ interface_alias_cb(struct interface_user *dep, struct interface *iface, enum int
 		interface_remove_user(dep);
 		break;
 	case IFEV_RELOAD:
+	case IFEV_UPDATE:
 		break;
 	}
 }
@@ -339,8 +509,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
@@ -354,6 +524,7 @@ interface_cleanup(struct interface *iface)
 	list_for_each_entry_safe(dep, tmp, &iface->users, list)
 		interface_remove_user(dep);
 
+	interface_clear_assignment_classes(iface);
 	interface_ip_flush(&iface->config_ip);
 	interface_cleanup_state(iface);
 }
@@ -405,8 +576,13 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 
 	switch (ev) {
 	case IFPEV_UP:
-		if (iface->state != IFS_SETUP)
+		if (iface->state != IFS_SETUP) {
+			interface_event(iface, IFEV_UPDATE);
 			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();
@@ -423,6 +599,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:
@@ -433,6 +611,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();
@@ -453,18 +633,21 @@ 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)
+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;
 
-	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);
+	INIT_LIST_HEAD(&iface->assignment_classes);
 	interface_ip_init(iface);
 	avl_init(&iface->data, avl_strcmp, false, NULL);
 	iface->config_ip.enabled = false;
@@ -480,6 +663,7 @@ interface_init(struct interface *iface, const char *name,
 	proto_attach_interface(iface, proto_name);
 
 	iface->autostart = blobmsg_get_bool_default(tb[IFACE_ATTR_AUTO], true);
+	iface->force_link = blobmsg_get_bool_default(tb[IFACE_ATTR_FORCE_LINK], false);
 	iface->proto_ip.no_defaultroute =
 		!blobmsg_get_bool_default(tb[IFACE_ATTR_DEFAULTROUTE], true);
 	iface->proto_ip.no_dns =
@@ -495,26 +679,38 @@ interface_init(struct interface *iface, const char *name,
 		iface->metric = blobmsg_get_u32(cur);
 
 	if ((cur = tb[IFACE_ATTR_IP6ASSIGN]))
-		iface->config_ip.assignment_length = blobmsg_get_u32(cur);
+		iface->assignment_length = blobmsg_get_u32(cur);
 
-	iface->config_ip.assignment_hint = -1;
+	iface->assignment_hint = -1;
 	if ((cur = tb[IFACE_ATTR_IP6HINT]))
-		iface->config_ip.assignment_hint = strtol(blobmsg_get_string(cur), NULL, 16) &
-				~((1 << (64 - iface->config_ip.assignment_length)) - 1);
+		iface->assignment_hint = strtol(blobmsg_get_string(cur), NULL, 16) &
+				~((1 << (64 - iface->assignment_length)) - 1);
+
+	if ((cur = tb[IFACE_ATTR_IP6CLASS]))
+		interface_add_assignment_classes(iface, cur);
+
 
 	if ((cur = tb[IFACE_ATTR_IP4TABLE])) {
 		if (!system_resolve_rt_table(blobmsg_data(cur), &iface->ip4table))
 			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
-	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;
+	return iface;
+}
+
+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)
@@ -571,8 +767,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);
 	}
 }
@@ -580,18 +778,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 (claimed)
-		device_claim(&iface->l3_dev);
+	if (!dev) {
+		interface_set_link_state(iface, false);
+		return;
+	}
+
+	if (claimed) {
+		if (device_claim(&iface->l3_dev) < 0)
+			return;
+	}
 
 	if (!iface->l3_dev.dev)
 		interface_set_l3_dev(iface, dev);
@@ -611,7 +813,7 @@ interface_remove_link(struct interface *iface, struct device *dev)
 	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;
 }
 
@@ -639,6 +841,37 @@ interface_add_link(struct interface *iface, struct device *dev)
 }
 
 int
+interface_handle_link(struct interface *iface, const char *name, bool add)
+{
+	struct device *dev;
+	int ret;
+
+	device_lock();
+
+	dev = device_get(name, add ? 2 : 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);
+	} else {
+		ret = interface_remove_link(iface, dev);
+	}
+
+out:
+	device_unlock();
+
+	return ret;
+}
+
+int
 interface_set_up(struct interface *iface)
 {
 	int ret;
@@ -656,18 +889,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
@@ -708,6 +936,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);
 }
 
@@ -728,7 +957,7 @@ static void
 interface_change_config(struct interface *if_old, struct interface *if_new)
 {
 	struct blob_attr *old_config = if_old->config;
-	bool reload = false, reload_ip = false, reload_assignment = false;
+	bool reload = false, reload_ip = false;
 
 #define FIELD_CHANGED_STR(field)					\
 		((!!if_old->field != !!if_new->field) ||		\
@@ -748,8 +977,8 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 	if (!if_old->proto_handler->config_params)
 		D(INTERFACE, "No config parameters for interface '%s'\n",
 		  if_old->name);
-	else if (!config_check_equal(if_old->config, if_new->config,
-				     if_old->proto_handler->config_params))
+	else if (!uci_blob_check_equal(if_old->config, if_new->config,
+				       if_old->proto_handler->config_params))
 		reload = true;
 
 #define UPDATE(field, __var) ({						\
@@ -767,19 +996,21 @@ 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);
 
 	UPDATE(metric, reload_ip);
 	UPDATE(proto_ip.no_defaultroute, reload_ip);
-	UPDATE(config_ip.assignment_length, reload_assignment);
-	UPDATE(config_ip.assignment_hint, reload_assignment);
+	UPDATE(ip4table, reload_ip);
+	UPDATE(ip6table, reload_ip);
+	interface_merge_assignment_data(if_old, 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);
@@ -788,15 +1019,14 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 
 	if (reload_ip) {
 		interface_ip_set_enabled(&if_old->config_ip, false);
-		interface_ip_set_enabled(&if_old->config_ip, if_new->config_ip.enabled);
 		interface_ip_set_enabled(&if_old->proto_ip, false);
 		interface_ip_set_enabled(&if_old->proto_ip, if_new->proto_ip.enabled);
+		interface_ip_set_enabled(&if_old->config_ip, if_new->config_ip.enabled);
 	}
 
-	if (reload_assignment)
-		interface_refresh_assignments(true);
-
 	interface_write_resolv_conf();
+	if (if_old->main_dev.dev)
+		interface_check_state(if_old);
 
 out:
 	if_new->config = NULL;