X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=23befa3c565be6606d4388cbabebf70caf4621e3;hp=0019b6c2481185b5b34c5bc02d90410204565f55;hb=6d5ca67a135a552a4232bc21705d33a567d00acc;hpb=07a47add60b567f65dd2051fe45ac49e1ae97524

diff --git a/device.c b/device.c
index 0019b6c..23befa3 100644
--- a/device.c
+++ b/device.c
@@ -7,6 +7,10 @@
 #include <sys/socket.h>
 #include <net/ethernet.h>
 
+#ifdef linux
+#include <netinet/ether.h>
+#endif
+
 #include "netifd.h"
 #include "system.h"
 #include "config.h"
@@ -120,11 +124,16 @@ static int set_device_state(struct device *dev, bool state)
 	return 0;
 }
 
-int device_claim(struct device *dev)
+int device_claim(struct device_user *dep)
 {
+	struct device *dev = dep->dev;
 	int ret;
 
-	DPRINTF("claim device %s, new refcount: %d\n", dev->ifname, dev->active + 1);
+	if (dep->claimed)
+		return 0;
+
+	dep->claimed = true;
+	D(DEVICE, "claim device %s, new refcount: %d\n", dev->ifname, dev->active + 1);
 	if (++dev->active != 1)
 		return 0;
 
@@ -138,10 +147,16 @@ int device_claim(struct device *dev)
 	return ret;
 }
 
-void device_release(struct device *dev)
+void device_release(struct device_user *dep)
 {
+	struct device *dev = dep->dev;
+
+	if (!dep->claimed)
+		return;
+
+	dep->claimed = false;
 	dev->active--;
-	DPRINTF("release device %s, new refcount: %d\n", dev->ifname, dev->active);
+	D(DEVICE, "release device %s, new refcount: %d\n", dev->ifname, dev->active);
 	assert(dev->active >= 0);
 
 	if (dev->active)
@@ -168,7 +183,7 @@ void device_init_virtual(struct device *dev, const struct device_type *type, con
 	if (name)
 		strncpy(dev->ifname, name, IFNAMSIZ);
 
-	fprintf(stderr, "Initialize device '%s'\n", dev->ifname);
+	D(DEVICE, "Initialize device '%s'\n", dev->ifname);
 	INIT_LIST_HEAD(&dev->users);
 	dev->type = type;
 }
@@ -217,7 +232,7 @@ void device_cleanup(struct device *dev)
 {
 	struct device_user *dep, *tmp;
 
-	fprintf(stderr, "Clean up device '%s'\n", dev->ifname);
+	D(DEVICE, "Clean up device '%s'\n", dev->ifname);
 	list_for_each_entry_safe(dep, tmp, &dev->users, list) {
 		if (!dep->cb)
 			continue;
@@ -234,7 +249,7 @@ void device_set_present(struct device *dev, bool state)
 	if (dev->present == state)
 		return;
 
-	DPRINTF("Device '%s' %s present\n", dev->ifname, state ? "is now" : "is no longer" );
+	D(DEVICE, "Device '%s' %s present\n", dev->ifname, state ? "is now" : "is no longer" );
 	dev->present = state;
 	device_broadcast_event(dev, state ? DEV_EVENT_ADD : DEV_EVENT_REMOVE);
 }
@@ -250,29 +265,117 @@ void device_add_user(struct device_user *dep, struct device *dev)
 	}
 }
 
+static void
+__device_free_unused(struct device *dev)
+{
+	if (!list_empty(&dev->users))
+		return;
+
+	device_free(dev);
+}
+
 void device_remove_user(struct device_user *dep)
 {
 	struct device *dev = dep->dev;
 
-	list_del(&dep->list);
-
-	if (list_empty(&dev->users)) {
-		/* all references have gone away, remove this device */
-		device_free(dev);
-	}
+	if (dep->claimed)
+		device_release(dep);
 
+	list_del(&dep->list);
 	dep->dev = NULL;
+	__device_free_unused(dev);
 }
 
 void
-device_free_all(void)
+device_free_unused(struct device *dev)
 {
-	struct device *dev, *tmp;
+	struct device *tmp;
 
-	avl_for_each_element_safe(&devices, dev, avl, tmp) {
-		if (!list_empty(&dev->users))
-			continue;
+	if (dev)
+		return __device_free_unused(dev);
+
+	avl_for_each_element_safe(&devices, dev, avl, tmp)
+		__device_free_unused(dev);
+}
+
+enum dev_change_type
+device_reload_config(struct device *dev, struct blob_attr *attr)
+{
+	struct blob_attr *tb[__DEV_ATTR_MAX], *tb1[__DEV_ATTR_MAX];
 
-		device_free(dev);
+	blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb,
+		blob_data(attr), blob_len(attr));
+	if (dev->config)
+		blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb1,
+			blob_data(dev->config), blob_len(dev->config));
+	else
+		memset(tb1, 0, sizeof(tb1));
+
+	if (!config_diff(tb, tb1, &device_attr_list, NULL))
+		return DEV_CONFIG_NO_CHANGE;
+
+	device_init_settings(dev, tb);
+	return DEV_CONFIG_APPLIED;
+}
+
+static enum dev_change_type
+device_check_config(struct device *dev, struct blob_attr *attr)
+{
+	if (dev->type->reload)
+		return dev->type->reload(dev, attr);
+
+	return device_reload_config(dev, attr);
+}
+
+static void
+device_replace(struct device *dev, struct device *odev)
+{
+	struct device_user *dep, *tmp;
+	bool present = odev->present;
+
+	if (present)
+		device_set_present(odev, false);
+
+	list_for_each_entry_safe(dep, tmp, &odev->users, list) {
+		list_move_tail(&dep->list, &dev->users);
+		dep->dev = dev;
 	}
+	device_free(odev);
+
+	if (present)
+		device_set_present(dev, true);
+}
+
+struct device *
+device_create(const char *name, const struct device_type *type,
+	      struct blob_attr *config)
+{
+	struct device *odev = NULL, *dev;
+	enum dev_change_type change;
+
+	odev = device_get(name, false);
+	if (odev) {
+		change = device_check_config(odev, config);
+		switch (change) {
+		case DEV_CONFIG_APPLIED:
+			free(odev->config);
+			odev->config = config_memdup(config);
+			if (odev->present) {
+				device_set_present(odev, false);
+				device_set_present(odev, true);
+			}
+			/* fall through */
+		case DEV_CONFIG_NO_CHANGE:
+			return odev;
+		case DEV_CONFIG_RECREATE:
+			break;
+		}
+	}
+
+	dev = type->create(config);
+	dev->config = config_memdup(config);
+	if (odev)
+		device_replace(dev, odev);
+
+	return dev;
 }