#include <netinet/ether.h>
#endif
+#include <libubox/list.h>
+
#include "netifd.h"
#include "system.h"
#include "config.h"
+static struct list_head devtypes = LIST_HEAD_INIT(devtypes);
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_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_NEIGHGCSTALETIME] = { .name = "neighgcstaletime", .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 },
+ [DEV_ATTR_MULTICAST_FAST_LEAVE] = { .name = "multicast_fast_leave", . type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_MULTICAST] = { .name ="multicast", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_LEARNING] = { .name ="learning", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_UNICAST_FLOOD] = { .name ="unicast_flood", .type = BLOBMSG_TYPE_BOOL },
};
const struct uci_blob_param_list device_attr_list = {
static int __devlock = 0;
+int device_type_add(struct device_type *devtype)
+{
+ if (device_type_get(devtype->name)) {
+ netifd_log_message(L_WARNING, "Device handler '%s' already exists\n",
+ devtype->name);
+ return 1;
+ }
+
+ netifd_log_message(L_NOTICE, "Added device handler type: %s\n",
+ devtype->name);
+
+ list_add(&devtype->list, &devtypes);
+ return 0;
+}
+
+/* initialize device type list and add known types */
+static void __init devtypes_init(void)
+{
+ device_type_add(&simple_device_type);
+ device_type_add(&bridge_device_type);
+ device_type_add(&tunnel_device_type);
+ device_type_add(&macvlan_device_type);
+ device_type_add(&vlandev_device_type);
+}
+
+/* Retrieve the device type for the given name. If 'bridge' is true, the type
+ * must have bridge capabilities
+ */
+struct device_type *
+device_type_get(const char *tname)
+{
+ struct device_type *cur;
+
+ list_for_each_entry(cur, &devtypes, list)
+ if (!strcmp(cur->name, tname))
+ return cur;
+
+ return NULL;
+}
+
void device_lock(void)
{
__devlock++;
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);
}
static struct device *
-simple_device_create(const char *name, struct blob_attr *attr)
+simple_device_create(const char *name, struct device_type *devtype,
+ struct blob_attr *attr)
{
struct blob_attr *tb[__DEV_ATTR_MAX];
struct device *dev = NULL;
+ /* device type is unused for simple devices */
+ devtype = NULL;
+
blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb, blob_data(attr), blob_len(attr));
dev = device_get(name, true);
if (!dev)
free(dev);
}
-const struct device_type simple_device_type = {
+struct device_type simple_device_type = {
.name = "Network device",
.config_params = &device_attr_list,
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->neigh4reachabletime = s->flags & DEV_OPT_NEIGHREACHABLETIME ?
s->neigh4reachabletime : os->neigh4reachabletime;
n->neigh6reachabletime = s->flags & DEV_OPT_NEIGHREACHABLETIME ?
- s->neigh6reachabletime : os->neigh6reachabletime;
- n->flags = s->flags | os->flags;
+ s->neigh6reachabletime : os->neigh6reachabletime;
+ n->neigh4gcstaletime = s->flags & DEV_OPT_NEIGHGCSTALETIME ?
+ s->neigh4gcstaletime : os->neigh4gcstaletime;
+ n->neigh6gcstaletime = s->flags & DEV_OPT_NEIGHGCSTALETIME ?
+ s->neigh6gcstaletime : os->neigh6gcstaletime;
+ n->dadtransmits = s->flags & DEV_OPT_DADTRANSMITS ?
+ s->dadtransmits : os->dadtransmits;
+ n->multicast = s->flags & DEV_OPT_MULTICAST ?
+ s->multicast : os->multicast;
+ n->multicast_to_unicast = s->multicast_to_unicast;
+ n->multicast_router = s->multicast_router;
+ n->multicast_fast_leave = s->multicast_fast_leave;
+ n->learning = s->learning;
+ n->unicast_flood = s->unicast_flood;
+ 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;
s->flags |= DEV_OPT_NEIGHREACHABLETIME;
}
- if ((cur = tb[DEV_ATTR_RPS]))
+ if ((cur = tb[DEV_ATTR_NEIGHGCSTALETIME])) {
+ s->neigh6gcstaletime = s->neigh4gcstaletime = blobmsg_get_u32(cur);
+ s->flags |= DEV_OPT_NEIGHGCSTALETIME;
+ }
+
+ if ((cur = tb[DEV_ATTR_RPS])) {
s->rps = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_RPS;
+ }
else
- s->rps = true;
+ s->rps = default_ps;
- if ((cur = tb[DEV_ATTR_XPS]))
+ if ((cur = tb[DEV_ATTR_XPS])) {
s->xps = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_XPS;
+ }
else
- s->xps = true;
+ 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));
+ }
+
+ if ((cur = tb[DEV_ATTR_MULTICAST_FAST_LEAVE])) {
+ s->multicast_fast_leave = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_MULTICAST_FAST_LEAVE;
+ }
+
+ if ((cur = tb[DEV_ATTR_MULTICAST])) {
+ s->multicast = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_MULTICAST;
+ }
+
+ if ((cur = tb[DEV_ATTR_LEARNING])) {
+ s->learning = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_LEARNING;
+ }
+
+ if ((cur = tb[DEV_ATTR_UNICAST_FLOOD])) {
+ s->unicast_flood = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_UNICAST_FLOOD;
+ }
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;
+ if (!dev)
+ return -1;
+
dep->claimed = true;
D(DEVICE, "Claim %s %s, new active count: %d\n", dev->type->name, dev->ifname, dev->active + 1);
if (++dev->active != 1)
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;
+
+ system_if_get_settings(dev, &dev->orig_settings);
+ } else
+ ret = dev->set_state(dev, true);
+
if (ret == 0)
device_broadcast_event(dev, DEV_EVENT_UP);
else {
return dev->type->check_state(dev);
}
-void device_init_virtual(struct device *dev, const struct device_type *type, const char *name)
+void device_init_virtual(struct device *dev, struct device_type *type, const char *name)
{
assert(dev);
assert(type);
- if (name)
- strncpy(dev->ifname, name, IFNAMSIZ);
-
- D(DEVICE, "Initialize device '%s'\n", dev->ifname);
+ D(DEVICE, "Initialize device '%s'\n", name ? name : "");
INIT_SAFE_LIST(&dev->users);
INIT_SAFE_LIST(&dev->aliases);
dev->type = type;
+ if (name)
+ device_set_ifname(dev, name);
+
if (!dev->set_state)
dev->set_state = set_device_state;
}
-int device_init(struct device *dev, const struct device_type *type, const char *ifname)
+int device_init(struct device *dev, struct device_type *type, const char *ifname)
{
int ret;
system_if_clear_state(dev);
device_check_state(dev);
+ dev->settings.rps = default_ps;
+ dev->settings.xps = default_ps;
return 0;
}
D(DEVICE, "Create simple device '%s'\n", name);
dev = calloc(1, sizeof(*dev));
+ if (!dev)
+ return NULL;
+
dev->external = external;
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;
}
struct device *
+device_find(const char *name)
+{
+ struct device *dev;
+
+ return avl_find_element(&devices, name, dev, avl);
+}
+
+struct device *
device_get(const char *name, int create)
{
struct device *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);
}
device_broadcast_event(dev, DEV_EVENT_UPDATE_IFINDEX);
}
+int device_set_ifname(struct device *dev, const char *name)
+{
+ int ret = 0;
+
+ if (!strcmp(dev->ifname, name))
+ return 0;
+
+ if (dev->avl.key)
+ avl_delete(&devices, &dev->avl);
+
+ strncpy(dev->ifname, name, IFNAMSIZ);
+
+ if (dev->avl.key)
+ ret = avl_insert(&devices, &dev->avl);
+
+ if (ret == 0)
+ device_broadcast_event(dev, DEV_EVENT_UPDATE_IFNAME);
+
+ return ret;
+}
+
static int device_refcount(struct device *dev)
{
struct list_head *list;
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_set_config(struct device *dev, const struct device_type *type,
+device_set_config(struct device *dev, struct device_type *type,
struct blob_attr *attr)
{
struct blob_attr *tb[__DEV_ATTR_MAX];
}
enum dev_change_type
-device_apply_config(struct device *dev, const struct device_type *type,
+device_apply_config(struct device *dev, struct device_type *type,
struct blob_attr *config)
{
enum dev_change_type change;
free(dev->config);
dev->config = config;
if (change == DEV_CONFIG_RESTART && dev->present) {
+ int ret = 0;
+
device_set_present(dev, false);
if (dev->active && !dev->external) {
- dev->set_state(dev, false);
- dev->set_state(dev, true);
+ ret = dev->set_state(dev, false);
+ if (!ret)
+ ret = dev->set_state(dev, true);
}
- device_set_present(dev, true);
+ if (!ret)
+ device_set_present(dev, true);
}
break;
case DEV_CONFIG_NO_CHANGE:
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,
+device_create(const char *name, struct device_type *type,
struct blob_attr *config)
{
struct device *odev = NULL, *dev;
if (!config)
return NULL;
- dev = type->create(name, config);
+ dev = type->create(name, type, 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_u32(b, "neigh4reachabletime", st.neigh4reachabletime);
blobmsg_add_u32(b, "neigh6reachabletime", st.neigh6reachabletime);
}
+ if (st.flags & DEV_OPT_NEIGHGCSTALETIME) {
+ blobmsg_add_u32(b, "neigh4gcstaletime", st.neigh4gcstaletime);
+ blobmsg_add_u32(b, "neigh6gcstaletime", st.neigh6gcstaletime);
+ }
+ 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);
+ if (st.flags & DEV_OPT_MULTICAST_FAST_LEAVE)
+ blobmsg_add_u8(b, "multicast_fast_leave", st.multicast_fast_leave);
+ if (st.flags & DEV_OPT_MULTICAST)
+ blobmsg_add_u8(b, "multicast", st.multicast);
+ if (st.flags & DEV_OPT_LEARNING)
+ blobmsg_add_u8(b, "learning", st.learning);
+ if (st.flags & DEV_OPT_UNICAST_FLOOD)
+ blobmsg_add_u8(b, "unicast_flood", st.unicast_flood);
}
s = blobmsg_open_table(b, "statistics");
projects / project / netifd.git / blobdiff