X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=b29d73b122704206b95325228b84900b12bda562;hp=5fa0ac12fe449a16fd8461f173524a4faf32eab7;hb=26cb3b2a0aebb1b9dc07daf7b54bd8400d6d659b;hpb=bac6f28ce1d9abc381c2f85c32bcd37c33cd00c8

diff --git a/device.c b/device.c
index 5fa0ac1..b29d73b 100644
--- a/device.c
+++ b/device.c
@@ -31,15 +31,17 @@
 static struct avl_tree devices;
 
 static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
-	[DEV_ATTR_TYPE] = { "type", BLOBMSG_TYPE_STRING },
-	[DEV_ATTR_IFNAME] = { "ifname", BLOBMSG_TYPE_ARRAY },
-	[DEV_ATTR_MTU] = { "mtu", BLOBMSG_TYPE_INT32 },
-	[DEV_ATTR_MACADDR] = { "macaddr", BLOBMSG_TYPE_STRING },
-	[DEV_ATTR_TXQUEUELEN] = { "txqueuelen", BLOBMSG_TYPE_INT32 },
-	[DEV_ATTR_ENABLED] = { "enabled", BLOBMSG_TYPE_BOOL },
+	[DEV_ATTR_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING },
+	[DEV_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_ARRAY },
+	[DEV_ATTR_MTU] = { .name = "mtu", .type = BLOBMSG_TYPE_INT32 },
+	[DEV_ATTR_MACADDR] = { .name = "macaddr", .type = BLOBMSG_TYPE_STRING },
+	[DEV_ATTR_TXQUEUELEN] = { .name = "txqueuelen", .type = BLOBMSG_TYPE_INT32 },
+	[DEV_ATTR_ENABLED] = { .name = "enabled", .type = BLOBMSG_TYPE_BOOL },
+	[DEV_ATTR_IPV6] = { .name = "ipv6", .type = BLOBMSG_TYPE_BOOL },
+	[DEV_ATTR_PROMISC] = { .name = "promisc", .type = BLOBMSG_TYPE_BOOL },
 };
 
-const struct config_param_list device_attr_list = {
+const struct uci_blob_param_list device_attr_list = {
 	.n_params = __DEV_ATTR_MAX,
 	.params = dev_attrs,
 };
@@ -60,6 +62,9 @@ void device_unlock(void)
 
 static int set_device_state(struct device *dev, bool state)
 {
+	if (dev->external)
+		return 0;
+
 	if (state)
 		system_if_up(dev);
 	else
@@ -139,6 +144,8 @@ device_merge_settings(struct device *dev, struct device_settings *n)
 	memcpy(n->macaddr,
 		(s->flags & DEV_OPT_MACADDR ? s->macaddr : os->macaddr),
 		sizeof(n->macaddr));
+	n->ipv6 = s->flags & DEV_OPT_IPV6 ? s->ipv6 : os->ipv6;
+	n->promisc = s->flags & DEV_OPT_PROMISC ? s->promisc : os->promisc;
 	n->flags = s->flags | os->flags;
 }
 
@@ -172,6 +179,16 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
 		}
 	}
 
+	if ((cur = tb[DEV_ATTR_IPV6])) {
+		s->ipv6 = blobmsg_get_bool(cur);
+		s->flags |= DEV_OPT_IPV6;
+	}
+
+	if ((cur = tb[DEV_ATTR_PROMISC])) {
+		s->promisc = blobmsg_get_bool(cur);
+		s->flags |= DEV_OPT_PROMISC;
+	}
+
 	device_set_disabled(dev, disabled);
 }
 
@@ -185,6 +202,10 @@ static int device_broadcast_cb(void *ctx, struct safe_list *list)
 	struct device_user *dep = container_of(list, struct device_user, list);
 	int *ev = ctx;
 
+	/* device might have been removed by an earlier callback */
+	if (!dep->dev)
+		return 0;
+
 	if (dep->cb)
 		dep->cb(dep, *ev);
 	return 0;
@@ -207,7 +228,7 @@ int device_claim(struct device_user *dep)
 		return 0;
 
 	dep->claimed = true;
-	D(DEVICE, "Claim %s %s, new refcount: %d\n", dev->type->name, dev->ifname, dev->active + 1);
+	D(DEVICE, "Claim %s %s, new active count: %d\n", dev->type->name, dev->ifname, dev->active + 1);
 	if (++dev->active != 1)
 		return 0;
 
@@ -216,7 +237,7 @@ int device_claim(struct device_user *dep)
 	if (ret == 0)
 		device_broadcast_event(dev, DEV_EVENT_UP);
 	else {
-		D(DEVICE, "claim device %s failed: %d\n", dev->ifname, ret);
+		D(DEVICE, "claim %s %s failed: %d\n", dev->type->name, dev->ifname, ret);
 		dev->active = 0;
 		dep->claimed = false;
 	}
