#include "system.h"
#include "config.h"
#include "wireless.h"
+#include "ubus.h"
static struct list_head devtypes = LIST_HEAD_INIT(devtypes);
static struct avl_tree devices;
+static struct blob_buf b;
static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
[DEV_ATTR_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING },
[DEV_ATTR_DROP_UNSOLICITED_NA] = { .name = "drop_unsolicited_na", .type = BLOBMSG_TYPE_BOOL },
[DEV_ATTR_ARP_ACCEPT] = { .name = "arp_accept", .type = BLOBMSG_TYPE_BOOL },
[DEV_ATTR_AUTH] = { .name = "auth", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_AUTH_VLAN] = { .name = "auth_vlan", BLOBMSG_TYPE_ARRAY },
[DEV_ATTR_SPEED] = { .name = "speed", .type = BLOBMSG_TYPE_INT32 },
[DEV_ATTR_DUPLEX] = { .name = "duplex", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_VLAN] = { .name = "vlan", .type = BLOBMSG_TYPE_ARRAY },
+ [DEV_ATTR_PAUSE] = { .name = "pause", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_ASYM_PAUSE] = { .name = "asym_pause", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_RXPAUSE] = { .name = "rxpause", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_TXPAUSE] = { .name = "txpause", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_AUTONEG] = { .name = "autoneg", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_GRO] = { .name = "gro", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_MASTER] = { .name = "conduit", .type = BLOBMSG_TYPE_STRING },
+ [DEV_ATTR_EEE] = { .name = "eee", .type = BLOBMSG_TYPE_BOOL },
};
const struct uci_blob_param_list device_attr_list = {
system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
system_if_up(dev);
+
+ system_if_apply_settings_after_up(dev, &dev->settings);
} else {
system_if_down(dev);
system_if_apply_settings(dev, &dev->orig_settings, dev->orig_settings.flags);
+
+ /* Restore any settings present in UCI which may have
+ * failed to apply so that they will be re-attempted
+ * the next time the device is brought up */
+ dev->settings.flags |= dev->settings.valid_flags;
}
return 0;
n->auth = s->flags & DEV_OPT_AUTH ? s->auth : os->auth;
n->speed = s->flags & DEV_OPT_SPEED ? s->speed : os->speed;
n->duplex = s->flags & DEV_OPT_DUPLEX ? s->duplex : os->duplex;
+ n->pause = s->flags & DEV_OPT_PAUSE ? s->pause : os->pause;
+ n->asym_pause = s->flags & DEV_OPT_ASYM_PAUSE ? s->asym_pause : os->asym_pause;
+ n->rxpause = s->flags & DEV_OPT_RXPAUSE ? s->rxpause : os->rxpause;
+ n->txpause = s->flags & DEV_OPT_TXPAUSE ? s->txpause : os->txpause;
+ n->autoneg = s->flags & DEV_OPT_AUTONEG ? s->autoneg : os->autoneg;
+ n->gro = s->flags & DEV_OPT_GRO ? s->gro : os->gro;
+ n->eee = s->flags & DEV_OPT_EEE ? s->eee : os->eee;
+ n->master_ifindex = s->flags & DEV_OPT_MASTER ? s->master_ifindex : os->master_ifindex;
n->flags = s->flags | os->flags | os->valid_flags;
}
+static bool device_fill_vlan_range(struct device_vlan_range *r, const char *val)
+{
+ unsigned long cur_start, cur_end;
+ char *sep;
+
+ cur_start = strtoul(val, &sep, 0);
+ cur_end = cur_start;
+
+ if (*sep == '-')
+ cur_end = strtoul(sep + 1, &sep, 0);
+ if (*sep || cur_end < cur_start)
+ return false;
+
+ r->start = cur_start;
+ r->end = cur_end;
+
+ return true;
+}
+
+static void
+device_set_extra_vlans(struct device *dev, struct blob_attr *data)
+{
+ struct blob_attr *cur;
+ int n_vlans;
+ size_t rem;
+
+ dev->n_extra_vlan = 0;
+ if (!data)
+ return;
+
+ n_vlans = blobmsg_check_array(data, BLOBMSG_TYPE_STRING);
+ if (n_vlans < 1)
+ return;
+
+ dev->extra_vlan = realloc(dev->extra_vlan, n_vlans * sizeof(*dev->extra_vlan));
+ blobmsg_for_each_attr(cur, data, rem)
+ if (device_fill_vlan_range(&dev->extra_vlan[dev->n_extra_vlan],
+ blobmsg_get_string(cur)))
+ dev->n_extra_vlan++;
+}
+
void
device_init_settings(struct device *dev, struct blob_attr **tb)
{
struct ether_addr *ea;
bool disabled = false;
- s->flags = 0;
+ if (dev->wireless)
+ s->flags &= DEV_OPT_ISOLATE;
+ else
+ s->flags = 0;
if ((cur = tb[DEV_ATTR_ENABLED]))
disabled = !blobmsg_get_bool(cur);
if (system_resolve_rpfilter(blobmsg_data(cur), &s->rpfilter))
s->flags |= DEV_OPT_RPFILTER;
else
- DPRINTF("Failed to resolve rpfilter: %s\n", (char *) blobmsg_data(cur));
+ D(DEVICE, "Failed to resolve rpfilter: %s", (char *) blobmsg_data(cur));
}
if ((cur = tb[DEV_ATTR_ACCEPTLOCAL])) {
if (s->igmpversion >= 1 && s->igmpversion <= 3)
s->flags |= DEV_OPT_IGMPVERSION;
else
- DPRINTF("Failed to resolve igmpversion: %d\n", blobmsg_get_u32(cur));
+ D(DEVICE, "Failed to resolve igmpversion: %d", blobmsg_get_u32(cur));
}
if ((cur = tb[DEV_ATTR_MLDVERSION])) {
if (s->mldversion >= 1 && s->mldversion <= 2)
s->flags |= DEV_OPT_MLDVERSION;
else
- DPRINTF("Failed to resolve mldversion: %d\n", blobmsg_get_u32(cur));
+ D(DEVICE, "Failed to resolve mldversion: %d", blobmsg_get_u32(cur));
}
if ((cur = tb[DEV_ATTR_NEIGHREACHABLETIME])) {
if (s->multicast_router <= 2)
s->flags |= DEV_OPT_MULTICAST_ROUTER;
else
- DPRINTF("Invalid value: %d - (Use 0: never, 1: learn, 2: always)\n", blobmsg_get_u32(cur));
+ D(DEVICE, "Invalid value: %d - (Use 0: never, 1: learn, 2: always)", blobmsg_get_u32(cur));
}
if ((cur = tb[DEV_ATTR_MULTICAST_FAST_LEAVE])) {
s->flags |= DEV_OPT_DUPLEX;
}
+ if ((cur = tb[DEV_ATTR_PAUSE])) {
+ s->pause = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_PAUSE;
+ }
+
+ if ((cur = tb[DEV_ATTR_ASYM_PAUSE])) {
+ s->asym_pause = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_ASYM_PAUSE;
+ }
+
+ if ((cur = tb[DEV_ATTR_RXPAUSE])) {
+ s->rxpause = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_RXPAUSE;
+ }
+
+ if ((cur = tb[DEV_ATTR_TXPAUSE])) {
+ s->txpause = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_TXPAUSE;
+ }
+
+ if ((cur = tb[DEV_ATTR_AUTONEG])) {
+ s->autoneg = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_AUTONEG;
+ }
+
+ if ((cur = tb[DEV_ATTR_GRO])) {
+ s->gro = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_GRO;
+ }
+
+ if ((cur = tb[DEV_ATTR_MASTER])) {
+ char *ifname = blobmsg_get_string(cur);
+ s->master_ifindex = if_nametoindex(ifname);
+ s->flags |= DEV_OPT_MASTER;
+ }
+
+ if ((cur = tb[DEV_ATTR_EEE])) {
+ s->eee = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_EEE;
+ }
+
+ /* Remember the settings present in UCI */
+ s->valid_flags = s->flags;
+
+ cur = tb[DEV_ATTR_AUTH_VLAN];
+ free(dev->config_auth_vlans);
+ dev->config_auth_vlans = cur ? blob_memdup(cur) : NULL;
+
+ device_set_extra_vlans(dev, tb[DEV_ATTR_VLAN]);
device_set_disabled(dev, disabled);
}
void device_broadcast_event(struct device *dev, enum device_event ev)
{
+ static const char * const event_names[] = {
+ [DEV_EVENT_ADD] = "add",
+ [DEV_EVENT_REMOVE] = "remove",
+ [DEV_EVENT_UP] = "up",
+ [DEV_EVENT_DOWN] = "down",
+ [DEV_EVENT_AUTH_UP] = "auth_up",
+ [DEV_EVENT_LINK_UP] = "link_up",
+ [DEV_EVENT_LINK_DOWN] = "link_down",
+ [DEV_EVENT_TOPO_CHANGE] = "topo_change",
+ };
int dev_ev = ev;
safe_list_for_each(&dev->aliases, device_broadcast_cb, &dev_ev);
safe_list_for_each(&dev->users, device_broadcast_cb, &dev_ev);
+
+ if (ev >= ARRAY_SIZE(event_names) || !event_names[ev] || !dev->ifname[0])
+ return;
+
+ blob_buf_init(&b, 0);
+ blobmsg_add_string(&b, "name", dev->ifname);
+ blobmsg_add_u8(&b, "auth_status", dev->auth_status);
+ blobmsg_add_u8(&b, "present", dev->present);
+ blobmsg_add_u8(&b, "active", dev->active);
+ blobmsg_add_u8(&b, "link_active", dev->link_active);
+ netifd_ubus_device_notify(event_names[ev], b.head, -1);
}
static void
{
struct device_settings *s = &dev->settings;
struct ether_addr *ea;
+ const char *master;
+ int ret;
if (!(s->flags & DEV_OPT_MACADDR)) {
ea = config_get_default_macaddr(dev->ifname);
s->flags |= DEV_OPT_DEFAULT_MACADDR;
}
}
+
+ if (!(s->flags & DEV_OPT_GRO)) {
+ ret = config_get_default_gro(dev->ifname);
+ if (ret >= 0) {
+ s->gro = ret;
+ s->flags |= DEV_OPT_GRO;
+ }
+ }
+
+ if (!(s->flags & DEV_OPT_MASTER)) {
+ master = config_get_default_conduit(dev->ifname);
+ if (master) {
+ s->master_ifindex = if_nametoindex(master);
+ s->flags |= DEV_OPT_MASTER;
+ }
+ }
}
int device_claim(struct device_user *dep)
return -1;
dep->claimed = true;
- D(DEVICE, "Claim %s %s, new active count: %d\n", dev->type->name, dev->ifname, dev->active + 1);
+ D(DEVICE, "Claim %s %s, new active count: %d", dev->type->name, dev->ifname, dev->active + 1);
if (++dev->active != 1)
return 0;
if (ret == 0)
device_broadcast_event(dev, DEV_EVENT_UP);
else {
- D(DEVICE, "claim %s %s failed: %d\n", dev->type->name, dev->ifname, ret);
+ D(DEVICE, "claim %s %s failed: %d", dev->type->name, dev->ifname, ret);
dev->active = 0;
dep->claimed = false;
}
dep->claimed = false;
dev->active--;
- D(DEVICE, "Release %s %s, new active count: %d\n", dev->type->name, dev->ifname, dev->active);
+ D(DEVICE, "Release %s %s, new active count: %d", dev->type->name, dev->ifname, dev->active);
assert(dev->active >= 0);
if (dev->active)
assert(dev);
assert(type);
- D(DEVICE, "Initialize device '%s'\n", name ? name : "");
+ D(DEVICE, "Initialize device '%s'", name ? name : "");
INIT_SAFE_LIST(&dev->users);
INIT_SAFE_LIST(&dev->aliases);
dev->type = type;
int ret;
ret = device_set_ifname(dev, name);
- if (ret < 0)
+ if (ret < 0) {
+ netifd_log_message(L_WARNING, "Failed to initalize device '%s'\n", name);
return ret;
+ }
}
if (!dev->set_state)
if (!external && system_if_force_external(name))
return NULL;
- D(DEVICE, "Create simple device '%s'\n", name);
+ D(DEVICE, "Create simple device '%s'", name);
dev = calloc(1, sizeof(*dev));
if (!dev)
return NULL;
if (!dev->avl.key)
return;
- D(DEVICE, "Delete device '%s' from list\n", dev->ifname);
+ D(DEVICE, "Delete device '%s' from list", dev->ifname);
avl_delete(&devices, &dev->avl);
dev->avl.key = NULL;
}
void device_cleanup(struct device *dev)
{
- D(DEVICE, "Clean up device '%s'\n", dev->ifname);
+ D(DEVICE, "Clean up device '%s'", dev->ifname);
safe_list_for_each(&dev->users, device_cleanup_cb, NULL);
safe_list_for_each(&dev->aliases, device_cleanup_cb, NULL);
device_delete(dev);
}
-static void __device_set_present(struct device *dev, bool state)
+static void __device_set_present(struct device *dev, bool state, bool force)
{
- if (dev->present == state)
+ if (dev->present == state && !force)
return;
dev->present = state;
if (dev->disabled || dev->deferred)
state = false;
- __device_set_present(dev, state);
+ __device_set_present(dev, state, false);
}
void
-device_set_auth_status(struct device *dev, bool value)
+device_set_auth_status(struct device *dev, bool value, struct blob_attr *vlans)
{
+ if (!value)
+ vlans = NULL;
+ else if (!blob_attr_equal(vlans, dev->auth_vlans))
+ device_set_auth_status(dev, false, NULL);
+
+ free(dev->auth_vlans);
+ dev->auth_vlans = vlans ? blob_memdup(vlans) : NULL;
+
if (dev->auth_status == value)
return;
if (dev->sys_present == state)
return;
- D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
+ D(DEVICE, "%s '%s' %s present", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
dev->sys_present = state;
- device_refresh_present(dev);
+ if (!state)
+ __device_set_present(dev, state, true);
+ else
+ device_refresh_present(dev);
if (!state)
safe_list_for_each(&dev->users, device_release_cb, NULL);
}
if (!strcmp(dev->ifname, name))
return 0;
- if (strlen(name) > sizeof(dev->ifname) - 1)
+ if (strlen(name) > sizeof(dev->ifname) - 1) {
+ netifd_log_message(L_WARNING, "Cannot set device name: '%s' is longer than max size %zd\n",
+ name, sizeof(dev->ifname) - 1);
return -1;
+ }
if (dev->avl.key)
avl_delete(&devices, &dev->avl);
head = &dev->users;
safe_list_add(&dep->list, head);
- D(DEVICE, "Add user for device '%s', refcount=%d\n", dev->ifname, device_refcount(dev));
+ D(DEVICE, "Add user for device '%s', refcount=%d", dev->ifname, device_refcount(dev));
if (dep->cb && dev->present) {
dep->cb(dep, DEV_EVENT_ADD);
device_free(struct device *dev)
{
__devlock++;
+ free(dev->auth_vlans);
free(dev->config);
device_cleanup(dev);
+ free(dev->config_auth_vlans);
+ free(dev->extra_vlan);
dev->type->free(dev);
__devlock--;
}
safe_list_del(&dep->list);
dep->dev = NULL;
- D(DEVICE, "Remove user for device '%s', refcount=%d\n", dev->ifname, device_refcount(dev));
+ D(DEVICE, "Remove user for device '%s', refcount=%d", dev->ifname, device_refcount(dev));
device_free_unused();
}
switch (change) {
case DEV_CONFIG_RESTART:
case DEV_CONFIG_APPLIED:
- D(DEVICE, "Device '%s': config applied\n", dev->ifname);
+ D(DEVICE, "Device '%s': config applied", dev->ifname);
config = blob_memdup(config);
free(dev->config);
dev->config = config;
}
break;
case DEV_CONFIG_NO_CHANGE:
- D(DEVICE, "Device '%s': no configuration change\n", dev->ifname);
+ D(DEVICE, "Device '%s': no configuration change", dev->ifname);
break;
case DEV_CONFIG_RECREATE:
break;
static void
device_replace(struct device *dev, struct device *odev)
{
- struct device_user *dep, *tmp;
+ struct device_user *dep;
__devlock++;
if (odev->present)
device_set_present(odev, false);
- list_for_each_entry_safe(dep, tmp, &odev->users.list, list.list) {
+ while (!list_empty(&odev->users.list)) {
+ dep = list_first_entry(&odev->users.list, struct device_user, list.list);
device_release(dep);
+ if (!dep->dev)
+ continue;
+
safe_list_del(&dep->list);
__device_add_user(dep, dev);
}
change = device_apply_config(odev, type, config);
switch (change) {
case DEV_CONFIG_RECREATE:
- D(DEVICE, "Device '%s': recreate device\n", odev->ifname);
+ D(DEVICE, "Device '%s': recreate device", odev->ifname);
device_delete(odev);
break;
default:
return odev;
}
} else
- D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
+ D(DEVICE, "Create new device '%s' (%s)", name, type->name);
config = blob_memdup(config);
if (!config)
if (dev->active) {
device_merge_settings(dev, &st);
+ if (st.flags & DEV_OPT_MASTER) {
+ char buf[64], *devname;
+
+ devname = if_indextoname(st.master_ifindex, buf);
+ if (devname)
+ blobmsg_add_string(b, "conduit", devname);
+ }
if (st.flags & DEV_OPT_MTU)
blobmsg_add_u32(b, "mtu", st.mtu);
if (st.flags & DEV_OPT_MTU6)
blobmsg_add_u8(b, "arp_accept", st.arp_accept);
if (st.flags & DEV_OPT_AUTH)
blobmsg_add_u8(b, "auth", st.auth);
+ if (st.flags & DEV_OPT_GRO)
+ blobmsg_add_u8(b, "gro", st.gro);
+ if (st.flags & DEV_OPT_EEE)
+ blobmsg_add_u8(b, "eee", st.eee);
}
s = blobmsg_open_table(b, "statistics");
projects / project / netifd.git / blobdiff