[DEV_ATTR_MTU] = { "mtu", BLOBMSG_TYPE_INT32 },
[DEV_ATTR_MACADDR] = { "macaddr", BLOBMSG_TYPE_STRING },
[DEV_ATTR_TXQUEUELEN] = { "txqueuelen", BLOBMSG_TYPE_INT32 },
+ [DEV_ATTR_ENABLED] = { "enabled", BLOBMSG_TYPE_BOOL },
};
const struct config_param_list device_attr_list = {
.params = dev_attrs,
};
+static int __devlock = 0;
+
+void device_lock(void)
+{
+ __devlock++;
+}
+
+void device_unlock(void)
+{
+ __devlock--;
+ if (!__devlock)
+ device_free_unused(NULL);
+}
+
+static int set_device_state(struct device *dev, bool state)
+{
+ if (state)
+ system_if_up(dev);
+ else
+ system_if_down(dev);
+
+ return 0;
+}
+
+static int
+simple_device_set_state(struct device *dev, bool state)
+{
+ struct device *pdev;
+ int ret = 0;
+
+ pdev = dev->parent.dev;
+ if (state && !pdev) {
+ pdev = system_if_get_parent(dev);
+ if (pdev)
+ device_add_user(&dev->parent, pdev);
+ }
+
+ if (pdev) {
+ if (state)
+ ret = device_claim(&dev->parent);
+ else
+ device_release(&dev->parent);
+
+ if (ret < 0)
+ return ret;
+ }
+ return set_device_state(dev, state);
+}
+
static struct device *
simple_device_create(const char *name, struct blob_attr *attr)
{
if (!dev)
return NULL;
+ dev->set_state = simple_device_set_state;
device_init_settings(dev, tb);
return dev;
static void simple_device_free(struct device *dev)
{
- device_cleanup(dev);
+ if (dev->parent.dev)
+ device_remove_user(&dev->parent);
free(dev);
}
{
struct alias_device *alias;
- device_cleanup(dev);
-
alias = container_of(dev, struct alias_device, dev);
avl_delete(&aliases, &alias->avl);
free(alias);
.free = alias_device_free,
};
+static void
+device_merge_settings(struct device *dev, struct device_settings *n)
+{
+ struct device_settings *os = &dev->orig_settings;
+ struct device_settings *s = &dev->settings;
+
+ memset(n, 0, sizeof(*n));
+ n->mtu = s->flags & DEV_OPT_MTU ? s->mtu : os->mtu;
+ n->txqueuelen = s->flags & DEV_OPT_TXQUEUELEN ?
+ s->txqueuelen : os->txqueuelen;
+ memcpy(n->macaddr,
+ (s->flags & DEV_OPT_MACADDR ? s->macaddr : os->macaddr),
+ sizeof(n->macaddr));
+ n->flags = s->flags | os->flags;
+}
+
void
device_init_settings(struct device *dev, struct blob_attr **tb)
{
+ struct device_settings *s = &dev->settings;
struct blob_attr *cur;
struct ether_addr *ea;
+ bool disabled = false;
- dev->flags = 0;
+ s->flags = 0;
+ if ((cur = tb[DEV_ATTR_ENABLED]))
+ disabled = !blobmsg_get_bool(cur);
if ((cur = tb[DEV_ATTR_MTU])) {
- dev->mtu = blobmsg_get_u32(cur);
- dev->flags |= DEV_OPT_MTU;
+ s->mtu = blobmsg_get_u32(cur);
+ s->flags |= DEV_OPT_MTU;
}
if ((cur = tb[DEV_ATTR_TXQUEUELEN])) {
- dev->txqueuelen = blobmsg_get_u32(cur);
- dev->flags |= DEV_OPT_TXQUEUELEN;
+ s->txqueuelen = blobmsg_get_u32(cur);
+ s->flags |= DEV_OPT_TXQUEUELEN;
}
if ((cur = tb[DEV_ATTR_MACADDR])) {
- ea = ether_aton(blob_data(cur));
+ ea = ether_aton(blobmsg_data(cur));
if (ea) {
- memcpy(dev->macaddr, ea, sizeof(dev->macaddr));
- dev->flags |= DEV_OPT_MACADDR;
+ memcpy(s->macaddr, ea, 6);
+ s->flags |= DEV_OPT_MACADDR;
}
}
+
+ device_set_disabled(dev, disabled);
}
static void __init dev_init(void)
{
struct alias_device *alias;
+ device_lock();
+
alias = avl_find_element(&aliases, name, alias, avl);
if (!alias)
return;
alias->cleanup = !dev;
if (dev) {
if (dev != alias->dep.dev) {
- if (alias->dep.dev)
- device_remove_user(&alias->dep);
+ device_remove_user(&alias->dep);
strcpy(alias->dev.ifname, dev->ifname);
device_add_user(&alias->dep, dev);
}
if (!dev && alias->dep.dev && !alias->dep.dev->active)
device_remove_user(&alias->dep);
-}
-static int set_device_state(struct device *dev, bool state)
-{
- if (state)
- system_if_up(dev);
- else
- system_if_down(dev);
-
- return 0;
+ device_unlock();
}
int device_claim(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);
}
}
static struct device *
-device_create_default(const char *name)
+device_create_default(const char *name, bool external)
{
struct device *dev;
D(DEVICE, "Create simple device '%s'\n", name);
dev = calloc(1, sizeof(*dev));
+ dev->external = external;
+ dev->set_state = simple_device_set_state;
device_init(dev, &simple_device_type, name);
dev->default_config = true;
return dev;
}
struct device *
-device_get(const char *name, bool create)
+device_get(const char *name, int create)
{
struct device *dev;
if (!create)
return NULL;
- return device_create_default(name);
+ return device_create_default(name, create > 1);
}
static void
device_delete(dev);
}
-void device_set_present(struct device *dev, bool state)
+static void __device_set_present(struct device *dev, bool state)
{
if (dev->present == state)
return;
- D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
dev->present = state;
device_broadcast_event(dev, state ? DEV_EVENT_ADD : DEV_EVENT_REMOVE);
}
+void device_set_present(struct device *dev, bool state)
+{
+ 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" );
+
+ if (state && dev->disabled)
+ return;
+
+ __device_set_present(dev, state);
+}
+
+void
+device_set_disabled(struct device *dev, bool value)
+{
+ dev->disabled = value;
+ if (dev->sys_present)
+ __device_set_present(dev, !value);
+}
+
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) {
}
}
+void
+device_free(struct device *dev)
+{
+ __devlock++;
+ free(dev->config);
+ device_cleanup(dev);
+ dev->type->free(dev);
+ __devlock--;
+}
+
static void
__device_free_unused(struct device *dev)
{
- if (!list_empty(&dev->users) || dev->current_config || config_init)
+ if (!list_empty(&dev->users) || dev->current_config || __devlock)
return;
device_free(dev);
{
struct device *dev = dep->dev;
+ if (!dep->dev)
+ return;
+
+ dep->hotplug = false;
if (dep->claimed)
device_release(dep);
blob_data(attr), blob_len(attr));
device_init_settings(dev, tb);
- return DEV_CONFIG_APPLIED;
+ return DEV_CONFIG_RESTART;
} else
return DEV_CONFIG_RECREATE;
}
if (dev->type != &simple_device_type)
continue;
- ndev = device_create_default(dev->ifname);
+ ndev = device_create_default(dev->ifname, dev->external);
device_replace(ndev, dev);
}
}
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);
}
void
device_dump_status(struct blob_buf *b, struct device *dev)
{
+ struct device_settings st;
void *c, *s;
if (!dev) {
blobmsg_add_u8(b, "up", !!dev->active);
if (dev->type->dump_info)
dev->type->dump_info(dev, b);
+ else
+ system_if_dump_info(dev, b);
+
+ if (dev->active) {
+ device_merge_settings(dev, &st);
+ if (st.flags & DEV_OPT_MTU)
+ blobmsg_add_u32(b, "mtu", st.mtu);
+ if (st.flags & DEV_OPT_MACADDR)
+ blobmsg_add_string(b, "macaddr", ether_ntoa((struct ether_addr *) st.macaddr));
+ if (st.flags & DEV_OPT_TXQUEUELEN)
+ blobmsg_add_u32(b, "txqueuelen", st.txqueuelen);
+ }
s = blobmsg_open_table(b, "statistics");
if (dev->type->dump_stats)
projects / project / netifd.git / blobdiff