X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=f150f7d877ca210667f27f56eb6127b9f62fc805;hp=f72d967d2f353f94168d7e8e907cb61d60321b40;hb=5fbd904e5b4ed87243c09c86adcfb17ae93aa4f5;hpb=ab369490f931712c21913902f8cb9a81fc2767a4

diff --git a/interface.c b/interface.c
index f72d967..f150f7d 100644
--- a/interface.c
+++ b/interface.c
@@ -35,6 +35,7 @@ enum {
 	IFACE_ATTR_PEERDNS,
 	IFACE_ATTR_DNS,
 	IFACE_ATTR_DNS_SEARCH,
+	IFACE_ATTR_DNS_METRIC,
 	IFACE_ATTR_METRIC,
 	IFACE_ATTR_INTERFACE,
 	IFACE_ATTR_IP6ASSIGN,
@@ -45,6 +46,7 @@ enum {
 	IFACE_ATTR_DELEGATE,
 	IFACE_ATTR_IP6IFACEID,
 	IFACE_ATTR_FORCE_LINK,
+	IFACE_ATTR_IP6WEIGHT,
 	IFACE_ATTR_MAX
 };
 
@@ -57,6 +59,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_METRIC] = { .name = "metric", .type = BLOBMSG_TYPE_INT32 },
 	[IFACE_ATTR_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
 	[IFACE_ATTR_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY },
+	[IFACE_ATTR_DNS_METRIC] = { .name = "dns_metric", .type = BLOBMSG_TYPE_INT32 },
 	[IFACE_ATTR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
 	[IFACE_ATTR_IP6ASSIGN] = { .name = "ip6assign", .type = BLOBMSG_TYPE_INT32 },
 	[IFACE_ATTR_IP6HINT] = { .name = "ip6hint", .type = BLOBMSG_TYPE_STRING },
@@ -66,20 +69,20 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_DELEGATE] = { .name = "delegate", .type = BLOBMSG_TYPE_BOOL },
 	[IFACE_ATTR_IP6IFACEID] = { .name = "ip6ifaceid", .type = BLOBMSG_TYPE_STRING },
 	[IFACE_ATTR_FORCE_LINK] = { .name = "force_link", .type = BLOBMSG_TYPE_BOOL },
-};
-
-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 },
+	[IFACE_ATTR_IP6WEIGHT] = { .name = "ip6weight", .type = BLOBMSG_TYPE_INT32 },
 };
 
 const struct uci_blob_param_list interface_attr_list = {
 	.n_params = IFACE_ATTR_MAX,
 	.params = iface_attrs,
-	.info = iface_attr_info,
 };
 
 static void
+set_config_state(struct interface *iface, enum interface_config_state s);
+static void
+interface_event(struct interface *iface, enum interface_event ev);
+
+static void
 interface_error_flush(struct interface *iface)
 {
 	struct interface_error *error, *tmp;
@@ -93,11 +96,11 @@ interface_error_flush(struct interface *iface)
 static void
 interface_clear_errors(struct interface *iface)
 {
-        /* don't flush the errors in case the configured protocol handler matches the
+	/* don't flush the errors in case the configured protocol handler matches the
            running protocol handler and is having the last error capability */
 	if (!(iface->proto &&
-              (iface->proto->handler->flags & PROTO_FLAG_LASTERROR) &&
-              (iface->proto->handler->name == iface->proto_handler->name)))
+	      (iface->proto->handler->flags & PROTO_FLAG_LASTERROR) &&
+	      (iface->proto->handler->name == iface->proto_handler->name)))
 		interface_error_flush(iface);
 }
 
@@ -109,12 +112,12 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 	int *datalen = NULL;
 	char *dest, *d_subsys, *d_code;
 
-        /* if the configured protocol handler has the last error support capability,
+	/* if the configured protocol handler has the last error support capability,
            errors should only be added if the running protocol handler matches the
            configured one */
 	if (iface->proto &&
-            (iface->proto->handler->flags & PROTO_FLAG_LASTERROR) &&
-            (iface->proto->handler->name != iface->proto_handler->name))
+	    (iface->proto->handler->flags & PROTO_FLAG_LASTERROR) &&
+	    (iface->proto->handler->name != iface->proto_handler->name))
 		return;
 
 	if (n_data) {
@@ -145,7 +148,7 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 		memcpy(dest, data[i], datalen[i]);
 		dest += datalen[i];
 	}
