X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=09998f4d529bb8fb17c4ad32432d69a4483a4db0;hp=b5bee117ff0624c64d5e9ecdf80c2c12ee3bbde6;hb=56cecedb261808f5ea700b92b97590f7fa16de9c;hpb=ed92851c92617636d6f891b2e9926559feef9807

diff --git a/device.c b/device.c
index b5bee11..09998f4 100644
--- a/device.c
+++ b/device.c
@@ -24,12 +24,14 @@
 #include <netinet/ether.h>
 #endif
 
+#include <libubox/list.h>
+
 #include "netifd.h"
 #include "system.h"
 #include "config.h"
 
+static struct list_head devtypes = LIST_HEAD_INIT(devtypes);
 static struct avl_tree devices;
-static bool default_ps = true;
 
 static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
 	[DEV_ATTR_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING },
@@ -45,9 +47,17 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
 	[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 },
-	[DEV_ATTR_RPS] = { .name = "rps", .type = BLOBMSG_TYPE_BOOL },
-	[DEV_ATTR_XPS] = { .name = "xps", .type = BLOBMSG_TYPE_BOOL },
+	[DEV_ATTR_NEIGHGCSTALETIME] = { .name = "neighgcstaletime", .type = BLOBMSG_TYPE_INT32 },
 	[DEV_ATTR_DADTRANSMITS] = { .name = "dadtransmits", .type = BLOBMSG_TYPE_INT32 },
