struct avl_node avl;
struct device dev;
struct device_user dep;
- bool cleanup;
+ struct device_user new_dep;
+ bool update;
char name[];
};
-static const struct device_type alias_device_type;
+static void alias_set_device(struct alias_device *alias, struct device *dev)
+{
+ if (dev == alias->dep.dev) {
+ if (alias->update) {
+ device_remove_user(&alias->new_dep);
+ alias->update = false;
+ if (dev)
+ device_set_present(&alias->dev, true);
+ }
+ return;
+ }
+
+ device_set_present(&alias->dev, false);
+ device_remove_user(&alias->new_dep);
+ if (alias->dev.active) {
+ if (dev)
+ device_add_user(&alias->new_dep, dev);
+
+ alias->update = true;
+ return;
+ }
+
+ alias->update = false;
+ device_remove_user(&alias->dep);
+ alias->dev.hidden = !dev;
+ if (dev) {
+ device_set_ifindex(&alias->dev, dev->ifindex);
+ device_set_ifname(&alias->dev, dev->ifname);
+ device_add_user(&alias->dep, dev);
+ } else {
+ device_set_ifname(&alias->dev, "");
+ device_set_link(&alias->dev, false);
+ }
+}
static int
alias_device_set_state(struct device *dev, bool state)
return device_claim(&alias->dep);
device_release(&alias->dep);
- if (alias->cleanup)
- device_remove_user(&alias->dep);
+ if (alias->update)
+ alias_set_device(alias, alias->new_dep.dev);
+
return 0;
}
static void alias_device_cb(struct device_user *dep, enum device_event ev)
{
struct alias_device *alias;
- bool present = false;
alias = container_of(dep, struct alias_device, dep);
switch (ev) {
case DEV_EVENT_ADD:
- present = true;
+ device_set_present(&alias->dev, true);
+ break;
case DEV_EVENT_REMOVE:
- device_set_present(&alias->dev, present);
+ device_set_present(&alias->dev, false);
+ break;
+ case DEV_EVENT_LINK_UP:
+ device_set_link(&alias->dev, true);
+ break;
+ case DEV_EVENT_LINK_DOWN:
+ device_set_link(&alias->dev, false);
+ break;
+ case DEV_EVENT_UPDATE_IFINDEX:
+ device_set_ifindex(&alias->dev, dep->dev->ifindex);
break;
default:
device_broadcast_event(&alias->dev, ev);
}
static struct device *
-alias_device_create(const char *name, struct blob_attr *attr)
+alias_device_create(const char *name, struct device_type *devtype,
+ struct blob_attr *attr)
{
struct alias_device *alias;
alias = calloc(1, sizeof(*alias) + strlen(name) + 1);
+ if (!alias)
+ return NULL;
+
strcpy(alias->name, name);
alias->dev.set_state = alias_device_set_state;
alias->dev.hidden = true;
- device_init_virtual(&alias->dev, &alias_device_type, NULL);
+ if (device_init_virtual(&alias->dev, devtype, NULL) < 0) {
+ free(alias);
+ return NULL;
+ }
+
alias->avl.key = alias->name;
avl_insert(&aliases, &alias->avl);
alias->dep.alias = true;
struct alias_device *alias;
alias = container_of(dev, struct alias_device, dev);
+ device_remove_user(&alias->new_dep);
+ device_remove_user(&alias->dep);
avl_delete(&aliases, &alias->avl);
free(alias);
}
-static void __alias_notify_device(struct alias_device *alias, struct device *dev)
-{
- 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);
- alias->dev.hidden = false;
- device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
- }
- }
-
- if (!dev && alias->dep.dev && !alias->dep.dev->active) {
- device_remove_user(&alias->dep);
- alias->dev.hidden = true;
- alias->dev.ifname[0] = 0;
- device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
- }
-}
-
static int alias_check_state(struct device *dev)
{
struct alias_device *alias;
if (iface && iface->state == IFS_UP)
ndev = iface->l3_dev.dev;
- __alias_notify_device(alias, ndev);
+ alias_set_device(alias, ndev);
return 0;
}
-static const struct device_type alias_device_type = {
+static struct device_type alias_device_type = {
.name = "Network alias",
.create = alias_device_create,
.free = alias_device_free,
{
struct alias_device *alias;
- device_lock();
-
alias = avl_find_element(&aliases, name, alias, avl);
if (alias)
- __alias_notify_device(alias, dev);
-
- device_unlock();
+ alias_set_device(alias, dev);
}
struct device *
if (alias)
return &alias->dev;
- return alias_device_create(name, NULL);
+ return alias_device_create(name, &alias_device_type, NULL);
}
static void __init alias_init(void)