X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=97fb27f1c8883e22b428c8b11d7dd8e8b7baf464;hp=0a33f67f3de1b4eafb4c760883a157e495dbae63;hb=fabdd4fc5c7354e897f91e96e734f584776736c7;hpb=d16871c7a55370174eb672edee24feade74cd37e

diff --git a/device.c b/device.c
index 0a33f67..97fb27f 100644
--- a/device.c
+++ b/device.c
@@ -1,3 +1,16 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -16,17 +29,6 @@
 #include "config.h"
 
 static struct avl_tree devices;
-static struct avl_tree aliases;
-
-struct alias_device {
-	struct avl_node avl;
-	struct device dev;
-	struct device_user dep;
-	bool cleanup;
-	char name[];
-};
-
-static const struct device_type alias_device_type;
 
 static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
 	[DEV_ATTR_TYPE] = { "type", BLOBMSG_TYPE_STRING },
@@ -34,6 +36,7 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
 	[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 },
 };
 
 const struct config_param_list device_attr_list = {
@@ -55,6 +58,41 @@ void device_unlock(void)
 		device_free_unused(NULL);
 }
 
+static int set_device_state(struct device *dev, bool state)
+{
+	if (state)
+		system_if_up(dev);
+	else
+		system_if_down(dev);
+
+	return 0;
+}
+
+static int
+simple_device_set_state(struct device *dev, bool state)
+{
+	struct device *pdev;
+	int ret = 0;
+
+	pdev = dev->parent.dev;
+	if (state && !pdev) {
+		pdev = system_if_get_parent(dev);
+		if (pdev)
+			device_add_user(&dev->parent, pdev);
+	}
+
+	if (pdev) {
+		if (state)
+			ret = device_claim(&dev->parent);
+		else
+			device_release(&dev->parent);
+
+		if (ret < 0)
+			return ret;
+	}
+	return set_device_state(dev, state);
+}
+
 static struct device *
 simple_device_create(const char *name, struct blob_attr *attr)
 {
@@ -66,6 +104,7 @@ simple_device_create(const char *name, struct blob_attr *attr)
 	if (!dev)
 		return NULL;
 
+	dev->set_state = simple_device_set_state;
 	device_init_settings(dev, tb);
 
 	return dev;
@@ -73,7 +112,8 @@ simple_device_create(const char *name, struct blob_attr *attr)
 
 static void simple_device_free(struct device *dev)
 {
-	device_cleanup(dev);
+	if (dev->parent.dev)
+		device_remove_user(&dev->parent);
 	free(dev);
 }
 
@@ -86,94 +126,66 @@ const struct device_type simple_device_type = {
 	.free = simple_device_free,
 };
 
-static int
-alias_device_set_state(struct device *dev, bool state)
-{
-	struct alias_device *alias;
-
-	alias = container_of(dev, struct alias_device, dev);
-	if (!alias->dep.dev)
-		return -1;
-
-	if (state)
-		return device_claim(&alias->dep);
-
-	device_release(&alias->dep);
-	if (alias->cleanup)
-		device_remove_user(&alias->dep);
-	return 0;
-}
-
-static struct device *
-alias_device_create(const char *name, struct blob_attr *attr)
-{
-	struct alias_device *alias;
-
-	alias = calloc(1, sizeof(*alias) + strlen(name) + 1);
-	strcpy(alias->name, name);
-	alias->dev.set_state = alias_device_set_state;
-	device_init_virtual(&alias->dev, &alias_device_type, NULL);
-	alias->avl.key = alias->name;
-	avl_insert(&aliases, &alias->avl);
-
-	return &alias->dev;
-}
-
-static void alias_device_free(struct device *dev)
+static void
+device_merge_settings(struct device *dev, struct device_settings *n)
 {
-	struct alias_device *alias;
-
-	device_cleanup(dev);
+	struct device_settings *os = &dev->orig_settings;
+	struct device_settings *s = &dev->settings;
 
-	alias = container_of(dev, struct alias_device, dev);
-	avl_delete(&aliases, &alias->avl);
-	free(alias);
+	memset(n, 0, sizeof(*n));
+	n->mtu = s->flags & DEV_OPT_MTU ? s->mtu : os->mtu;
+	n->txqueuelen = s->flags & DEV_OPT_TXQUEUELEN ?
+		s->txqueuelen : os->txqueuelen;
+	memcpy(n->macaddr,
+		(s->flags & DEV_OPT_MACADDR ? s->macaddr : os->macaddr),
+		sizeof(n->macaddr));
+	n->flags = s->flags | os->flags;
 }
 
-static const struct device_type alias_device_type = {
-	.name = "Network alias",
-	.create = alias_device_create,
-	.free = alias_device_free,
-};
-
 void
 device_init_settings(struct device *dev, struct blob_attr **tb)
 {
+	struct device_settings *s = &dev->settings;
 	struct blob_attr *cur;
 	struct ether_addr *ea;
+	bool disabled = false;
 
-	dev->flags = 0;
+	s->flags = 0;
+	if ((cur = tb[DEV_ATTR_ENABLED]))
+		disabled = !blobmsg_get_bool(cur);
 
 	if ((cur = tb[DEV_ATTR_MTU])) {
-		dev->mtu = blobmsg_get_u32(cur);
-		dev->flags |= DEV_OPT_MTU;
+		s->mtu = blobmsg_get_u32(cur);
+		s->flags |= DEV_OPT_MTU;
 	}
 
 	if ((cur = tb[DEV_ATTR_TXQUEUELEN])) {
-		dev->txqueuelen = blobmsg_get_u32(cur);
-		dev->flags |= DEV_OPT_TXQUEUELEN;
+		s->txqueuelen = blobmsg_get_u32(cur);
+		s->flags |= DEV_OPT_TXQUEUELEN;
 	}
 
 	if ((cur = tb[DEV_ATTR_MACADDR])) {
-		ea = ether_aton(blob_data(cur));
+		ea = ether_aton(blobmsg_data(cur));
 		if (ea) {
-			memcpy(dev->macaddr, ea, sizeof(dev->macaddr));
-			dev->flags |= DEV_OPT_MACADDR;
+			memcpy(s->macaddr, ea, 6);
+			s->flags |= DEV_OPT_MACADDR;
 		}
 	}
+
+	device_set_disabled(dev, disabled);
 }
 
 static void __init dev_init(void)
 {
 	avl_init(&devices, avl_strcmp, true, NULL);
-	avl_init(&aliases, avl_strcmp, false, NULL);
 }
 
-static void device_broadcast_event(struct device *dev, enum device_event ev)
+
+static void __device_broadcast_event(struct list_head *head, enum device_event ev)
 {
 	struct device_user *dep, *tmp;
 
-	list_for_each_entry_safe(dep, tmp, &dev->users, list) {
+	list_for_each_entry_safe(dep, tmp, head, list) {
 		if (!dep->cb)
 			continue;
 
@@ -181,42 +193,10 @@ static void device_broadcast_event(struct device *dev, enum device_event ev)
 	}
 }
 
-void
-alias_notify_device(const char *name, struct device *dev)
+void device_broadcast_event(struct device *dev, enum device_event ev)
 {
-	struct alias_device *alias;
-
-	device_lock();
-
-	alias = avl_find_element(&aliases, name, alias, avl);
-	if (!alias)
-		return;
-
-	alias->cleanup = !dev;
-	if (dev) {
-		if (dev != alias->dep.dev) {
-			device_remove_user(&alias->dep);
-			strcpy(alias->dev.ifname, dev->ifname);
-			device_add_user(&alias->dep, dev);
-		}
-	}
-
-	device_set_present(&alias->dev, !!dev);
-
-	if (!dev && alias->dep.dev && !alias->dep.dev->active)
-		device_remove_user(&alias->dep);
-
-	device_unlock();
-}
-
-static int set_device_state(struct device *dev, bool state)
-{
-	if (state)
-		system_if_up(dev);
-	else
-		system_if_down(dev);
-
-	return 0;
+	__device_broadcast_event(&dev->aliases, ev);
+	__device_broadcast_event(&dev->users, ev);
 }
 
 int device_claim(struct device_user *dep)
@@ -261,7 +241,8 @@ void device_release(struct device_user *dep)
 		return;
 
 	device_broadcast_event(dev, DEV_EVENT_TEARDOWN);
-	dev->set_state(dev, false);
+	if (!dep->hotplug)
+		dev->set_state(dev, false);
 	device_broadcast_event(dev, DEV_EVENT_DOWN);
 }
 
@@ -283,7 +264,11 @@ void device_init_virtual(struct device *dev, const struct device_type *type, con
 
 	D(DEVICE, "Initialize device '%s'\n", dev->ifname);
 	INIT_LIST_HEAD(&dev->users);
+	INIT_LIST_HEAD(&dev->aliases);
 	dev->type = type;
+
+	if (!dev->set_state)
+		dev->set_state = set_device_state;
 }
 
 int device_init(struct device *dev, const struct device_type *type, const char *ifname)
@@ -292,9 +277,6 @@ int device_init(struct device *dev, const struct device_type *type, const char *
 
 	device_init_virtual(dev, type, ifname);
 
-	if (!dev->set_state)
-		dev->set_state = set_device_state;
-
 	dev->avl.key = dev->ifname;
 
 	ret = avl_insert(&devices, &dev->avl);
@@ -308,31 +290,24 @@ int device_init(struct device *dev, const struct device_type *type, const char *
 }
 
 static struct device *
-device_create_default(const char *name)
+device_create_default(const char *name, bool external)
 {
 	struct device *dev;
 
+	if (!external && system_if_force_external(name))
+		return NULL;
+
 	D(DEVICE, "Create simple device '%s'\n", name);
 	dev = calloc(1, sizeof(*dev));
+	dev->external = external;
+	dev->set_state = simple_device_set_state;
 	device_init(dev, &simple_device_type, name);
 	dev->default_config = true;
 	return dev;
 }
 
-static struct device *
-device_alias_get(const char *name)
-{
-	struct alias_device *alias;
-
-	alias = avl_find_element(&aliases, name, alias, avl);
-	if (alias)
-		return &alias->dev;
-
-	return alias_device_create(name, NULL);
-}
-
 struct device *
-device_get(const char *name, bool create)
+device_get(const char *name, int create)
 {
 	struct device *dev;
 
@@ -343,13 +318,18 @@ device_get(const char *name, bool create)
 		return device_alias_get(name + 1);
 
 	dev = avl_find_element(&devices, name, dev, avl);
-	if (dev)
+	if (dev) {
+		if (create > 1 && !dev->external) {
+			dev->external = true;
+			device_set_present(dev, true);
+		}
 		return dev;
+	}
 
 	if (!create)
 		return NULL;
 
-	return device_create_default(name);
+	return device_create_default(name, create > 1);
 }
 
 static void
@@ -379,20 +359,66 @@ void device_cleanup(struct device *dev)
 	device_delete(dev);
 }
 
-void device_set_present(struct device *dev, bool state)
+static void __device_set_present(struct device *dev, bool state)
 {
 	if (dev->present == state)
 		return;
 
-	D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
 	dev->present = state;
 	device_broadcast_event(dev, state ? DEV_EVENT_ADD : DEV_EVENT_REMOVE);
 }
 
+void
+device_refresh_present(struct device *dev)
+{
+	bool state = dev->sys_present;
+
+	if (dev->disabled || dev->deferred)
+		state = false;
+
+	__device_set_present(dev, state);
+}
+
+void device_set_present(struct device *dev, bool state)
+{
+	if (dev->sys_present == state)
+		return;
+
+	D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
+	dev->sys_present = state;
+	device_refresh_present(dev);
+}
+
+static int device_refcount(struct device *dev)
+{
+	struct list_head *list;
+	int count = 0;
+
+	list_for_each(list, &dev->users)
+		count++;
+
+	return count;
+}
+
 void device_add_user(struct device_user *dep, struct device *dev)
 {
+	struct list_head *head;
+
+	if (dep->dev)
+		device_remove_user(dep);
+
+	if (!dev)
+		return;
+
 	dep->dev = dev;
-	list_add_tail(&dep->list, &dev->users);
+
+	if (dep->alias)
+		head = &dev->aliases;
+	else
+		head = &dev->users;
+	list_add_tail(&dep->list, head);
+	D(DEVICE, "Add user for device '%s', refcount=%d\n", dev->ifname, device_refcount(dev));
+
 	if (dep->cb && dev->present) {
 		dep->cb(dep, DEV_EVENT_ADD);
 		if (dev->active)
@@ -400,10 +426,20 @@ void device_add_user(struct device_user *dep, struct device *dev)
 	}
 }
 
+void
+device_free(struct device *dev)
+{
+	__devlock++;
+	free(dev->config);
+	device_cleanup(dev);
+	dev->type->free(dev);
+	__devlock--;
+}
+
 static void
 __device_free_unused(struct device *dev)
 {
-	if (!list_empty(&dev->users) || dev->current_config || config_init)
+	if (!list_empty(&dev->users) || dev->current_config || __devlock)
 		return;
 
 	device_free(dev);
@@ -422,6 +458,7 @@ void device_remove_user(struct device_user *dep)
 
 	list_del(&dep->list);
 	dep->dev = NULL;
+	D(DEVICE, "Remove user for device '%s', refcount=%d\n", dev->ifname, device_refcount(dev));
 	__device_free_unused(dev);
 }
 
@@ -468,7 +505,7 @@ device_reload_config(struct device *dev, struct blob_attr *attr)
 				blob_data(attr), blob_len(attr));
 
 		device_init_settings(dev, tb);
