X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=fddb861b09fea310217fe435642cd6465e2abd80;hp=4a42ad9a330fd4e5c4b4920411ba4bd00c43cf6f;hb=2eca28705a27ab37ee902308af2c134c64c95e61;hpb=a2bc078dd3187752d18163266ccbf6c40803d5c9

diff --git a/interface.c b/interface.c
index 4a42ad9..fddb861 100644
--- a/interface.c
+++ b/interface.c
@@ -80,6 +80,7 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 	int i, len = 0;
 	int *datalen = NULL;
 	char *dest;
+	int subsystem_len = 0, code_len = 0;
 
 	if (n_data) {
 		len = n_data * sizeof(char *);
@@ -90,13 +91,21 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 		}
 	}
 
+	if (subsystem) {
+		subsystem_len = strlen(subsystem) + 1;
+		len += subsystem_len;
+	}
+
+	if (code) {
+		code_len = strlen(code) + 1;
+		len += code_len;
+	}
+
 	error = calloc(1, sizeof(*error) + sizeof(char *) + len);
 	if (!error)
 		return;
 
 	list_add_tail(&error->list, &iface->errors);
-	error->subsystem = subsystem;
-	error->code = code;
 
 	dest = (char *) &error->data[n_data + 1];
 	for (i = 0; i < n_data; i++) {
@@ -104,7 +113,20 @@ 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;
+
+	dest = (char *) &error->data[n_data];
+	if (subsystem) {
+		error->subsystem = dest;
+		strcpy(dest, subsystem);
+		dest += subsystem_len;
+	}
+
+	if (code) {
+		error->code = dest;
+		strcpy(dest, code);
+		dest += code_len;
+	}
 }
 
 static void
@@ -170,8 +192,6 @@ interface_event(struct interface *iface, enum interface_event ev)
 static void
 interface_flush_state(struct interface *iface)
 {
-	if (iface->main_dev.dev)
-		device_release(&iface->main_dev);
 	if (iface->l3_dev.dev)
 		device_release(&iface->l3_dev);
 	interface_data_flush(iface);
@@ -395,7 +415,6 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 		iface->state = IFS_UP;
 		iface->start_time = system_get_rtime();
 		interface_event(iface, IFEV_UP);
-		interface_write_resolv_conf();
 		netifd_log_message(L_NOTICE, "Interface '%s' is now up\n", iface->name);
 		break;
 	case IFPEV_DOWN:
@@ -404,6 +423,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 
 		netifd_log_message(L_NOTICE, "Interface '%s' is now down\n", iface->name);
 		mark_interface_down(iface);
+		if (iface->main_dev.dev)
+			device_release(&iface->main_dev);
 		interface_handle_config_change(iface);
 		break;
 	case IFPEV_LINK_LOST:
@@ -415,6 +436,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 		iface->state = IFS_SETUP;
 		break;
 	}
+
+	interface_write_resolv_conf();
 }
 
 void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state)