X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=017fe03609e8cb12042aa832498d9d252d92639c;hp=d47bcdf5db88e1cce00e8f2e95ee312408229a6f;hb=0be9a1d0c1db1164a296a70157c01d1e5165d6cc;hpb=5fefb43a4151ee99d4c78ebaf1807043e859021a diff --git a/device.c b/device.c index d47bcdf..017fe03 100644 --- a/device.c +++ b/device.c @@ -1,3 +1,16 @@ +/* + * netifd - network interface daemon + * Copyright (C) 2012 Felix Fietkau + * + * 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 #include #include @@ -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); @@ -214,7 +224,7 @@ device_init_settings(struct device *dev, struct blob_attr **tb) } if ((cur = tb[DEV_ATTR_MACADDR])) { - ea = ether_aton(blob_data(cur)); + ea = ether_aton(blobmsg_data(cur)); if (ea) { memcpy(s->macaddr, ea, 6); s->flags |= DEV_OPT_MACADDR; @@ -230,7 +240,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; @@ -312,7 +322,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); } @@ -335,6 +346,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) @@ -343,9 +357,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); @@ -363,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; @@ -441,30 +455,35 @@ 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) { + 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) { @@ -478,6 +497,8 @@ void device_free(struct device *dev) { __devlock++; + free(dev->config); + device_cleanup(dev); dev->type->free(dev); __devlock--; } @@ -550,7 +571,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; } @@ -630,11 +651,12 @@ device_create(const char *name, const struct device_type *type, odev->current_config = true; change = device_set_config(odev, type, config); 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); } @@ -684,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);