X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=9e0881ae570fdbb340282cf60aed3955fd40da5a;hp=e1ffba179e9996a8e56a3f6ed3df827c7fffcb1b;hb=50eb00f20aaf86c84a24b8d2aaad13ffff52d3f1;hpb=5d1fff7af6f77c9bf0d46572c7af563cd9fc55b3 diff --git a/device.c b/device.c index e1ffba1..9e0881a 100644 --- a/device.c +++ b/device.c @@ -3,24 +3,100 @@ #include #include -#include +#include +#include +#include #include "netifd.h" #include "system.h" +#include "config.h" static struct avl_tree devices; -static int avl_strcmp(const void *k1, const void *k2, void *ptr) +enum { + DEV_ATTR_NAME, + DEV_ATTR_TYPE, + DEV_ATTR_MTU, + DEV_ATTR_MACADDR, + DEV_ATTR_TXQUEUELEN, + __DEV_ATTR_MAX, +}; + +static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = { + [DEV_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING }, + [DEV_ATTR_TYPE] = { "type", BLOBMSG_TYPE_STRING }, + [DEV_ATTR_MTU] = { "mtu", BLOBMSG_TYPE_INT32 }, + [DEV_ATTR_MACADDR] = { "macaddr", BLOBMSG_TYPE_STRING }, + [DEV_ATTR_TXQUEUELEN] = { "txqueuelen", BLOBMSG_TYPE_INT32 }, +}; + +const struct config_param_list device_attr_list = { + .n_params = __DEV_ATTR_MAX, + .params = dev_attrs, +}; + +static void +device_init_settings(struct device *dev, struct blob_attr **tb) { - return strcmp(k1, k2); + struct blob_attr *cur; + struct ether_addr *ea; + + dev->flags = 0; + + if ((cur = tb[DEV_ATTR_MTU])) { + dev->mtu = blobmsg_get_u32(cur); + dev->flags |= DEV_OPT_MTU; + } + + if ((cur = tb[DEV_ATTR_TXQUEUELEN])) { + dev->txqueuelen = blobmsg_get_u32(cur); + dev->flags |= DEV_OPT_TXQUEUELEN; + } + + if ((cur = tb[DEV_ATTR_MACADDR])) { + ea = ether_aton(blob_data(cur)); + if (ea) { + memcpy(dev->macaddr, ea, sizeof(dev->macaddr)); + dev->flags |= DEV_OPT_MACADDR; + } + } } -static void API_CTOR dev_init(void) +struct device * +device_create(struct blob_attr *attr, struct uci_section *s) +{ + struct blob_attr *tb[__DEV_ATTR_MAX]; + struct blob_attr *cur; + struct device *dev = NULL; + const char *name; + + blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb, blob_data(attr), blob_len(attr)); + if (!tb[DEV_ATTR_NAME]) + return NULL; + + name = blobmsg_data(tb[DEV_ATTR_NAME]); + if ((cur = tb[DEV_ATTR_TYPE])) { + if (!strcmp(blobmsg_data(cur), "bridge")) + dev = bridge_create(name, s); + } else { + dev = get_device(name, true); + } + + if (!dev) + return NULL; + + device_init_settings(dev, tb); + + return dev; +} + + +static void __init dev_init(void) { avl_init(&devices, avl_strcmp, false, NULL); } -static void free_device(struct device *dev) +static void free_simple_device(struct device *dev) { cleanup_device(dev); free(dev); @@ -40,15 +116,11 @@ static void broadcast_device_event(struct device *dev, enum device_event ev) static int set_device_state(struct device *dev, bool state) { - if (state) { - broadcast_device_event(dev, DEV_EVENT_SETUP); + if (state) system_if_up(dev); - broadcast_device_event(dev, DEV_EVENT_UP); - } else { - broadcast_device_event(dev, DEV_EVENT_TEARDOWN); + else system_if_down(dev); - broadcast_device_event(dev, DEV_EVENT_DOWN); - } + return 0; } @@ -60,8 +132,11 @@ int claim_device(struct device *dev) if (++dev->active != 1) return 0; + broadcast_device_event(dev, DEV_EVENT_SETUP); ret = dev->set_state(dev, true); - if (ret != 0) + if (ret == 0) + broadcast_device_event(dev, DEV_EVENT_UP); + else dev->active = 0; return ret; @@ -73,8 +148,12 @@ void release_device(struct device *dev) DPRINTF("release device %s, new refcount: %d\n", dev->ifname, dev->active); assert(dev->active >= 0); - if (!dev->active) - dev->set_state(dev, false); + if (dev->active) + return; + + broadcast_device_event(dev, DEV_EVENT_TEARDOWN); + dev->set_state(dev, false); + broadcast_device_event(dev, DEV_EVENT_DOWN); } int check_device_state(struct device *dev) @@ -85,29 +164,36 @@ int check_device_state(struct device *dev) return dev->type->check_state(dev); } -int init_device(struct device *dev, const struct device_type *type, const char *ifname) +void init_virtual_device(struct device *dev, const struct device_type *type, const char *name) { - int ret; - assert(dev); assert(type); - if (ifname) - strncpy(dev->ifname, ifname, IFNAMSIZ); + if (name) + strncpy(dev->ifname, name, IFNAMSIZ); + + fprintf(stderr, "Initialize device '%s'\n", dev->ifname); + INIT_LIST_HEAD(&dev->users); + dev->type = type; +} + +int init_device(struct device *dev, const struct device_type *type, const char *ifname) +{ + int ret; + + init_virtual_device(dev, type, ifname); if (!dev->set_state) dev->set_state = set_device_state; - fprintf(stderr, "Initialize interface '%s'\n", dev->ifname); - INIT_LIST_HEAD(&dev->users); dev->avl.key = dev->ifname; - dev->type = type; ret = avl_insert(&devices, &dev->avl); if (ret < 0) return ret; check_device_state(dev); + return 0; } @@ -116,7 +202,7 @@ struct device *get_device(const char *name, bool create) static const struct device_type simple_type = { .name = "Device", .check_state = system_if_check, - .free = free_device, + .free = free_simple_device, }; struct device *dev; @@ -141,7 +227,7 @@ void cleanup_device(struct device *dev) { struct device_user *dep, *tmp; - fprintf(stderr, "Clean up interface '%s'\n", dev->ifname); + fprintf(stderr, "Clean up device '%s'\n", dev->ifname); list_for_each_entry_safe(dep, tmp, &dev->users, list) { if (!dep->cb) continue; @@ -149,7 +235,8 @@ void cleanup_device(struct device *dev) dep->cb(dep, DEV_EVENT_REMOVE); } - avl_delete(&devices, &dev->avl); + if (dev->avl.key) + avl_delete(&devices, &dev->avl); } void set_device_present(struct device *dev, bool state) @@ -180,9 +267,22 @@ void remove_device_user(struct device_user *dep) list_del(&dep->list); if (list_empty(&dev->users)) { - /* all references have gone away, remove this interface */ - dev->type->free(dev); + /* all references have gone away, remove this device */ + free_device(dev); } dep->dev = NULL; } + +void +cleanup_devices(void) +{ + struct device *dev, *tmp; + + avl_for_each_element_safe(&devices, dev, avl, tmp) { + if (!list_empty(&dev->users)) + continue; + + free_device(dev); + } +}