X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=7307414d737b4b9a2467d9dc966657847b60cfba;hp=31fc4673c9ce2867f9e026bf358fd2995d10a0b7;hb=31cf8623be5e402f4fdc624ba1f5c43e64c80ca9;hpb=1f8dc227cdd425f1313f564fd074c614bb1954a3 diff --git a/device.c b/device.c index 31fc467..7307414 100644 --- a/device.c +++ b/device.c @@ -3,25 +3,102 @@ #include #include -#include +#include +#include +#include #include "netifd.h" #include "system.h" +#include "config.h" static struct avl_tree devices; -static void API_CTOR dev_init(void) +static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = { + [DEV_ATTR_TYPE] = { "type", BLOBMSG_TYPE_STRING }, + [DEV_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING }, + [DEV_ATTR_IFNAME] = { "ifname", BLOBMSG_TYPE_ARRAY }, + [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 struct device * +simple_device_create(struct blob_attr *attr) { - avl_init(&devices, avl_strcmp, false, NULL); + struct blob_attr *tb[__DEV_ATTR_MAX]; + 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 (!name) + return NULL; + + dev = device_get(name, true); + if (!dev) + return NULL; + + device_init_settings(dev, tb); + + return dev; } -static void free_simple_device(struct device *dev) +static void simple_device_free(struct device *dev) { - cleanup_device(dev); + device_cleanup(dev); free(dev); } -static void broadcast_device_event(struct device *dev, enum device_event ev) +const struct device_type simple_device_type = { + .name = "Network device", + .config_params = &device_attr_list, + + .create = simple_device_create, + .check_state = system_if_check, + .free = simple_device_free, +}; + +void +device_init_settings(struct device *dev, struct blob_attr **tb) +{ + 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 __init dev_init(void) +{ + avl_init(&devices, avl_strcmp, false, NULL); +} + +static void device_broadcast_event(struct device *dev, enum device_event ev) { struct device_user *dep, *tmp; @@ -43,26 +120,37 @@ static int set_device_state(struct device *dev, bool state) return 0; } -int claim_device(struct device *dev) +int device_claim(struct device_user *dep) { + struct device *dev = dep->dev; int ret; + if (dep->claimed) + return 0; + + dep->claimed = true; DPRINTF("claim device %s, new refcount: %d\n", dev->ifname, dev->active + 1); if (++dev->active != 1) return 0; - broadcast_device_event(dev, DEV_EVENT_SETUP); + device_broadcast_event(dev, DEV_EVENT_SETUP); ret = dev->set_state(dev, true); if (ret == 0) - broadcast_device_event(dev, DEV_EVENT_UP); + device_broadcast_event(dev, DEV_EVENT_UP); else dev->active = 0; return ret; } -void release_device(struct device *dev) +void device_release(struct device_user *dep) { + struct device *dev = dep->dev; + + if (!dep->claimed) + return; + + dep->claimed = false; dev->active--; DPRINTF("release device %s, new refcount: %d\n", dev->ifname, dev->active); assert(dev->active >= 0); @@ -70,9 +158,9 @@ void release_device(struct device *dev) if (dev->active) return; - broadcast_device_event(dev, DEV_EVENT_TEARDOWN); + device_broadcast_event(dev, DEV_EVENT_TEARDOWN); dev->set_state(dev, false); - broadcast_device_event(dev, DEV_EVENT_DOWN); + device_broadcast_event(dev, DEV_EVENT_DOWN); } int check_device_state(struct device *dev) @@ -83,7 +171,7 @@ int check_device_state(struct device *dev) return dev->type->check_state(dev); } -void init_virtual_device(struct device *dev, const struct device_type *type, const char *name) +void device_init_virtual(struct device *dev, const struct device_type *type, const char *name) { assert(dev); assert(type); @@ -91,16 +179,16 @@ void init_virtual_device(struct device *dev, const struct device_type *type, con if (name) strncpy(dev->ifname, name, IFNAMSIZ); - fprintf(stderr, "Initialize device '%s'\n", dev->ifname); + DPRINTF("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 device_init(struct device *dev, const struct device_type *type, const char *ifname) { int ret; - init_virtual_device(dev, type, ifname); + device_init_virtual(dev, type, ifname); if (!dev->set_state) dev->set_state = set_device_state; @@ -116,16 +204,10 @@ int init_device(struct device *dev, const struct device_type *type, const char * return 0; } -struct device *get_device(const char *name, bool create) +struct device *device_get(const char *name, bool create) { - static const struct device_type simple_type = { - .name = "Device", - .check_state = system_if_check, - .free = free_simple_device, - }; struct device *dev; - if (strchr(name, '.')) return get_vlan_device_chain(name, create); @@ -137,16 +219,16 @@ struct device *get_device(const char *name, bool create) return NULL; dev = calloc(1, sizeof(*dev)); - init_device(dev, &simple_type, name); + device_init(dev, &simple_device_type, name); return dev; } -void cleanup_device(struct device *dev) +void device_cleanup(struct device *dev) { struct device_user *dep, *tmp; - fprintf(stderr, "Clean up device '%s'\n", dev->ifname); + DPRINTF("Clean up device '%s'\n", dev->ifname); list_for_each_entry_safe(dep, tmp, &dev->users, list) { if (!dep->cb) continue; @@ -158,20 +240,20 @@ void cleanup_device(struct device *dev) avl_delete(&devices, &dev->avl); } -void set_device_present(struct device *dev, bool state) +void device_set_present(struct device *dev, bool state) { if (dev->present == state) return; DPRINTF("Device '%s' %s present\n", dev->ifname, state ? "is now" : "is no longer" ); dev->present = state; - broadcast_device_event(dev, state ? DEV_EVENT_ADD : DEV_EVENT_REMOVE); + device_broadcast_event(dev, state ? DEV_EVENT_ADD : DEV_EVENT_REMOVE); } -void add_device_user(struct device_user *dep, struct device *dev) +void device_add_user(struct device_user *dep, struct device *dev) { dep->dev = dev; - list_add(&dep->list, &dev->users); + list_add_tail(&dep->list, &dev->users); if (dep->cb && dev->present) { dep->cb(dep, DEV_EVENT_ADD); if (dev->active) @@ -179,29 +261,35 @@ void add_device_user(struct device_user *dep, struct device *dev) } } -void remove_device_user(struct device_user *dep) +static void +__device_free_unused(struct device *dev) { - struct device *dev = dep->dev; + if (!list_empty(&dev->users)) + return; - list_del(&dep->list); + device_free(dev); +} - if (list_empty(&dev->users)) { - /* all references have gone away, remove this device */ - free_device(dev); - } +void device_remove_user(struct device_user *dep) +{ + struct device *dev = dep->dev; + if (dep->claimed) + device_release(dep); + + list_del(&dep->list); dep->dev = NULL; + __device_free_unused(dev); } void -cleanup_devices(void) +device_free_unused(struct device *dev) { - struct device *dev, *tmp; + struct device *tmp; - avl_for_each_element_safe(&devices, dev, avl, tmp) { - if (!list_empty(&dev->users)) - continue; + if (dev) + return __device_free_unused(dev); - free_device(dev); - } + avl_for_each_element_safe(&devices, dev, avl, tmp) + __device_free_unused(dev); }