+	[DEV_ATTR_MULTICAST_TO_UNICAST] = { .name = "multicast_to_unicast", .type = BLOBMSG_TYPE_BOOL },
+	[DEV_ATTR_MULTICAST_ROUTER] = { .name = "multicast_router", .type = BLOBMSG_TYPE_INT32 },
+	[DEV_ATTR_MULTICAST_FAST_LEAVE] = { .name = "multicast_fast_leave", . type = BLOBMSG_TYPE_BOOL },
+	[DEV_ATTR_MULTICAST] = { .name ="multicast", .type = BLOBMSG_TYPE_BOOL },
+	[DEV_ATTR_LEARNING] = { .name ="learning", .type = BLOBMSG_TYPE_BOOL },
+	[DEV_ATTR_UNICAST_FLOOD] = { .name ="unicast_flood", .type = BLOBMSG_TYPE_BOOL },
+	[DEV_ATTR_SENDREDIRECTS] = { .name = "sendredirects", .type = BLOBMSG_TYPE_BOOL },
+	[DEV_ATTR_NEIGHLOCKTIME] = { .name = "neighlocktime", .type = BLOBMSG_TYPE_INT32 },
+	[DEV_ATTR_ISOLATE] = { .name = "isolate", .type = BLOBMSG_TYPE_BOOL },
 };
 
 const struct uci_blob_param_list device_attr_list = {
@@ -57,6 +67,36 @@ const struct uci_blob_param_list device_attr_list = {
 
 static int __devlock = 0;
 
+int device_type_add(struct device_type *devtype)
+{
+	if (device_type_get(devtype->name)) {
+		netifd_log_message(L_WARNING, "Device handler '%s' already exists\n",
+				   devtype->name);
+		return 1;
+	}
+
+	netifd_log_message(L_NOTICE, "Added device handler type: %s\n",
+		devtype->name);
+
+	list_add(&devtype->list, &devtypes);
+	return 0;
+}
+
+/* Retrieve the device type for the given name. If 'bridge' is true, the type
+ * must have bridge capabilities
+ */
+struct device_type *
+device_type_get(const char *tname)
+{
+	struct device_type *cur;
+
+	list_for_each_entry(cur, &devtypes, list)
+		if (!strcmp(cur->name, tname))
+			return cur;
+
+	return NULL;
+}
+
 void device_lock(void)
 {
 	__devlock++;
@@ -72,18 +112,14 @@ void device_unlock(void)
 static int set_device_state(struct device *dev, bool state)
 {
 	if (state) {
-		/* Set ifindex for all devices being enabled so a valid  */
+		/* Get ifindex for all devices being enabled so a valid  */
 		/* ifindex is in place avoiding possible race conditions */
 		device_set_ifindex(dev, system_if_resolve(dev));
 		if (!dev->ifindex)
 			return -1;
-	}
-
-	if (dev->external)
-		return 0;
 
-	if (state)
 		system_if_up(dev);
+	}
 	else
 		system_if_down(dev);
 
@@ -116,11 +152,15 @@ simple_device_set_state(struct device *dev, bool state)
 }
 
 static struct device *
-simple_device_create(const char *name, struct blob_attr *attr)
+simple_device_create(const char *name, struct device_type *devtype,
+		     struct blob_attr *attr)
 {
 	struct blob_attr *tb[__DEV_ATTR_MAX];
 	struct device *dev = NULL;
 
+	/* device type is unused for simple devices */
+	devtype = NULL;
+
 	blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb, blob_data(attr), blob_len(attr));
 	dev = device_get(name, true);
 	if (!dev)
@@ -139,7 +179,7 @@ static void simple_device_free(struct device *dev)
 	free(dev);
 }
 
-const struct device_type simple_device_type = {
+struct device_type simple_device_type = {
 	.name = "Network device",
 	.config_params = &device_attr_list,
 
@@ -148,7 +188,7 @@ const struct device_type simple_device_type = {
 	.free = simple_device_free,
 };
 
-static void
+void
 device_merge_settings(struct device *dev, struct device_settings *n)
 {
 	struct device_settings *os = &dev->orig_settings;
@@ -172,9 +212,24 @@ device_merge_settings(struct device *dev, struct device_settings *n)
 		s->neigh4reachabletime : os->neigh4reachabletime;
 	n->neigh6reachabletime = s->flags & DEV_OPT_NEIGHREACHABLETIME ?
 		s->neigh6reachabletime : os->neigh6reachabletime;
+	n->neigh4gcstaletime = s->flags & DEV_OPT_NEIGHGCSTALETIME ?
+		s->neigh4gcstaletime : os->neigh4gcstaletime;
+	n->neigh6gcstaletime = s->flags & DEV_OPT_NEIGHGCSTALETIME ?
+		s->neigh6gcstaletime : os->neigh6gcstaletime;
+	n->neigh4locktime = s->flags & DEV_OPT_NEIGHLOCKTIME ?
+		s->neigh4locktime : os->neigh4locktime;
 	n->dadtransmits = s->flags & DEV_OPT_DADTRANSMITS ?
 		s->dadtransmits : os->dadtransmits;
-	n->flags = s->flags | os->flags;
+	n->multicast = s->flags & DEV_OPT_MULTICAST ?
+		s->multicast : os->multicast;
+	n->multicast_to_unicast = s->multicast_to_unicast;
+	n->multicast_router = s->multicast_router;
+	n->multicast_fast_leave = s->multicast_fast_leave;
+	n->learning = s->learning;
+	n->unicast_flood = s->unicast_flood;
+	n->sendredirects = s->flags & DEV_OPT_SENDREDIRECTS ?
+		s->sendredirects : os->sendredirects;
+	n->flags = s->flags | os->flags | os->valid_flags;
 }
 
 void
@@ -189,12 +244,12 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
 	if ((cur = tb[DEV_ATTR_ENABLED]))
 		disabled = !blobmsg_get_bool(cur);
 
-	if ((cur = tb[DEV_ATTR_MTU])) {
+	if ((cur = tb[DEV_ATTR_MTU]) && blobmsg_get_u32(cur) >= 68) {
 		s->mtu = blobmsg_get_u32(cur);
 		s->flags |= DEV_OPT_MTU;
 	}
 
-	if ((cur = tb[DEV_ATTR_MTU6])) {
+	if ((cur = tb[DEV_ATTR_MTU6]) && blobmsg_get_u32(cur) >= 1280) {
 		s->mtu6 = blobmsg_get_u32(cur);
 		s->flags |= DEV_OPT_MTU6;
 	}
@@ -255,25 +310,64 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
 		s->flags |= DEV_OPT_NEIGHREACHABLETIME;
 	}
 
-	if ((cur = tb[DEV_ATTR_RPS])) {
-		s->rps = blobmsg_get_bool(cur);
-		s->flags |= DEV_OPT_RPS;
+	if ((cur = tb[DEV_ATTR_NEIGHGCSTALETIME])) {
+		s->neigh6gcstaletime = s->neigh4gcstaletime = blobmsg_get_u32(cur);
+		s->flags |= DEV_OPT_NEIGHGCSTALETIME;
 	}
-	else
-		s->rps = default_ps;
 
-	if ((cur = tb[DEV_ATTR_XPS])) {
-		s->xps = blobmsg_get_bool(cur);
-		s->flags |= DEV_OPT_XPS;
+	if ((cur = tb[DEV_ATTR_NEIGHLOCKTIME])) {
+		s->neigh4locktime = blobmsg_get_u32(cur);
+		s->flags |= DEV_OPT_NEIGHLOCKTIME;
 	}
-	else
-		s->xps = default_ps;
 
 	if ((cur = tb[DEV_ATTR_DADTRANSMITS])) {
 		s->dadtransmits = blobmsg_get_u32(cur);
 		s->flags |= DEV_OPT_DADTRANSMITS;
 	}
 
+	if ((cur = tb[DEV_ATTR_MULTICAST_TO_UNICAST])) {
+		s->multicast_to_unicast = blobmsg_get_bool(cur);
+		s->flags |= DEV_OPT_MULTICAST_TO_UNICAST;
+	}
+
+	if ((cur = tb[DEV_ATTR_MULTICAST_ROUTER])) {
+		s->multicast_router = blobmsg_get_u32(cur);
+		if (s->multicast_router <= 2)
+			s->flags |= DEV_OPT_MULTICAST_ROUTER;
+		else
+			DPRINTF("Invalid value: %d - (Use 0: never, 1: learn, 2: always)\n", blobmsg_get_u32(cur));
+	}
+
+	if ((cur = tb[DEV_ATTR_MULTICAST_FAST_LEAVE])) {
+		s->multicast_fast_leave = blobmsg_get_bool(cur);
+		s->flags |= DEV_OPT_MULTICAST_FAST_LEAVE;
+	}
+
+	if ((cur = tb[DEV_ATTR_MULTICAST])) {
+		s->multicast = blobmsg_get_bool(cur);
+		s->flags |= DEV_OPT_MULTICAST;
+	}
+
+	if ((cur = tb[DEV_ATTR_LEARNING])) {
+		s->learning = blobmsg_get_bool(cur);
+		s->flags |= DEV_OPT_LEARNING;
+	}
+
+	if ((cur = tb[DEV_ATTR_UNICAST_FLOOD])) {
+		s->unicast_flood = blobmsg_get_bool(cur);
+		s->flags |= DEV_OPT_UNICAST_FLOOD;
+	}
+
+	if ((cur = tb[DEV_ATTR_SENDREDIRECTS])) {
+		s->sendredirects = blobmsg_get_bool(cur);
+		s->flags |= DEV_OPT_SENDREDIRECTS;
+	}
+
+	if ((cur = tb[DEV_ATTR_ISOLATE])) {
+		s->isolate = blobmsg_get_bool(cur);
+		s->flags |= DEV_OPT_ISOLATE;
+	}
+
 	device_set_disabled(dev, disabled);
 }
 
@@ -307,18 +401,31 @@ void device_broadcast_event(struct device *dev, enum device_event ev)
 int device_claim(struct device_user *dep)
 {
 	struct device *dev = dep->dev;
-	int ret;
+	int ret = 0;
 
 	if (dep->claimed)
 		return 0;
 
+	if (!dev)
+		return -1;
+
 	dep->claimed = true;
 	D(DEVICE, "Claim %s %s, new active count: %d\n", dev->type->name, dev->ifname, dev->active + 1);
 	if (++dev->active != 1)
 		return 0;
 
 	device_broadcast_event(dev, DEV_EVENT_SETUP);
-	ret = dev->set_state(dev, true);
+	if (dev->external) {
+		/* Get ifindex for external claimed devices so a valid   */
+		/* ifindex is in place avoiding possible race conditions */
+		device_set_ifindex(dev, system_if_resolve(dev));
+		if (!dev->ifindex)
+			ret = -1;
+
+		system_if_get_settings(dev, &dev->orig_settings);
+	} else
+		ret = dev->set_state(dev, true);
+
 	if (ret == 0)
 		device_broadcast_event(dev, DEV_EVENT_UP);
 	else {
@@ -348,6 +455,10 @@ void device_release(struct device_user *dep)
 	device_broadcast_event(dev, DEV_EVENT_TEARDOWN);
 	if (!dev->external)
 		dev->set_state(dev, false);
+
+	if (dev->active)
+		return;
+
 	device_broadcast_event(dev, DEV_EVENT_DOWN);
 }
 
@@ -359,24 +470,24 @@ int device_check_state(struct device *dev)
 	return dev->type->check_state(dev);
 }
 
-void device_init_virtual(struct device *dev, const struct device_type *type, const char *name)
+void device_init_virtual(struct device *dev, struct device_type *type, const char *name)
 {
 	assert(dev);
 	assert(type);
 
-	if (name)
-		strncpy(dev->ifname, name, IFNAMSIZ);
-
-	D(DEVICE, "Initialize device '%s'\n", dev->ifname);
+	D(DEVICE, "Initialize device '%s'\n", name ? name : "");
 	INIT_SAFE_LIST(&dev->users);
 	INIT_SAFE_LIST(&dev->aliases);
 	dev->type = type;
 
+	if (name)
+		device_set_ifname(dev, name);
+
 	if (!dev->set_state)
 		dev->set_state = set_device_state;
 }
 
-int device_init(struct device *dev, const struct device_type *type, const char *ifname)
+int device_init(struct device *dev, struct device_type *type, const char *ifname)
 {
 	int ret;
 
@@ -390,8 +501,6 @@ int device_init(struct device *dev, const struct device_type *type, const char *
 
 	system_if_clear_state(dev);
 	device_check_state(dev);
-	dev->settings.rps = default_ps;
-	dev->settings.xps = default_ps;
 
 	return 0;
 }
@@ -406,6 +515,9 @@ device_create_default(const char *name, bool external)
 
 	D(DEVICE, "Create simple device '%s'\n", name);
 	dev = calloc(1, sizeof(*dev));
+	if (!dev)
+		return NULL;
+
 	dev->external = external;
 	dev->set_state = simple_device_set_state;
 	device_init(dev, &simple_device_type, name);
@@ -416,6 +528,14 @@ device_create_default(const char *name, bool external)
 }
 
 struct device *
+device_find(const char *name)
+{
+	struct device *dev;
+
+	return avl_find_element(&devices, name, dev, avl);
+}
+
+struct device *
 device_get(const char *name, int create)
 {
 	struct device *dev;
@@ -429,6 +549,7 @@ device_get(const char *name, int create)
 	dev = avl_find_element(&devices, name, dev, avl);
 	if (dev) {
 		if (create > 1 && !dev->external) {
+			system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
 			dev->external = true;
 			device_set_present(dev, true);
 		}
@@ -520,6 +641,27 @@ void device_set_ifindex(struct device *dev, int ifindex)
 	device_broadcast_event(dev, DEV_EVENT_UPDATE_IFINDEX);
 }
 
+int device_set_ifname(struct device *dev, const char *name)
+{
+	int ret = 0;
+
+	if (!strcmp(dev->ifname, name))
+		return 0;
+
+	if (dev->avl.key)
+		avl_delete(&devices, &dev->avl);
+
+	strncpy(dev->ifname, name, IFNAMSIZ);
+
+	if (dev->avl.key)
+		ret = avl_insert(&devices, &dev->avl);
+
+	if (ret == 0)
+		device_broadcast_event(dev, DEV_EVENT_UPDATE_IFNAME);
+
+	return ret;
+}
+
 static int device_refcount(struct device *dev)
 {
 	struct list_head *list;
@@ -534,19 +676,11 @@ static int device_refcount(struct device *dev)
 	return count;
 }
 
-void device_add_user(struct device_user *dep, struct device *dev)
+static 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);
-
-	if (!dev)
-		return;
-
 	dep->dev = dev;
 
 	if (dep->alias)
@@ -567,6 +701,20 @@ void device_add_user(struct device_user *dep, struct device *dev)
 	}
 }
 
+void device_add_user(struct device_user *dep, struct device *dev)
+{
+	if (dep->dev == dev)
+		return;
+
+	if (dep->dev)
+		device_remove_user(dep);
+
+	if (!dev)
+		return;
+
+	__device_add_user(dep, dev);
+}
+
 void
 device_free(struct device *dev)
 {
@@ -632,7 +780,7 @@ device_init_pending(void)
 }
 
 static enum dev_change_type
-device_set_config(struct device *dev, const struct device_type *type,
+device_set_config(struct device *dev, struct device_type *type,
 		  struct blob_attr *attr)
 {
 	struct blob_attr *tb[__DEV_ATTR_MAX];
@@ -661,7 +809,7 @@ device_set_config(struct device *dev, const struct device_type *type,
 }
 
 enum dev_change_type
-device_apply_config(struct device *dev, const struct device_type *type,
+device_apply_config(struct device *dev, struct device_type *type,
 		    struct blob_attr *config)
 {
 	enum dev_change_type change;
@@ -680,12 +828,16 @@ device_apply_config(struct device *dev, const struct device_type *type,
 			free(dev->config);
 			dev->config = config;
 			if (change == DEV_CONFIG_RESTART && dev->present) {
+				int ret = 0;
+
 				device_set_present(dev, false);
 				if (dev->active && !dev->external) {
-					dev->set_state(dev, false);
-					dev->set_state(dev, true);
+					ret = dev->set_state(dev, false);
+					if (!ret)
+						ret = dev->set_state(dev, true);
 				}
-				device_set_present(dev, true);
+				if (!ret)
+					device_set_present(dev, true);
 			}
 			break;
 		case DEV_CONFIG_NO_CHANGE:
@@ -702,21 +854,19 @@ static void
 device_replace(struct device *dev, struct device *odev)
 {
 	struct device_user *dep, *tmp;
-	bool present = odev->present;
 
-	if (present)
+	__devlock++;
+	if (odev->present)
 		device_set_present(odev, false);
 
 	list_for_each_entry_safe(dep, tmp, &odev->users.list, list.list) {
 		device_release(dep);
 		safe_list_del(&dep->list);
-		safe_list_add(&dep->list, &dev->users);
-		dep->dev = dev;
+		__device_add_user(dep, dev);
 	}
-	device_free(odev);
+	__devlock--;
 
-	if (present)
-		device_set_present(dev, true);
+	device_free(odev);
 }
 
 void
@@ -741,53 +891,21 @@ device_reset_old(void)
 			continue;
 
 		ndev = device_create_default(dev->ifname, dev->external);
-		device_replace(ndev, dev);
-	}
-}
-
-void
-device_set_default_ps(bool state)
-{
-	struct device *dev;
-
-	if (state == default_ps)
-		return;
-
-	default_ps = state;
-
-	avl_for_each_element(&devices, dev, avl) {
-		struct device_settings *s = &dev->settings;
-		unsigned int apply_mask = 0;
-
-		if (!(s->flags & DEV_OPT_RPS)) {
-			s->rps = default_ps;
-			apply_mask |= DEV_OPT_RPS;
-		}
-
-		if (!(s->flags & DEV_OPT_XPS)) {
-			s->xps = default_ps;
-			apply_mask |= DEV_OPT_XPS;
-		}
-
-		if (!apply_mask)
-			continue;
-
-		if (!(dev->external || (dev->present && dev->active)) ||
-				dev->config_pending)
+		if (!ndev)
 			continue;
 
-		system_if_apply_settings(dev, s, apply_mask);
+		device_replace(ndev, dev);
 	}
 }
 
 struct device *
-device_create(const char *name, const struct device_type *type,
+device_create(const char *name, struct device_type *type,
 	      struct blob_attr *config)
 {
 	struct device *odev = NULL, *dev;
 	enum dev_change_type change;
 
-	odev = device_get(name, false);
+	odev = device_find(name);
 	if (odev) {
 		odev->current_config = true;
 		change = device_apply_config(odev, type, config);
@@ -806,7 +924,7 @@ device_create(const char *name, const struct device_type *type,
 	if (!config)
 		return NULL;
 
-	dev = type->create(name, config);
+	dev = type->create(name, type, config);
 	if (!dev)
 		return NULL;
 
@@ -882,8 +1000,28 @@ device_dump_status(struct blob_buf *b, struct device *dev)
 			blobmsg_add_u32(b, "neigh4reachabletime", st.neigh4reachabletime);
 			blobmsg_add_u32(b, "neigh6reachabletime", st.neigh6reachabletime);
 		}
+		if (st.flags & DEV_OPT_NEIGHGCSTALETIME) {
+			blobmsg_add_u32(b, "neigh4gcstaletime", st.neigh4gcstaletime);
+			blobmsg_add_u32(b, "neigh6gcstaletime", st.neigh6gcstaletime);
+		}
+		if (st.flags & DEV_OPT_NEIGHLOCKTIME)
+			blobmsg_add_u32(b, "neigh4locktime", st.neigh4locktime);
 		if (st.flags & DEV_OPT_DADTRANSMITS)
 			blobmsg_add_u32(b, "dadtransmits", st.dadtransmits);
+		if (st.flags & DEV_OPT_MULTICAST_TO_UNICAST)
+			blobmsg_add_u8(b, "multicast_to_unicast", st.multicast_to_unicast);
+		if (st.flags & DEV_OPT_MULTICAST_ROUTER)
+			blobmsg_add_u32(b, "multicast_router", st.multicast_router);
+		if (st.flags & DEV_OPT_MULTICAST_FAST_LEAVE)
+			blobmsg_add_u8(b, "multicast_fast_leave", st.multicast_fast_leave);
+		if (st.flags & DEV_OPT_MULTICAST)
+			blobmsg_add_u8(b, "multicast", st.multicast);
+		if (st.flags & DEV_OPT_LEARNING)
+			blobmsg_add_u8(b, "learning", st.learning);
+		if (st.flags & DEV_OPT_UNICAST_FLOOD)
+			blobmsg_add_u8(b, "unicast_flood", st.unicast_flood);
+		if (st.flags & DEV_OPT_SENDREDIRECTS)
+			blobmsg_add_u8(b, "sendredirects", st.sendredirects);
 	}
 
 	s = blobmsg_open_table(b, "statistics");
@@ -893,3 +1031,8 @@ device_dump_status(struct blob_buf *b, struct device *dev)
 		system_if_dump_stats(dev, b);
 	blobmsg_close_table(b, s);
 }
+
+static void __init simple_device_type_init(void)
+{
+	device_type_add(&simple_device_type);
+}