-	error->data[n_data++] = NULL;
+	error->data[n_data] = NULL;
 
 	if (subsystem)
 		error->subsystem = strcpy(d_subsys, subsystem);
@@ -190,6 +193,9 @@ interface_add_data(struct interface *iface, const struct blob_attr *data)
 	}
 
 	n = calloc(1, sizeof(*n) + len);
+	if (!n)
+		return UBUS_STATUS_UNKNOWN_ERROR;
+
 	memcpy(n->data, data, len);
 	n->node.key = blobmsg_name(n->data);
 	avl_insert(&iface->data, &n->node);
@@ -198,6 +204,25 @@ interface_add_data(struct interface *iface, const struct blob_attr *data)
 	return 0;
 }
 
+int interface_parse_data(struct interface *iface, const struct blob_attr *attr)
+{
+	struct blob_attr *cur;
+	int rem, ret;
+
+	iface->updated = 0;
+
+	blob_for_each_attr(cur, attr, rem) {
+		ret = interface_add_data(iface, cur);
+		if (ret)
+			return ret;
+	}
+
+	if (iface->updated && iface->state == IFS_UP)
+		interface_event(iface, IFEV_UPDATE);
+
+	return 0;
+}
+
 static void
 interface_event(struct interface *iface, enum interface_event ev)
 {
@@ -239,10 +264,12 @@ mark_interface_down(struct interface *iface)
 	if (state == IFS_DOWN)
 		return;
 
+	iface->link_up_event = false;
 	iface->state = IFS_DOWN;
 	if (state == IFS_UP)
 		interface_event(iface, IFEV_DOWN);
 	interface_ip_set_enabled(&iface->config_ip, false);
+	interface_ip_set_enabled(&iface->proto_ip, false);
 	interface_ip_flush(&iface->proto_ip);
 	interface_flush_state(iface);
 	system_flush_routes();
@@ -262,9 +289,6 @@ __interface_set_down(struct interface *iface, bool force)
 		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:
@@ -336,17 +360,22 @@ interface_set_link_state(struct interface *iface, bool new_state)
 	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);
+
+	if (new_state && iface->force_link && iface->state == IFS_UP && !iface->link_up_event) {
+		interface_event(iface, IFEV_LINK_UP);
+		iface->link_up_event = true;
+	}
 }
 
 static void
-interface_ext_cb(struct device_user *dep, enum device_event ev)
+interface_ext_dev_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)
+interface_main_dev_cb(struct device_user *dep, enum device_event ev)
 {
 	struct interface *iface;
 	bool new_state = false;
@@ -378,6 +407,25 @@ interface_cb(struct device_user *dep, enum device_event ev)
 	}
 }
 
+static void
+interface_l3_dev_cb(struct device_user *dep, enum device_event ev)
+{
+	struct interface *iface;
+
+	iface = container_of(dep, struct interface, l3_dev);
+	if (iface->l3_dev.dev == iface->main_dev.dev)
+		return;
+
+	switch (ev) {
+	case DEV_EVENT_LINK_DOWN:
+		if (iface->proto_handler->flags & PROTO_FLAG_TEARDOWN_ON_L3_LINK_DOWN)
+			interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, false);
+		break;
+	default:
+		break;
+	}
+}
+
 void
 interface_set_available(struct interface *iface, bool new_state)
 {
@@ -451,6 +499,7 @@ interface_merge_assignment_data(struct interface *old, struct interface *new)
 	bool changed = (old->assignment_hint != new->assignment_hint ||
 			old->assignment_length != new->assignment_length ||
 			old->assignment_iface_id_selection != new->assignment_iface_id_selection ||
+			old->assignment_weight != new->assignment_weight ||
 			(old->assignment_iface_id_selection == IFID_FIXED &&
 			 memcmp(&old->assignment_fixed_iface_id, &new->assignment_fixed_iface_id,
 				sizeof(old->assignment_fixed_iface_id))) ||
@@ -488,6 +537,7 @@ interface_merge_assignment_data(struct interface *old, struct interface *new)
 		old->assignment_length = new->assignment_length;
 		old->assignment_iface_id_selection = new->assignment_iface_id_selection;
 		old->assignment_fixed_iface_id = new->assignment_fixed_iface_id;
+		old->assignment_weight = new->assignment_weight;
 		interface_refresh_assignments(true);
 	}
 }
