X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=a9ecf28d0e62647c6a5922bdcca6f2cf480d1a22;hp=4ab243120c393dd2b492ca18adfef67655e37328;hb=a7e508b71c1cf3ee9d401510d298195067fba8e5;hpb=0b0e5e2fc5b065092644a5c4717c0a03a9098dcf

diff --git a/interface.c b/interface.c
index 4ab2431..a9ecf28 100644
--- a/interface.c
+++ b/interface.c
@@ -68,19 +68,13 @@ 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)
+interface_error_flush(struct interface *iface)
 {
 	struct interface_error *error, *tmp;
 
@@ -90,6 +84,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 +103,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 +126,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 +139,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);
@@ -188,6 +206,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:
@@ -495,6 +514,21 @@ interface_alias_cb(struct interface_user *dep, struct interface *iface, enum int
 }
 
 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 +544,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_set_config(dev, dev->type, iface->config);
+		interface_set_device_config(iface, dev);
 	} else {
 		dev = iface->ext_dev.dev;
 	}
@@ -918,11 +951,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 +1047,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 +1093,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;