#include "config.h"
static struct avl_tree devices;
+static bool default_ps = true;
static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
[DEV_ATTR_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING },
- [DEV_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_ARRAY },
[DEV_ATTR_MTU] = { .name = "mtu", .type = BLOBMSG_TYPE_INT32 },
+ [DEV_ATTR_MTU6] = { .name = "mtu6", .type = BLOBMSG_TYPE_INT32 },
[DEV_ATTR_MACADDR] = { .name = "macaddr", .type = BLOBMSG_TYPE_STRING },
[DEV_ATTR_TXQUEUELEN] = { .name = "txqueuelen", .type = BLOBMSG_TYPE_INT32 },
[DEV_ATTR_ENABLED] = { .name = "enabled", .type = BLOBMSG_TYPE_BOOL },
[DEV_ATTR_RPFILTER] = { .name = "rpfilter", .type = BLOBMSG_TYPE_STRING },
[DEV_ATTR_ACCEPTLOCAL] = { .name = "acceptlocal", .type = BLOBMSG_TYPE_BOOL },
[DEV_ATTR_IGMPVERSION] = { .name = "igmpversion", .type = BLOBMSG_TYPE_INT32 },
+ [DEV_ATTR_MLDVERSION] = { .name = "mldversion", .type = BLOBMSG_TYPE_INT32 },
+ [DEV_ATTR_NEIGHREACHABLETIME] = { .name = "neighreachabletime", .type = BLOBMSG_TYPE_INT32 },
+ [DEV_ATTR_RPS] = { .name = "rps", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_XPS] = { .name = "xps", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_DADTRANSMITS] = { .name = "dadtransmits", .type = BLOBMSG_TYPE_INT32 },
+ [DEV_ATTR_MULTICAST_TO_UNICAST] = { .name = "multicast_to_unicast", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_MULTICAST_ROUTER] = { .name = "multicast_router", .type = BLOBMSG_TYPE_INT32 },
};
const struct uci_blob_param_list device_attr_list = {
static int set_device_state(struct device *dev, bool state)
{
if (state) {
- /* Set ifindex for all devices being enabled so a valid */
+ /* Get ifindex for all devices being enabled so a valid */
/* ifindex is in place avoiding possible race conditions */
device_set_ifindex(dev, system_if_resolve(dev));
if (!dev->ifindex)
return -1;
- }
-
- if (dev->external)
- return 0;
- if (state)
system_if_up(dev);
+ }
else
system_if_down(dev);
memset(n, 0, sizeof(*n));
n->mtu = s->flags & DEV_OPT_MTU ? s->mtu : os->mtu;
+ n->mtu6 = s->flags & DEV_OPT_MTU6 ? s->mtu6 : os->mtu6;
n->txqueuelen = s->flags & DEV_OPT_TXQUEUELEN ?
s->txqueuelen : os->txqueuelen;
memcpy(n->macaddr,
n->rpfilter = s->flags & DEV_OPT_RPFILTER ? s->rpfilter : os->rpfilter;
n->acceptlocal = s->flags & DEV_OPT_ACCEPTLOCAL ? s->acceptlocal : os->acceptlocal;
n->igmpversion = s->flags & DEV_OPT_IGMPVERSION ? s->igmpversion : os->igmpversion;
- n->flags = s->flags | os->flags;
+ n->mldversion = s->flags & DEV_OPT_MLDVERSION ? s->mldversion : os->mldversion;
+ n->neigh4reachabletime = s->flags & DEV_OPT_NEIGHREACHABLETIME ?
+ s->neigh4reachabletime : os->neigh4reachabletime;
+ n->neigh6reachabletime = s->flags & DEV_OPT_NEIGHREACHABLETIME ?
+ s->neigh6reachabletime : os->neigh6reachabletime;
+ n->dadtransmits = s->flags & DEV_OPT_DADTRANSMITS ?
+ s->dadtransmits : os->dadtransmits;
+ n->multicast_to_unicast = s->multicast_to_unicast;
+ n->multicast_router = s->multicast_router;
+ n->flags = s->flags | os->flags | os->valid_flags;
}
void
s->flags |= DEV_OPT_MTU;
}
+ if ((cur = tb[DEV_ATTR_MTU6])) {
+ s->mtu6 = blobmsg_get_u32(cur);
+ s->flags |= DEV_OPT_MTU6;
+ }
+
if ((cur = tb[DEV_ATTR_TXQUEUELEN])) {
s->txqueuelen = blobmsg_get_u32(cur);
s->flags |= DEV_OPT_TXQUEUELEN;
}
if ((cur = tb[DEV_ATTR_IGMPVERSION])) {
- if (system_resolve_igmpversion(blobmsg_get_u32(cur), &s->igmpversion))
+ s->igmpversion = blobmsg_get_u32(cur);
+ if (s->igmpversion >= 1 && s->igmpversion <= 3)
s->flags |= DEV_OPT_IGMPVERSION;
else
DPRINTF("Failed to resolve igmpversion: %d\n", blobmsg_get_u32(cur));
}
+ if ((cur = tb[DEV_ATTR_MLDVERSION])) {
+ s->mldversion = blobmsg_get_u32(cur);
+ if (s->mldversion >= 1 && s->mldversion <= 2)
+ s->flags |= DEV_OPT_MLDVERSION;
+ else
+ DPRINTF("Failed to resolve mldversion: %d\n", blobmsg_get_u32(cur));
+ }
+
+ if ((cur = tb[DEV_ATTR_NEIGHREACHABLETIME])) {
+ s->neigh6reachabletime = s->neigh4reachabletime = blobmsg_get_u32(cur);
+ s->flags |= DEV_OPT_NEIGHREACHABLETIME;
+ }
+
+ if ((cur = tb[DEV_ATTR_RPS])) {
+ s->rps = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_RPS;
+ }
+ else
+ s->rps = default_ps;
+
+ if ((cur = tb[DEV_ATTR_XPS])) {
+ s->xps = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_XPS;
+ }
+ else
+ s->xps = default_ps;
+
+ if ((cur = tb[DEV_ATTR_DADTRANSMITS])) {
+ s->dadtransmits = blobmsg_get_u32(cur);
+ s->flags |= DEV_OPT_DADTRANSMITS;
+ }
+
+ if ((cur = tb[DEV_ATTR_MULTICAST_TO_UNICAST])) {
+ s->multicast_to_unicast = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_MULTICAST_TO_UNICAST;
+ }
+
+ if ((cur = tb[DEV_ATTR_MULTICAST_ROUTER])) {
+ s->multicast_router = blobmsg_get_u32(cur);
+ 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));
+ }
+
device_set_disabled(dev, disabled);
}
int device_claim(struct device_user *dep)
{
struct device *dev = dep->dev;
- int ret;
+ int ret = 0;
if (dep->claimed)
return 0;
return 0;
device_broadcast_event(dev, DEV_EVENT_SETUP);
- ret = dev->set_state(dev, true);
+ if (dev->external) {
+ /* Get ifindex for external claimed devices so a valid */
+ /* ifindex is in place avoiding possible race conditions */
+ device_set_ifindex(dev, system_if_resolve(dev));
+ if (!dev->ifindex)
+ ret = -1;
+ } else
+ ret = dev->set_state(dev, true);
+
if (ret == 0)
device_broadcast_event(dev, DEV_EVENT_UP);
else {
system_if_clear_state(dev);
device_check_state(dev);
+ dev->settings.rps = default_ps;
+ dev->settings.xps = default_ps;
return 0;
}
dev->set_state = simple_device_set_state;
device_init(dev, &simple_device_type, name);
dev->default_config = true;
+ if (external)
+ system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
return dev;
}
dev = avl_find_element(&devices, name, dev, avl);
if (dev) {
if (create > 1 && !dev->external) {
+ system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
dev->external = true;
device_set_present(dev, true);
}
return count;
}
-void device_add_user(struct device_user *dep, struct device *dev)
+static void
+__device_add_user(struct device_user *dep, struct device *dev)
{
struct safe_list *head;
- if (dep->dev == dev)
- return;
-
- if (dep->dev)
- device_remove_user(dep);
-
- if (!dev)
- return;
-
dep->dev = dev;
if (dep->alias)
}
}
+void device_add_user(struct device_user *dep, struct device *dev)
+{
+ if (dep->dev == dev)
+ return;
+
+ if (dep->dev)
+ device_remove_user(dep);
+
+ if (!dev)
+ return;
+
+ __device_add_user(dep, dev);
+}
+
void
device_free(struct device *dev)
{
}
static enum dev_change_type
-device_reload_config(struct device *dev, struct blob_attr *attr)
+device_set_config(struct device *dev, const struct device_type *type,
+ struct blob_attr *attr)
{
struct blob_attr *tb[__DEV_ATTR_MAX];
- const struct uci_blob_param_list *cfg = dev->type->config_params;
+ const struct uci_blob_param_list *cfg = type->config_params;
+
+ if (type != dev->type)
+ return DEV_CONFIG_RECREATE;
+
+ if (dev->type->reload)
+ return dev->type->reload(dev, attr);
if (uci_blob_check_equal(dev->config, attr, cfg))
return DEV_CONFIG_NO_CHANGE;
}
enum dev_change_type
-device_set_config(struct device *dev, const struct device_type *type,
- struct blob_attr *attr)
+device_apply_config(struct device *dev, const struct device_type *type,
+ struct blob_attr *config)
{
- if (type != dev->type)
- return DEV_CONFIG_RECREATE;
+ enum dev_change_type change;
- if (dev->type->reload)
- return dev->type->reload(dev, attr);
+ change = device_set_config(dev, type, config);
+ if (dev->external) {
+ system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
+ change = DEV_CONFIG_APPLIED;
+ }
- return device_reload_config(dev, attr);
+ switch (change) {
+ case DEV_CONFIG_RESTART:
+ case DEV_CONFIG_APPLIED:
+ D(DEVICE, "Device '%s': config applied\n", dev->ifname);
+ config = blob_memdup(config);
+ free(dev->config);
+ dev->config = config;
+ if (change == DEV_CONFIG_RESTART && dev->present) {
+ device_set_present(dev, false);
+ if (dev->active && !dev->external) {
+ dev->set_state(dev, false);
+ dev->set_state(dev, true);
+ }
+ device_set_present(dev, true);
+ }
+ break;
+ case DEV_CONFIG_NO_CHANGE:
+ D(DEVICE, "Device '%s': no configuration change\n", dev->ifname);
+ break;
+ case DEV_CONFIG_RECREATE:
+ break;
+ }
+
+ return change;
}
static void
device_replace(struct device *dev, struct device *odev)
{
struct device_user *dep, *tmp;
- bool present = odev->present;
- if (present)
+ __devlock++;
+ if (odev->present)
device_set_present(odev, false);
list_for_each_entry_safe(dep, tmp, &odev->users.list, list.list) {
device_release(dep);
safe_list_del(&dep->list);
- safe_list_add(&dep->list, &dev->users);
- dep->dev = dev;
+ __device_add_user(dep, dev);
}
- device_free(odev);
+ __devlock--;
- if (present)
- device_set_present(dev, true);
+ device_free(odev);
}
void
continue;
ndev = device_create_default(dev->ifname, dev->external);
+ if (!ndev)
+ continue;
+
device_replace(ndev, dev);
}
}
+void
+device_set_default_ps(bool state)
+{
+ struct device *dev;
+
+ if (state == default_ps)
+ return;
+
+ default_ps = state;
+
+ avl_for_each_element(&devices, dev, avl) {
+ struct device_settings *s = &dev->settings;
+ unsigned int apply_mask = 0;
+
+ if (!(s->flags & DEV_OPT_RPS)) {
+ s->rps = default_ps;
+ apply_mask |= DEV_OPT_RPS;
+ }
+
+ if (!(s->flags & DEV_OPT_XPS)) {
+ s->xps = default_ps;
+ apply_mask |= DEV_OPT_XPS;
+ }
+
+ if (!apply_mask)
+ continue;
+
+ if (!(dev->external || (dev->present && dev->active)) ||
+ dev->config_pending)
+ continue;
+
+ system_if_apply_settings(dev, s, apply_mask);
+ }
+}
+
struct device *
device_create(const char *name, const struct device_type *type,
struct blob_attr *config)
struct device *odev = NULL, *dev;
enum dev_change_type change;
- config = blob_memdup(config);
- if (!config)
- return NULL;
-
odev = device_get(name, false);
if (odev) {
odev->current_config = true;
- change = device_set_config(odev, type, config);
- if (odev->external) {
- system_if_apply_settings(odev, &odev->settings, odev->settings.flags);
- change = DEV_CONFIG_APPLIED;
- }
+ change = device_apply_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 (change == DEV_CONFIG_RESTART && odev->present) {
- device_set_present(odev, false);
- device_set_present(odev, true);
- }
- return odev;
- case DEV_CONFIG_NO_CHANGE:
- D(DEVICE, "Device '%s': no configuration change\n", odev->ifname);
- free(config);
- return odev;
case DEV_CONFIG_RECREATE:
D(DEVICE, "Device '%s': recreate device\n", odev->ifname);
device_delete(odev);
break;
+ default:
+ return odev;
}
} else
D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
+ config = blob_memdup(config);
+ if (!config)
+ return NULL;
+
dev = type->create(name, config);
if (!dev)
return NULL;
if (odev)
device_replace(dev, odev);
- if (!config_init && dev->config_pending)
+ if (!config_init && dev->config_pending) {
type->config_init(dev);
+ dev->config_pending = false;
+ }
return dev;
}
device_merge_settings(dev, &st);
if (st.flags & DEV_OPT_MTU)
blobmsg_add_u32(b, "mtu", st.mtu);
+ if (st.flags & DEV_OPT_MTU6)
+ blobmsg_add_u32(b, "mtu6", st.mtu6);
if (st.flags & DEV_OPT_MACADDR)
blobmsg_add_string(b, "macaddr", format_macaddr(st.macaddr));
if (st.flags & DEV_OPT_TXQUEUELEN)
blobmsg_add_u8(b, "acceptlocal", st.acceptlocal);
if (st.flags & DEV_OPT_IGMPVERSION)
blobmsg_add_u32(b, "igmpversion", st.igmpversion);
+ if (st.flags & DEV_OPT_MLDVERSION)
+ blobmsg_add_u32(b, "mldversion", st.mldversion);
+ if (st.flags & DEV_OPT_NEIGHREACHABLETIME) {
+ blobmsg_add_u32(b, "neigh4reachabletime", st.neigh4reachabletime);
+ blobmsg_add_u32(b, "neigh6reachabletime", st.neigh6reachabletime);
+ }
+ if (st.flags & DEV_OPT_DADTRANSMITS)
+ blobmsg_add_u32(b, "dadtransmits", st.dadtransmits);
+ if (st.flags & DEV_OPT_MULTICAST_TO_UNICAST)
+ blobmsg_add_u8(b, "multicast_to_unicast", st.multicast_to_unicast);
+ if (st.flags & DEV_OPT_MULTICAST_ROUTER)
+ blobmsg_add_u32(b, "multicast_router", st.multicast_router);
}
s = blobmsg_open_table(b, "statistics");
projects / project / netifd.git / blobdiff