@@ -513,13 +563,27 @@ interface_alias_cb(struct interface_user *dep, struct interface *iface, enum int
 	case IFEV_FREE:
 		interface_remove_user(dep);
 		break;
-	case IFEV_RELOAD:
-	case IFEV_UPDATE:
+	default:
 		break;
 	}
 }
 
 static void
+interface_set_device_config(struct interface *iface, struct device *dev)
+{
+	if (!dev || !dev->default_config)
+		return;
+
+	if (!iface->device_config &&
+	    (!dev->iface_config || dev->config_iface != iface))
+		return;
+
+	dev->config_iface = iface;
+	dev->iface_config = iface->device_config;
+	device_apply_config(dev, dev->type, iface->config);
+}
+
+static void
 interface_claim_device(struct interface *iface)
 {
 	struct interface *parent;
@@ -528,6 +592,8 @@ interface_claim_device(struct interface *iface)
 	if (iface->parent_iface.iface)
 		interface_remove_user(&iface->parent_iface);
 
+	device_lock();
+
 	if (iface->parent_ifname) {
 		parent = vlist_find(&interfaces, iface->parent_ifname, parent, node);
 		iface->parent_iface.cb = interface_alias_cb;
@@ -535,8 +601,7 @@ interface_claim_device(struct interface *iface)
 	} else if (iface->ifname &&
 		!(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
 		dev = device_get(iface->ifname, true);
-		if (dev && dev->default_config && iface->device_config)
-			device_apply_config(dev, dev->type, iface->config);
+		interface_set_device_config(iface, dev);
 	} else {
 		dev = iface->ext_dev.dev;
 	}
@@ -544,6 +609,8 @@ interface_claim_device(struct interface *iface)
 	if (dev)
 		interface_set_main_dev(iface, dev);
 
+	device_unlock();
+
 	if (iface->proto_handler->flags & PROTO_FLAG_INIT_AVAILABLE)
 		interface_set_available(iface, true);
 }
@@ -618,17 +685,20 @@ interface_handle_config_change(struct interface *iface)
 	}
 	if (iface->autostart && iface->available)
 		interface_set_up(iface);
+	else if (iface->dynamic)
+		set_config_state(iface, IFC_REMOVE);
 }
 
 static void
-interface_proto_cb(struct interface_proto_state *state, enum interface_proto_event ev)
+interface_proto_event_cb(struct interface_proto_state *state, enum interface_proto_event ev)
 {
 	struct interface *iface = state->iface;
 
 	switch (ev) {
 	case IFPEV_UP:
 		if (iface->state != IFS_SETUP) {
-			interface_event(iface, IFEV_UPDATE);
+			if (iface->state == IFS_UP && iface->updated)
+				interface_event(iface, IFEV_UPDATE);
 			return;
 		}
 
@@ -636,6 +706,7 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 			interface_set_l3_dev(iface, iface->main_dev.dev);
 
 		interface_ip_set_enabled(&iface->config_ip, true);
+		interface_ip_set_enabled(&iface->proto_ip, true);
 		system_flush_routes();
 		iface->state = IFS_UP;
 		iface->start_time = system_get_rtime();
@@ -680,7 +751,7 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s
 	if (!state)
 		return;
 
-	state->proto_event = interface_proto_cb;
+	state->proto_event = interface_proto_event_cb;
 	state->iface = iface;
 }
 
@@ -704,8 +775,9 @@ interface_alloc(const char *name, struct blob_attr *config)
 	avl_init(&iface->data, avl_strcmp, false, NULL);
 	iface->config_ip.enabled = false;
 
-	iface->main_dev.cb = interface_cb;
-	iface->ext_dev.cb = interface_ext_cb;
+	iface->main_dev.cb = interface_main_dev_cb;
+	iface->l3_dev.cb = interface_l3_dev_cb;
+	iface->ext_dev.cb = interface_ext_dev_cb;
 
 	blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
 		      blob_data(config), blob_len(config));