-		return DEV_CONFIG_APPLIED;
+		return DEV_CONFIG_RESTART;
 	} else
 		return DEV_CONFIG_RECREATE;
 }
@@ -527,7 +564,7 @@ device_reset_old(void)
 		if (dev->type != &simple_device_type)
 			continue;
 
-		ndev = device_create_default(dev->ifname);
+		ndev = device_create_default(dev->ifname, dev->external);
 		device_replace(ndev, dev);
 	}
 }
@@ -547,12 +584,17 @@ device_create(const char *name, const struct device_type *type,
 	if (odev) {
 		odev->current_config = true;
 		change = device_set_config(odev, type, config);
+		if (odev->external) {
+			system_if_apply_settings(odev, &odev->settings);
+			change = DEV_CONFIG_APPLIED;
+		}
 		switch (change) {
+		case DEV_CONFIG_RESTART:
 		case DEV_CONFIG_APPLIED:
 			D(DEVICE, "Device '%s': config applied\n", odev->ifname);
 			free(odev->config);
 			odev->config = config;
-			if (odev->present) {
+			if (change == DEV_CONFIG_RESTART && odev->present) {
 				device_set_present(odev, false);
 				device_set_present(odev, true);
 			}
@@ -587,6 +629,7 @@ device_create(const char *name, const struct device_type *type,
 void
 device_dump_status(struct blob_buf *b, struct device *dev)
 {
+	struct device_settings st;
 	void *c, *s;
 
 	if (!dev) {
@@ -601,13 +644,28 @@ device_dump_status(struct blob_buf *b, struct device *dev)
 		return;
 	}
 
+	blobmsg_add_u8(b, "external", dev->external);
+	blobmsg_add_u8(b, "present", dev->present);
+	blobmsg_add_string(b, "type", dev->type->name);
+
 	if (!dev->present)
 		return;
 
-	blobmsg_add_string(b, "type", dev->type->name);
 	blobmsg_add_u8(b, "up", !!dev->active);
 	if (dev->type->dump_info)
 		dev->type->dump_info(dev, b);
+	else
+		system_if_dump_info(dev, b);
+
+	if (dev->active) {
+		device_merge_settings(dev, &st);
+		if (st.flags & DEV_OPT_MTU)
+			blobmsg_add_u32(b, "mtu", st.mtu);
+		if (st.flags & DEV_OPT_MACADDR)
+			blobmsg_add_string(b, "macaddr", format_macaddr(st.macaddr));
+		if (st.flags & DEV_OPT_TXQUEUELEN)
+			blobmsg_add_u32(b, "txqueuelen", st.txqueuelen);
+	}
 
 	s = blobmsg_open_table(b, "statistics");
 	if (dev->type->dump_stats)