X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=97fb27f1c8883e22b428c8b11d7dd8e8b7baf464;hp=a2d563778e8d533c058771f6064bb3a9f324a8ae;hb=fabdd4fc5c7354e897f91e96e734f584776736c7;hpb=fe8a6dd2991d54c3eb84cb12764c1316d19bac4e diff --git a/device.c b/device.c index a2d5637..97fb27f 100644 --- a/device.c +++ b/device.c @@ -29,17 +29,6 @@ #include "config.h" static struct avl_tree devices; -static struct avl_tree aliases; - -struct alias_device { - struct avl_node avl; - struct device dev; - struct device_user dep; - bool cleanup; - char name[]; -}; - -static const struct device_type alias_device_type; static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = { [DEV_ATTR_TYPE] = { "type", BLOBMSG_TYPE_STRING }, @@ -137,54 +126,6 @@ const struct device_type simple_device_type = { .free = simple_device_free, }; -static int -alias_device_set_state(struct device *dev, bool state) -{ - struct alias_device *alias; - - alias = container_of(dev, struct alias_device, dev); - if (!alias->dep.dev) - return -1; - - if (state) - return device_claim(&alias->dep); - - device_release(&alias->dep); - if (alias->cleanup) - device_remove_user(&alias->dep); - return 0; -} - -static struct device * -alias_device_create(const char *name, struct blob_attr *attr) -{ - struct alias_device *alias; - - alias = calloc(1, sizeof(*alias) + strlen(name) + 1); - strcpy(alias->name, name); - alias->dev.set_state = alias_device_set_state; - device_init_virtual(&alias->dev, &alias_device_type, NULL); - alias->avl.key = alias->name; - avl_insert(&aliases, &alias->avl); - - return &alias->dev; -} - -static void alias_device_free(struct device *dev) -{ - struct alias_device *alias; - - alias = container_of(dev, struct alias_device, dev); - avl_delete(&aliases, &alias->avl); - free(alias); -} - -static const struct device_type alias_device_type = { - .name = "Network alias", - .create = alias_device_create, - .free = alias_device_free, -}; - static void device_merge_settings(struct device *dev, struct device_settings *n) { @@ -237,14 +178,14 @@ device_init_settings(struct device *dev, struct blob_attr **tb) static void __init dev_init(void) { avl_init(&devices, avl_strcmp, true, NULL); - avl_init(&aliases, avl_strcmp, false, NULL); } -static void device_broadcast_event(struct device *dev, enum device_event ev) + +static void __device_broadcast_event(struct list_head *head, enum device_event ev) { struct device_user *dep, *tmp; - list_for_each_entry_safe(dep, tmp, &dev->users, list) { + list_for_each_entry_safe(dep, tmp, head, list) { if (!dep->cb) continue; @@ -252,32 +193,10 @@ static void device_broadcast_event(struct device *dev, enum device_event ev) } } -void -alias_notify_device(const char *name, struct device *dev) +void device_broadcast_event(struct device *dev, enum device_event ev) { - struct alias_device *alias; - - device_lock(); - - alias = avl_find_element(&aliases, name, alias, avl); - if (!alias) - return; - - alias->cleanup = !dev; - if (dev) { - if (dev != alias->dep.dev) { - device_remove_user(&alias->dep); - strcpy(alias->dev.ifname, dev->ifname); - device_add_user(&alias->dep, dev); - } - } - - device_set_present(&alias->dev, !!dev); - - if (!dev && alias->dep.dev && !alias->dep.dev->active) - device_remove_user(&alias->dep); - - device_unlock(); + __device_broadcast_event(&dev->aliases, ev); + __device_broadcast_event(&dev->users, ev); } int device_claim(struct device_user *dep) @@ -345,7 +264,11 @@ void device_init_virtual(struct device *dev, const struct device_type *type, con D(DEVICE, "Initialize device '%s'\n", dev->ifname); INIT_LIST_HEAD(&dev->users); + INIT_LIST_HEAD(&dev->aliases); dev->type = type; + + if (!dev->set_state) + dev->set_state = set_device_state; } int device_init(struct device *dev, const struct device_type *type, const char *ifname) @@ -354,9 +277,6 @@ int device_init(struct device *dev, const struct device_type *type, const char * device_init_virtual(dev, type, ifname); - if (!dev->set_state) - dev->set_state = set_device_state; - dev->avl.key = dev->ifname; ret = avl_insert(&devices, &dev->avl); @@ -386,18 +306,6 @@ device_create_default(const char *name, bool external) return dev; } -static struct device * -device_alias_get(const char *name) -{ - struct alias_device *alias; - - alias = avl_find_element(&aliases, name, alias, avl); - if (alias) - return &alias->dev; - - return alias_device_create(name, NULL); -} - struct device * device_get(const char *name, int create) { @@ -410,8 +318,13 @@ device_get(const char *name, int create) return device_alias_get(name + 1); dev = avl_find_element(&devices, name, dev, avl); - if (dev) + if (dev) { + if (create > 1 && !dev->external) { + dev->external = true; + device_set_present(dev, true); + } return dev; + } if (!create) return NULL; @@ -476,8 +389,21 @@ void device_set_present(struct device *dev, bool state) device_refresh_present(dev); } +static int device_refcount(struct device *dev) +{ + struct list_head *list; + int count = 0; + + list_for_each(list, &dev->users) + count++; + + return count; +} + void device_add_user(struct device_user *dep, struct device *dev) { + struct list_head *head; + if (dep->dev) device_remove_user(dep); @@ -485,7 +411,14 @@ void device_add_user(struct device_user *dep, struct device *dev) return; dep->dev = dev; - list_add_tail(&dep->list, &dev->users); + + if (dep->alias) + head = &dev->aliases; + else + head = &dev->users; + list_add_tail(&dep->list, head); + D(DEVICE, "Add user for device '%s', refcount=%d\n", dev->ifname, device_refcount(dev)); + if (dep->cb && dev->present) { dep->cb(dep, DEV_EVENT_ADD); if (dev->active) @@ -525,6 +458,7 @@ void device_remove_user(struct device_user *dep) list_del(&dep->list); dep->dev = NULL; + D(DEVICE, "Remove user for device '%s', refcount=%d\n", dev->ifname, device_refcount(dev)); __device_free_unused(dev); } @@ -650,6 +584,10 @@ device_create(const char *name, const struct device_type *type, if (odev) { odev->current_config = true; change = device_set_config(odev, type, config); + if (odev->external) { + system_if_apply_settings(odev, &odev->settings); + change = DEV_CONFIG_APPLIED; + } switch (change) { case DEV_CONFIG_RESTART: case DEV_CONFIG_APPLIED: @@ -724,7 +662,7 @@ device_dump_status(struct blob_buf *b, struct device *dev) if (st.flags & DEV_OPT_MTU) blobmsg_add_u32(b, "mtu", st.mtu); if (st.flags & DEV_OPT_MACADDR) - blobmsg_add_string(b, "macaddr", ether_ntoa((struct ether_addr *) st.macaddr)); + blobmsg_add_string(b, "macaddr", format_macaddr(st.macaddr)); if (st.flags & DEV_OPT_TXQUEUELEN) blobmsg_add_u32(b, "txqueuelen", st.txqueuelen); }