+/*
+ * 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>
{
if (dev->parent.dev)
device_remove_user(&dev->parent);
- device_cleanup(dev);
free(dev);
}
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);
{
struct alias_device *alias;
- device_cleanup(dev);
-
alias = container_of(dev, struct alias_device, dev);
avl_delete(&aliases, &alias->avl);
free(alias);
}
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;
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;
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();
}
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);
}
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)
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);
{
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;
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)
{
+ 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) {
device_free(struct device *dev)
{
__devlock++;
+ free(dev->config);
+ device_cleanup(dev);
dev->type->free(dev);
__devlock--;
}
blob_data(attr), blob_len(attr));
device_init_settings(dev, tb);
- return DEV_CONFIG_APPLIED;
+ return DEV_CONFIG_RESTART;
} else
return DEV_CONFIG_RECREATE;
}
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);
}
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);