@@ -233,14 +254,14 @@ void device_release(struct device_user *dep)
 
 	dep->claimed = false;
 	dev->active--;
-	D(DEVICE, "Release %s %s, new refcount: %d\n", dev->type->name, dev->ifname, dev->active);
+	D(DEVICE, "Release %s %s, new active count: %d\n", dev->type->name, dev->ifname, dev->active);
 	assert(dev->active >= 0);
 
 	if (dev->active)
 		return;
 
 	device_broadcast_event(dev, DEV_EVENT_TEARDOWN);
-	if (!dep->hotplug)
+	if (!dev->external)
 		dev->set_state(dev, false);
 	device_broadcast_event(dev, DEV_EVENT_DOWN);
 }
@@ -248,7 +269,7 @@ void device_release(struct device_user *dep)
 int device_check_state(struct device *dev)
 {
 	if (!dev->type->check_state)
-		return 0;
+		return simple_device_type.check_state(dev);
 
 	return dev->type->check_state(dev);
 }
@@ -390,6 +411,26 @@ void device_set_present(struct device *dev, bool state)
 	device_refresh_present(dev);
 }
 
+void device_set_link(struct device *dev, bool state)
+{
+	if (dev->link_active == state)
+		return;
+
+	netifd_log_message(L_NOTICE, "%s '%s' link is %s\n", dev->type->name, dev->ifname, state ? "up" : "down" );
+
+	dev->link_active = state;
+	device_broadcast_event(dev, state ? DEV_EVENT_LINK_UP : DEV_EVENT_LINK_DOWN);
+}
+
+void device_set_ifindex(struct device *dev, int ifindex)
+{
+	if (dev->ifindex == ifindex)
+		return;
+
+	dev->ifindex = ifindex;
+	device_broadcast_event(dev, DEV_EVENT_UPDATE_IFINDEX);
+}
+
 static int device_refcount(struct device *dev)
 {
 	struct list_head *list;
@@ -408,6 +449,9 @@ void device_add_user(struct device_user *dep, struct device *dev)
 {
 	struct safe_list *head;
 
+	if (dep->dev == dev)
+		return;
+
 	if (dep->dev)
 		device_remove_user(dep);
 
@@ -428,6 +472,9 @@ void device_add_user(struct device_user *dep, struct device *dev)
 		dep->cb(dep, DEV_EVENT_ADD);
 		if (dev->active)
 			dep->cb(dep, DEV_EVENT_UP);
+
+		if (dev->link_active)
+			dep->cb(dep, DEV_EVENT_LINK_UP);
 	}
 }
 
@@ -499,9 +546,9 @@ static enum dev_change_type
 device_reload_config(struct device *dev, struct blob_attr *attr)
 {
 	struct blob_attr *tb[__DEV_ATTR_MAX];
-	const struct config_param_list *cfg = dev->type->config_params;
+	const struct uci_blob_param_list *cfg = dev->type->config_params;
 
-	if (config_check_equal(dev->config, attr, cfg))
+	if (uci_blob_check_equal(dev->config, attr, cfg))
 		return DEV_CONFIG_NO_CHANGE;
 
 	if (cfg == &device_attr_list) {
@@ -593,7 +640,7 @@ device_create(const char *name, const struct device_type *type,
 		odev->current_config = true;
 		change = device_set_config(odev, type, config);
 		if (odev->external) {
-			system_if_apply_settings(odev, &odev->settings);
+			system_if_apply_settings(odev, &odev->settings, odev->settings.flags);
 			change = DEV_CONFIG_APPLIED;
 		}
 		switch (change) {
@@ -660,6 +707,8 @@ device_dump_status(struct blob_buf *b, struct device *dev)
 		return;
 
 	blobmsg_add_u8(b, "up", !!dev->active);
+	blobmsg_add_u8(b, "carrier", !!dev->link_active);
+
 	if (dev->type->dump_info)
 		dev->type->dump_info(dev, b);
 	else
@@ -673,6 +722,10 @@ device_dump_status(struct blob_buf *b, struct device *dev)
 			blobmsg_add_string(b, "macaddr", format_macaddr(st.macaddr));
 		if (st.flags & DEV_OPT_TXQUEUELEN)
 			blobmsg_add_u32(b, "txqueuelen", st.txqueuelen);
+		if (st.flags & DEV_OPT_IPV6)
+			blobmsg_add_u8(b, "ipv6", st.ipv6);
+		if (st.flags & DEV_OPT_PROMISC)
+			blobmsg_add_u8(b, "promisc", st.promisc);
 	}
 
 	s = blobmsg_open_table(b, "statistics");