remove obsolete /opt/local prefix on Mac OS X

[project/netifd.git] / alias.c

diff --git a/alias.c b/alias.c
index 4e0a6be..649f2d1 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -30,12 +30,17 @@ struct alias_device {
        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 (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);
@@ -51,13 +56,12 @@ static void alias_set_device(struct alias_device *alias, struct device *dev)
        device_remove_user(&alias->dep);
        alias->dev.hidden = !dev;
        if (dev) {
-               alias->dev.ifindex = dev->ifindex;
-               strcpy(alias->dev.ifname, dev->ifname);
-               device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
+               device_set_ifindex(&alias->dev, dev->ifindex);
+               device_set_ifname(&alias->dev, dev->ifname);
                device_add_user(&alias->dep, dev);
        } else {
-               alias->dev.ifname[0] = 0;
-               device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
+               device_set_ifname(&alias->dev, "");
+               device_set_link(&alias->dev, false);
        }
 }
 
@@ -83,14 +87,22 @@ alias_device_set_state(struct device *dev, bool state)
 static void alias_device_cb(struct device_user *dep, enum device_event ev)
 {
        struct alias_device *alias;
-       bool present = false;
+       bool new_state = false;
 
        alias = container_of(dep, struct alias_device, dep);
        switch (ev) {
        case DEV_EVENT_ADD:
-               present = true;
+               new_state = true;
        case DEV_EVENT_REMOVE:
-               device_set_present(&alias->dev, present);
+               device_set_present(&alias->dev, new_state);
+               break;
+       case DEV_EVENT_LINK_UP:
+               new_state = true;
+       case DEV_EVENT_LINK_DOWN:
+               device_set_link(&alias->dev, new_state);
+               break;
+       case DEV_EVENT_UPDATE_IFINDEX:
+               device_set_ifindex(&alias->dev, dep->dev->ifindex);
                break;
        default:
                device_broadcast_event(&alias->dev, ev);
@@ -99,15 +111,19 @@ static void alias_device_cb(struct device_user *dep, enum device_event 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);
+       device_init_virtual(&alias->dev, devtype, NULL);
        alias->avl.key = alias->name;
        avl_insert(&aliases, &alias->avl);
        alias->dep.alias = true;
@@ -122,6 +138,8 @@ static void alias_device_free(struct device *dev)
        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);
 }
@@ -143,7 +161,7 @@ static int alias_check_state(struct device *dev)
        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,
@@ -173,7 +191,7 @@ device_alias_get(const char *name)
        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)