X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=device.c;h=556d9fc89d695ffc6c340a6ea88249e4a7577c67;hb=2d09cca0e90127d33eed43b8790f5778ba3b943f;hp=f50fb8505e1b7653659d63ffb895cbf3f2421b98;hpb=b9d1f678c1f705b5635de31d333353a64ff6799d;p=project%2Fnetifd.git

diff --git a/device.c b/device.c
index f50fb85..556d9fc 100644
--- a/device.c
+++ b/device.c
@@ -43,6 +43,7 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
 	[DEV_ATTR_ACCEPTLOCAL] = { .name = "acceptlocal", .type = BLOBMSG_TYPE_BOOL },
 	[DEV_ATTR_IGMPVERSION] = { .name = "igmpversion", .type = BLOBMSG_TYPE_INT32 },
 	[DEV_ATTR_MLDVERSION] = { .name = "mldversion", .type = BLOBMSG_TYPE_INT32 },
+	[DEV_ATTR_NEIGHREACHABLETIME] = { .name = "neighreachabletime", .type = BLOBMSG_TYPE_INT32 },
 };
 
 const struct uci_blob_param_list device_attr_list = {
@@ -162,6 +163,10 @@ device_merge_settings(struct device *dev, struct device_settings *n)
 	n->acceptlocal = s->flags & DEV_OPT_ACCEPTLOCAL ? s->acceptlocal : os->acceptlocal;
 	n->igmpversion = s->flags & DEV_OPT_IGMPVERSION ? s->igmpversion : os->igmpversion;
 	n->mldversion = s->flags & DEV_OPT_MLDVERSION ? s->mldversion : os->mldversion;
+	n->neigh4reachabletime = s->flags & DEV_OPT_NEIGHREACHABLETIME ?
+		s->neigh4reachabletime : os->neigh4reachabletime;
+	n->neigh6reachabletime = s->flags & DEV_OPT_NEIGHREACHABLETIME ?
+			s->neigh6reachabletime : os->neigh6reachabletime;
 	n->flags = s->flags | os->flags;
 }
 
@@ -233,6 +238,11 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
 			DPRINTF("Failed to resolve mldversion: %d\n", blobmsg_get_u32(cur));
 	}
 
+	if ((cur = tb[DEV_ATTR_NEIGHREACHABLETIME])) {
+		s->neigh6reachabletime = s->neigh4reachabletime = blobmsg_get_u32(cur);
+		s->flags |= DEV_OPT_NEIGHREACHABLETIME;
+	}
+
 	device_set_disabled(dev, disabled);
 }
 
@@ -631,16 +641,20 @@ device_apply_config(struct device *dev, const struct device_type *type,
 		case DEV_CONFIG_RESTART:
 		case DEV_CONFIG_APPLIED:
 			D(DEVICE, "Device '%s': config applied\n", dev->ifname);
+			config = blob_memdup(config);
 			free(dev->config);
 			dev->config = config;
 			if (change == DEV_CONFIG_RESTART && dev->present) {
 				device_set_present(dev, false);
+				if (dev->active && !dev->external) {
+					dev->set_state(dev, false);
+					dev->set_state(dev, true);
+				}
 				device_set_present(dev, true);
 			}
 			break;
 		case DEV_CONFIG_NO_CHANGE:
 			D(DEVICE, "Device '%s': no configuration change\n", dev->ifname);
-			free(config);
 			break;
 		case DEV_CONFIG_RECREATE:
 			break;
@@ -703,10 +717,6 @@ device_create(const char *name, const struct device_type *type,
 	struct device *odev = NULL, *dev;
 	enum dev_change_type change;
 
-	config = blob_memdup(config);
-	if (!config)
-		return NULL;
-
 	odev = device_get(name, false);
 	if (odev) {
 		odev->current_config = true;
@@ -722,6 +732,10 @@ device_create(const char *name, const struct device_type *type,
 	} else
 		D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
 
+	config = blob_memdup(config);
+	if (!config)
+		return NULL;
+
 	dev = type->create(name, config);
 	if (!dev)
 		return NULL;
@@ -790,6 +804,10 @@ device_dump_status(struct blob_buf *b, struct device *dev)
 			blobmsg_add_u32(b, "igmpversion", st.igmpversion);
 		if (st.flags & DEV_OPT_MLDVERSION)
 			blobmsg_add_u32(b, "mldversion", st.mldversion);
+		if (st.flags & DEV_OPT_NEIGHREACHABLETIME) {
+			blobmsg_add_u32(b, "neigh4reachabletime", st.neigh4reachabletime);
+			blobmsg_add_u32(b, "neigh6reachabletime", st.neigh6reachabletime);
+		}
 	}
 
 	s = blobmsg_open_table(b, "statistics");