rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump netifd versiob 2017.01.25

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2017-03-18 22:47:13 +01:00
parent 7195cc3d28
commit 45d0a9919a
30 changed files with 521 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
src/3P/netifd/device.c
View File

@@ -24,10 +24,13 @@
#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;
@@ -51,9 +54,11 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
[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 },
[DEV_ATTR_SENDREDIRECTS] = { .name = "sendredirects", .type = BLOBMSG_TYPE_BOOL },
};
const struct uci_blob_param_list device_attr_list = {
@@ -63,6 +68,36 @@ 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;
}
/* 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++;
@@ -118,11 +153,15 @@ simple_device_set_state(struct device *dev, bool state)
}
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)
@@ -141,7 +180,7 @@ static void simple_device_free(struct device *dev)
free(dev);
}
const struct device_type simple_device_type = {
struct device_type simple_device_type = {
.name = "Network device",
.config_params = &device_attr_list,
@@ -184,8 +223,11 @@ device_merge_settings(struct device *dev, struct device_settings *n)
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->sendredirects = s->flags & DEV_OPT_SENDREDIRECTS ?
s->sendredirects : os->sendredirects;
n->flags = s->flags | os->flags | os->valid_flags;
}
@@ -201,12 +243,12 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
if ((cur = tb[DEV_ATTR_ENABLED]))
disabled = !blobmsg_get_bool(cur);
if ((cur = tb[DEV_ATTR_MTU])) {
if ((cur = tb[DEV_ATTR_MTU]) && blobmsg_get_u32(cur) >= 68) {
s->mtu = blobmsg_get_u32(cur);
s->flags |= DEV_OPT_MTU;
}
if ((cur = tb[DEV_ATTR_MTU6])) {
if ((cur = tb[DEV_ATTR_MTU6]) && blobmsg_get_u32(cur) >= 1280) {
s->mtu6 = blobmsg_get_u32(cur);
s->flags |= DEV_OPT_MTU6;
}
@@ -304,6 +346,11 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
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;
@@ -319,6 +366,11 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
s->flags |= DEV_OPT_UNICAST_FLOOD;
}
if ((cur = tb[DEV_ATTR_SENDREDIRECTS])) {
s->sendredirects = blobmsg_get_bool(cur);
s->flags |= DEV_OPT_SENDREDIRECTS;
}
device_set_disabled(dev, disabled);
}
@@ -406,6 +458,10 @@ void device_release(struct device_user *dep)
device_broadcast_event(dev, DEV_EVENT_TEARDOWN);
if (!dev->external)
dev->set_state(dev, false);
if (dev->active)
return;
device_broadcast_event(dev, DEV_EVENT_DOWN);
}
@@ -417,7 +473,7 @@ int device_check_state(struct device *dev)
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);
@@ -434,7 +490,7 @@ void device_init_virtual(struct device *dev, const struct device_type *type, con
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;
@@ -729,7 +785,7 @@ device_init_pending(void)
}
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];
@@ -758,7 +814,7 @@ device_set_config(struct device *dev, const struct device_type *type,
}
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;
@@ -883,13 +939,13 @@ device_set_default_ps(bool state)
}
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;
enum dev_change_type change;
odev = device_get(name, false);
odev = device_find(name);
if (odev) {
odev->current_config = true;
change = device_apply_config(odev, type, config);
@@ -908,7 +964,7 @@ device_create(const char *name, const struct device_type *type,
if (!config)
return NULL;
dev = type->create(name, config);
dev = type->create(name, type, config);
if (!dev)
return NULL;
@@ -994,12 +1050,16 @@ device_dump_status(struct blob_buf *b, struct device *dev)
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);
if (st.flags & DEV_OPT_SENDREDIRECTS)
blobmsg_add_u8(b, "sendredirects", st.sendredirects);
}
s = blobmsg_open_table(b, "statistics");
@@ -1009,3 +1069,8 @@ device_dump_status(struct blob_buf *b, struct device *dev)
system_if_dump_stats(dev, b);
blobmsg_close_table(b, s);
}
static void __init simple_device_type_init(void)
{
device_type_add(&simple_device_type);
}