X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=e9534322258777bc338900c707c60a0c310fd0cd;hp=120b1f0a3d009ae08ad377f0fe24643387f645f8;hb=5fb6e081432d531a905abb7a8b70cfeb2e8fa41b;hpb=fc205d64fcd70cda2dc9176ce2662d71c51370ab diff --git a/device.c b/device.c index 120b1f0..e953432 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 = 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); + avl_init(&devices, avl_strcmp, true, NULL); } -static void free_simple_device(struct device *dev) -{ - cleanup_device(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,39 +124,50 @@ 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; - DPRINTF("claim device %s, new refcount: %d\n", dev->ifname, dev->active + 1); + if (dep->claimed) + return 0; + + dep->claimed = true; + D(DEVICE, "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); + D(DEVICE, "release device %s, new refcount: %d\n", dev->ifname, dev->active); assert(dev->active >= 0); 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) +int device_check_state(struct device *dev) { if (!dev->type->check_state) return 0; @@ -164,7 +175,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); @@ -172,16 +183,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); + D(DEVICE, "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; @@ -192,21 +203,15 @@ int init_device(struct device *dev, const struct device_type *type, const char * if (ret < 0) return ret; - check_device_state(dev); + device_check_state(dev); 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); @@ -218,16 +223,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); + D(DEVICE, "Clean up device '%s'\n", dev->ifname); list_for_each_entry_safe(dep, tmp, &dev->users, list) { if (!dep->cb) continue; @@ -239,20 +244,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" ); + D(DEVICE, "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) @@ -260,29 +265,117 @@ 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 -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); + + avl_for_each_element_safe(&devices, dev, avl, tmp) + __device_free_unused(dev); +} - free_device(dev); +enum dev_change_type +device_reload_config(struct device *dev, struct blob_attr *attr) +{ + struct blob_attr *tb[__DEV_ATTR_MAX], *tb1[__DEV_ATTR_MAX]; + + blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb, + blob_data(attr), blob_len(attr)); + if (dev->config) + blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb1, + blob_data(dev->config), blob_len(dev->config)); + else + memset(tb1, 0, sizeof(tb1)); + + if (!config_diff(tb, tb1, &device_attr_list, NULL)) + return DEV_CONFIG_NO_CHANGE; + + device_init_settings(dev, tb); + return DEV_CONFIG_APPLIED; +} + +static enum dev_change_type +device_check_config(struct device *dev, struct blob_attr *attr) +{ + if (dev->type->reload) + return dev->type->reload(dev, attr); + + return device_reload_config(dev, attr); +} + +static void +device_replace(struct device *dev, struct device *odev) +{ + struct device_user *dep, *tmp; + bool present = odev->present; + + if (present) + device_set_present(odev, false); + + list_for_each_entry_safe(dep, tmp, &odev->users, list) { + device_remove_user(dep); + device_add_user(dep, dev); } + device_free(odev); + + if (present) + device_set_present(dev, true); +} + +struct device * +device_create(const char *name, const struct device_type *type, + struct blob_attr *config) +{ + struct device *odev = NULL, *dev; + enum dev_change_type change; + + odev = device_get(name, false); + if (odev) { + change = device_check_config(odev, config); + switch (change) { + case DEV_CONFIG_APPLIED: + free(odev->config); + odev->config = config_memdup(config); + if (odev->present) { + device_set_present(odev, false); + device_set_present(odev, true); + } + /* fall through */ + case DEV_CONFIG_NO_CHANGE: + return odev; + case DEV_CONFIG_RECREATE: + break; + } + } + + dev = type->create(config); + dev->config = config_memdup(config); + if (odev) + device_replace(dev, odev); + + return dev; }