X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=device.c;h=128151a1eb8105116ac04f46cbb7d088c518f9ea;hb=3392046d51959b228133e69f54893898df75635e;hp=a4d804e0934f912f7d51807176c1e378ed93d38e;hpb=29521f9a232f039318fd8525c410b3127836626f;p=oweals%2Fnetifd.git diff --git a/device.c b/device.c index a4d804e..128151a 100644 --- a/device.c +++ b/device.c @@ -24,12 +24,14 @@ #include #endif +#include + #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 }, @@ -46,14 +48,16 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = { [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 }, + [DEV_ATTR_SENDREDIRECTS] = { .name = "sendredirects", .type = BLOBMSG_TYPE_BOOL }, + [DEV_ATTR_NEIGHLOCKTIME] = { .name = "neighlocktime", .type = BLOBMSG_TYPE_INT32 }, + [DEV_ATTR_ISOLATE] = { .name = "isolate", .type = BLOBMSG_TYPE_BOOL }, }; const struct uci_blob_param_list device_attr_list = { @@ -63,6 +67,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 +152,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 +179,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, @@ -150,7 +188,7 @@ const struct device_type simple_device_type = { .free = simple_device_free, }; -static void +void device_merge_settings(struct device *dev, struct device_settings *n) { struct device_settings *os = &dev->orig_settings; @@ -178,14 +216,19 @@ device_merge_settings(struct device *dev, struct device_settings *n) s->neigh4gcstaletime : os->neigh4gcstaletime; n->neigh6gcstaletime = s->flags & DEV_OPT_NEIGHGCSTALETIME ? s->neigh6gcstaletime : os->neigh6gcstaletime; + n->neigh4locktime = s->flags & DEV_OPT_NEIGHLOCKTIME ? + s->neigh4locktime : os->neigh4locktime; 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->sendredirects = s->flags & DEV_OPT_SENDREDIRECTS ? + s->sendredirects : os->sendredirects; n->flags = s->flags | os->flags | os->valid_flags; } @@ -201,12 +244,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; } @@ -272,19 +315,10 @@ device_init_settings(struct device *dev, struct blob_attr **tb) 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 = default_ps; - - if ((cur = tb[DEV_ATTR_XPS])) { - s->xps = blobmsg_get_bool(cur); - s->flags |= DEV_OPT_XPS; + if ((cur = tb[DEV_ATTR_NEIGHLOCKTIME])) { + s->neigh4locktime = blobmsg_get_u32(cur); + s->flags |= DEV_OPT_NEIGHLOCKTIME; } - else - s->xps = default_ps; if ((cur = tb[DEV_ATTR_DADTRANSMITS])) { s->dadtransmits = blobmsg_get_u32(cur); @@ -304,6 +338,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 +358,16 @@ 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; + } + + if ((cur = tb[DEV_ATTR_ISOLATE])) { + s->isolate = blobmsg_get_bool(cur); + s->flags |= DEV_OPT_ISOLATE; + } + device_set_disabled(dev, disabled); } @@ -406,6 +455,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 +470,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) +int device_init_virtual(struct device *dev, struct device_type *type, const char *name) { assert(dev); assert(type); @@ -427,18 +480,27 @@ void device_init_virtual(struct device *dev, const struct device_type *type, con INIT_SAFE_LIST(&dev->aliases); dev->type = type; - if (name) - device_set_ifname(dev, name); + if (name) { + int ret; + + ret = device_set_ifname(dev, name); + if (ret < 0) + return ret; + } if (!dev->set_state) dev->set_state = set_device_state; + + return 0; } -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; - device_init_virtual(dev, type, ifname); + ret = device_init_virtual(dev, type, ifname); + if (ret < 0) + return ret; dev->avl.key = dev->ifname; @@ -448,8 +510,6 @@ int device_init(struct device *dev, const struct device_type *type, const char * system_if_clear_state(dev); device_check_state(dev); - dev->settings.rps = default_ps; - dev->settings.xps = default_ps; return 0; } @@ -469,13 +529,27 @@ device_create_default(const char *name, bool external) dev->external = external; dev->set_state = simple_device_set_state; - device_init(dev, &simple_device_type, name); + + if (device_init(dev, &simple_device_type, name) < 0) { + device_cleanup(dev); + free(dev); + return NULL; + } + 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) { @@ -589,10 +663,13 @@ int device_set_ifname(struct device *dev, const char *name) if (!strcmp(dev->ifname, name)) return 0; + if (strlen(name) > sizeof(dev->ifname) - 1) + return -1; + if (dev->avl.key) avl_delete(&devices, &dev->avl); - strncpy(dev->ifname, name, IFNAMSIZ); + strcpy(dev->ifname, name); if (dev->avl.key) ret = avl_insert(&devices, &dev->avl); @@ -656,7 +733,7 @@ void device_add_user(struct device_user *dep, struct device *dev) __device_add_user(dep, dev); } -void +static void device_free(struct device *dev) { __devlock++; @@ -721,7 +798,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]; @@ -750,7 +827,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; @@ -839,49 +916,14 @@ device_reset_old(void) } } -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; 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); @@ -900,7 +942,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; @@ -980,18 +1022,24 @@ device_dump_status(struct blob_buf *b, struct device *dev) blobmsg_add_u32(b, "neigh4gcstaletime", st.neigh4gcstaletime); blobmsg_add_u32(b, "neigh6gcstaletime", st.neigh6gcstaletime); } + if (st.flags & DEV_OPT_NEIGHLOCKTIME) + blobmsg_add_u32(b, "neigh4locktime", st.neigh4locktime); 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); + if (st.flags & DEV_OPT_SENDREDIRECTS) + blobmsg_add_u8(b, "sendredirects", st.sendredirects); } s = blobmsg_open_table(b, "statistics"); @@ -1001,3 +1049,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); +}