X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=device.c;h=a2d563778e8d533c058771f6064bb3a9f324a8ae;hb=b0ef5945af9d68a435868546b4bf30020a6e6ab8;hp=1d842cf8e085fcd28081823aaa70c06cd6ae4e93;hpb=85c3eb9af8b3d0283f07719a455d503fee7892ae;p=project%2Fnetifd.git

diff --git a/device.c b/device.c
index 1d842cf..a2d5637 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>
@@ -112,7 +125,6 @@ static void simple_device_free(struct device *dev)
 {
 	if (dev->parent.dev)
 		device_remove_user(&dev->parent);
-	device_cleanup(dev);
 	free(dev);
 }
 
@@ -162,8 +174,6 @@ static void alias_device_free(struct device *dev)
 {
 	struct alias_device *alias;
 
-	device_cleanup(dev);
-
 	alias = container_of(dev, struct alias_device, dev);
 	avl_delete(&aliases, &alias->avl);
 	free(alias);
@@ -364,6 +374,9 @@ 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;
@@ -442,26 +455,25 @@ static void __device_set_present(struct device *dev, bool state)
 	device_broadcast_event(dev, state ? DEV_EVENT_ADD : DEV_EVENT_REMOVE);
 }
 
-void device_set_present(struct device *dev, bool state)
+void
+device_refresh_present(struct device *dev)
 {
-	if (dev->sys_present == state)
-		return;
+	bool state = dev->sys_present;
 
-	dev->sys_present = state;
-	D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
-
-	if (state && dev->disabled)
-		return;
+	if (dev->disabled || dev->deferred)
+		state = false;
 
 	__device_set_present(dev, state);
 }
 
-void
-device_set_disabled(struct device *dev, bool value)
+void device_set_present(struct device *dev, bool state)
 {
-	dev->disabled = value;
-	if (dev->sys_present)
-		__device_set_present(dev, !value);
+	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);
 }
 
 void device_add_user(struct device_user *dep, struct device *dev)
@@ -469,6 +481,9 @@ void device_add_user(struct device_user *dep, struct device *dev)
 	if (dep->dev)
 		device_remove_user(dep);
 
+	if (!dev)
+		return;
+
 	dep->dev = dev;
 	list_add_tail(&dep->list, &dev->users);
 	if (dep->cb && dev->present) {
@@ -482,6 +497,8 @@ void
 device_free(struct device *dev)
 {
 	__devlock++;
+	free(dev->config);
+	device_cleanup(dev);
 	dev->type->free(dev);
 	__devlock--;
 }
@@ -689,10 +706,13 @@ 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);