@@ -730,6 +802,9 @@ interface_alloc(const char *name, struct blob_attr *config)
 	if ((cur = tb[IFACE_ATTR_DNS_SEARCH]))
 		interface_add_dns_search_list(&iface->config_ip, cur);
 
+	if ((cur = tb[IFACE_ATTR_DNS_METRIC]))
+		iface->dns_metric = blobmsg_get_u32(cur);
+
 	if ((cur = tb[IFACE_ATTR_METRIC]))
 		iface->metric = blobmsg_get_u32(cur);
 
@@ -771,6 +846,8 @@ interface_alloc(const char *name, struct blob_attr *config)
 	if ((cur = tb[IFACE_ATTR_IP6CLASS]))
 		interface_add_assignment_classes(iface, cur);
 
+	if ((cur = tb[IFACE_ATTR_IP6WEIGHT]))
+		iface->assignment_weight = blobmsg_get_u32(cur);
 
 	if ((cur = tb[IFACE_ATTR_IP4TABLE])) {
 		if (!system_resolve_rt_table(blobmsg_data(cur), &iface->ip4table))
@@ -814,7 +891,6 @@ static bool __interface_add(struct interface *iface, struct blob_attr *config, b
 			iface->ifname = blobmsg_data(cur);
 	}
 
-
 	iface->config = config;
 	vlist_add(&interfaces, &iface->node, iface->name);
 	return true;
@@ -845,6 +921,7 @@ interface_set_l3_dev(struct interface *iface, struct device *dev)
 		return;
 
 	interface_ip_set_enabled(&iface->config_ip, false);
+	interface_ip_set_enabled(&iface->proto_ip, false);
 	interface_ip_flush(&iface->proto_ip);
 	device_add_user(&iface->l3_dev, dev);
 
@@ -854,6 +931,7 @@ interface_set_l3_dev(struct interface *iface, struct device *dev)
 				return;
 		}
 		interface_ip_set_enabled(&iface->config_ip, enabled);
+		interface_ip_set_enabled(&iface->proto_ip, enabled);
 	}
 }
 
@@ -943,9 +1021,7 @@ interface_handle_link(struct interface *iface, const char *name, bool add, bool
 	}
 
 	if (add) {
-		if (iface->device_config && dev->default_config)
-			device_apply_config(dev, dev->type, iface->config);
-
+		interface_set_device_config(iface, dev);
 		device_set_present(dev, true);
 
 		ret = interface_add_link(iface, dev, link_ext);
@@ -1022,10 +1098,12 @@ set_config_state(struct interface *iface, enum interface_config_state s)
 }
 
 void
-interface_update_start(struct interface *iface)
+interface_update_start(struct interface *iface, const bool keep_old)
 {
 	iface->updated = 0;
-	interface_ip_update_start(&iface->proto_ip);
+
+	if (!keep_old)
+		interface_ip_update_start(&iface->proto_ip);
 }
 
 void
@@ -1047,7 +1125,7 @@ interface_device_config_changed(struct interface *if_old, struct interface *if_n
 	struct blob_attr *ntb[__DEV_ATTR_MAX];
 	struct blob_attr *otb[__DEV_ATTR_MAX];
 	struct device *dev = if_old->main_dev.dev;
-	unsigned long diff;
+	unsigned long diff = 0;
 
 	BUILD_BUG_ON(sizeof(diff) < __DEV_ATTR_MAX / 8);
 
@@ -1121,6 +1199,7 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 	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->dns_metric = if_new->dns_metric;
 
 	if_old->proto_ip.no_dns = if_new->proto_ip.no_dns;
 	interface_replace_dns(&if_old->config_ip, &if_new->config_ip);