fix ifname for alias+vlan chains

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 1d842cf..cc41b20 100644 (file)
--- 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);
 }
 
@@ -151,6 +163,7 @@ alias_device_create(const char *name, struct blob_attr *attr)
        alias = calloc(1, sizeof(*alias) + strlen(name) + 1);
        strcpy(alias->name, name);
        alias->dev.set_state = alias_device_set_state;
+       alias->dev.hidden = true;
        device_init_virtual(&alias->dev, &alias_device_type, NULL);
        alias->avl.key = alias->name;
        avl_insert(&aliases, &alias->avl);
@@ -162,8 +175,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);
@@ -230,7 +241,7 @@ static void __init dev_init(void)
        avl_init(&aliases, avl_strcmp, false, NULL);
 }
 
-static void device_broadcast_event(struct device *dev, enum device_event ev)
+void device_broadcast_event(struct device *dev, enum device_event ev)
 {
        struct device_user *dep, *tmp;
 
@@ -259,13 +270,19 @@ alias_notify_device(const char *name, struct device *dev)
                        device_remove_user(&alias->dep);
                        strcpy(alias->dev.ifname, dev->ifname);
                        device_add_user(&alias->dep, dev);
+                       alias->dev.hidden = false;
+                       device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
                }
        }
 
        device_set_present(&alias->dev, !!dev);
 
-       if (!dev && alias->dep.dev && !alias->dep.dev->active)
+       if (!dev && alias->dep.dev && !alias->dep.dev->active) {
                device_remove_user(&alias->dep);
+               alias->dev.hidden = true;
+               alias->dev.ifname[0] = 0;
+               device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
+       }
 
        device_unlock();
 }
@@ -336,6 +353,9 @@ 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);
        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)
@@ -344,9 +364,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);
@@ -364,6 +381,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 +462,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;
-
-       dev->sys_present = state;
-       D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
+       bool state = dev->sys_present;
 
-       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 +488,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 +504,8 @@ void
 device_free(struct device *dev)
 {
        __devlock++;
+       free(dev->config);
+       device_cleanup(dev);
        dev->type->free(dev);
        __devlock--;
 }
@@ -689,10 +713,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);