X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=77594be367ce1dfb6ba70c176b05ea4135d9128d;hp=eeb39a5d11e8c826de002ae932651a6eb8febd2f;hb=2cd93d4c17f093552c06c60427fe9ecfb4c0dbe8;hpb=02a1a2d7b59b584e702b87d8aca0f3941b83176d diff --git a/device.c b/device.c index eeb39a5..77594be 100644 --- a/device.c +++ b/device.c @@ -7,24 +7,20 @@ #include #include +#ifdef linux +#include +#endif + #include "netifd.h" #include "system.h" #include "config.h" static struct avl_tree devices; -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_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 }, @@ -35,7 +31,46 @@ const struct config_param_list device_attr_list = { .params = dev_attrs, }; -static void +static struct device * +simple_device_create(struct blob_attr *attr) +{ + 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 simple_device_free(struct device *dev) +{ + device_cleanup(dev); + free(dev); +} + +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; @@ -62,47 +97,12 @@ device_init_settings(struct device *dev, struct blob_attr **tb) } } -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 = device_get(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_simple_device(struct device *dev) -{ - device_cleanup(dev); - free(dev); -} - -static void broadcast_device_event(struct device *dev, enum device_event ev) +static void device_broadcast_event(struct device *dev, enum device_event ev) { struct device_user *dep, *tmp; @@ -124,26 +124,37 @@ static int set_device_state(struct device *dev, bool state) return 0; } -int device_claim(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 device_release(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); @@ -151,9 +162,9 @@ void device_release(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) @@ -172,7 +183,7 @@ void device_init_virtual(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; } @@ -199,14 +210,8 @@ int device_init(struct device *dev, const struct device_type *type, const char * 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); @@ -218,7 +223,7 @@ struct device *device_get(const char *name, bool create) return NULL; dev = calloc(1, sizeof(*dev)); - device_init(dev, &simple_type, name); + device_init(dev, &simple_device_type, name); return dev; } @@ -227,7 +232,7 @@ 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; @@ -246,13 +251,13 @@ void device_set_present(struct device *dev, bool state) 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 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) @@ -260,29 +265,48 @@ void device_add_user(struct device_user *dep, struct device *dev) } } +static void +__device_free_unused(struct device *dev) +{ + if (!list_empty(&dev->users)) + return; + + device_free(dev); +} + void device_remove_user(struct device_user *dep) { struct device *dev = dep->dev; - list_del(&dep->list); - - if (list_empty(&dev->users)) { - /* all references have gone away, remove this device */ - device_free(dev); - } + if (dep->claimed) + device_release(dep); + list_del(&dep->list); dep->dev = NULL; + __device_free_unused(dev); } void -device_free_all(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); - device_free(dev); - } + avl_for_each_element_safe(&devices, dev, avl, tmp) + __device_free_unused(dev); +} + +struct device * +device_create(const char *name, const struct device_type *type, + struct blob_attr *config) +{ + struct device *dev; + + dev = device_get(name, false); + if (dev) + return dev; + + return type->create(config); }