+/*
+ * 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);
}
{
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;
s->flags = 0;
- dev->disabled = false;
-
if ((cur = tb[DEV_ATTR_ENABLED]))
- device_set_disabled(dev, !blobmsg_get_bool(cur));
+ disabled = !blobmsg_get_bool(cur);
if ((cur = tb[DEV_ATTR_MTU])) {
s->mtu = blobmsg_get_u32(cur);
}
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;
}
}
+
+ device_set_disabled(dev, disabled);
}
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;
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);
}
{
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;
-
- 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) {
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);
}
void
device_dump_status(struct blob_buf *b, struct device *dev)
{
+ struct device_settings st;
void *c, *s;
if (!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);
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)
dev->type->dump_stats(dev, b);
projects / project / netifd.git / blobdiff