X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=0b9893ccad49fc4b84b698aa9d735203ebd30960;hp=72599e63fd95c344e340f437ee3c0d51212eabd8;hb=4789adf1e55cf51a8b556fba0c7c31bb5f430c7d;hpb=89ccd8055bb6c330bd9f883e37bbf36078d5d948

diff --git a/interface.c b/interface.c
index 72599e6..0b9893c 100644
--- a/interface.c
+++ b/interface.c
@@ -68,19 +68,18 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[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 },
-};
-
 const struct uci_blob_param_list interface_attr_list = {
 	.n_params = IFACE_ATTR_MAX,
 	.params = iface_attrs,
-	.info = iface_attr_info,
 };
 
 static void
-interface_clear_errors(struct interface *iface)
+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;
 
@@ -90,6 +89,17 @@ interface_clear_errors(struct interface *iface)
 	}
 }
 
+static void
+interface_clear_errors(struct interface *iface)
+{
+        /* 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)))
+		interface_error_flush(iface);
+}
+
 void interface_add_error(struct interface *iface, const char *subsystem,
 			 const char *code, const char **data, int n_data)
 {
@@ -98,6 +108,14 @@ 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,
+           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))
+		return;
+
 	if (n_data) {
 		len = n_data * sizeof(char *);
 		datalen = alloca(len);
@@ -113,6 +131,11 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 	if (!error)
 		return;
 
+	/* Only keep the last flagged error, prevent this list grows unlimitted in case the
+	   protocol can't be established (e.g auth failure) */
+	if (iface->proto_handler->flags & PROTO_FLAG_LASTERROR)
+		interface_error_flush(iface);
+
 	list_add_tail(&error->list, &iface->errors);
 
 	dest = (char *) &error->data[n_data + 1];
@@ -121,7 +144,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);
@@ -166,6 +189,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);
@@ -174,6 +200,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)
 {
@@ -188,6 +233,7 @@ interface_event(struct interface *iface, enum interface_event ev)
 
 	switch (ev) {
 	case IFEV_UP:
+		interface_error_flush(iface);
 		adev = iface->l3_dev.dev;
 		/* fall through */
 	case IFEV_DOWN:
@@ -214,10 +260,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();
@@ -237,9 +285,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:
@@ -311,17 +356,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;
@@ -353,6 +403,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)
 {
@@ -488,13 +557,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;
@@ -510,8 +593,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;
 	}
@@ -593,10 +675,12 @@ 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;
 
@@ -611,6 +695,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();
@@ -655,7 +740,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;
 }
 
@@ -679,8 +764,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));
@@ -789,7 +875,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;
@@ -820,6 +905,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);
 
@@ -829,6 +915,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);
 	}
 }
 
@@ -918,11 +1005,9 @@ interface_handle_link(struct interface *iface, const char *name, bool add, bool
 	}
 
 	if (add) {
+		interface_set_device_config(iface, dev);
 		device_set_present(dev, true);
-		if (iface->device_config && dev->default_config)
-			device_set_config(dev, dev->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);
@@ -1016,6 +1101,35 @@ interface_replace_dns(struct interface_ip_settings *new, struct interface_ip_set
 	vlist_simple_replace(&new->dns_search, &old->dns_search);
 }
 
+static bool
+interface_device_config_changed(struct interface *if_old, struct interface *if_new)
+{
+	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 = 0;
+
+	BUILD_BUG_ON(sizeof(diff) < __DEV_ATTR_MAX / 8);
+
+	if (!dev)
+		return false;
+
+	if (if_old->device_config != if_new->device_config)
+		return true;
+
+	if (!if_new->device_config)
+		return false;
+
+	blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, otb,
+		blob_data(if_old->config), blob_len(if_old->config));
+
+	blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, ntb,
+		blob_data(if_new->config), blob_len(if_new->config));
+
+	uci_blob_diff(ntb, otb, &device_attr_list, &diff);
+	return diff;
+}
+
 static void
 interface_change_config(struct interface *if_old, struct interface *if_new)
 {
@@ -1033,6 +1147,9 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 		reload = true;
 	}
 
+	if (!reload && interface_device_config_changed(if_old, if_new))
+		reload = true;
+
 	if (FIELD_CHANGED_STR(ifname) ||
 	    if_old->proto_handler != if_new->proto_handler)
 		reload = true;