utils.c: add missing include

[project/netifd.git] / alias.c

diff --git a/alias.c b/alias.c
index e77deff..cef125f 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -25,12 +25,42 @@ struct alias_device {
        struct avl_node avl;
        struct device dev;
        struct device_user dep;
        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;
 
        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)
+               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);
+               strcpy(alias->dev.ifname, dev->ifname);
+               device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
+               device_add_user(&alias->dep, dev);
+       } else {
+               alias->dev.ifname[0] = 0;
+               device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
+       }
+}
+

 static int
 alias_device_set_state(struct device *dev, bool state)
 {
 static int
 alias_device_set_state(struct device *dev, bool state)
 {


@@ -44,22 +74,31 @@ alias_device_set_state(struct device *dev, bool state)
                return device_claim(&alias->dep);
 
        device_release(&alias->dep);
                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;
        return 0;
 }
 
 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:
 
        alias = container_of(dep, struct alias_device, dep);
        switch (ev) {
        case DEV_EVENT_ADD:

-               present = true;
+               new_state = true;

        case DEV_EVENT_REMOVE:
        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);
                break;
        default:
                device_broadcast_event(&alias->dev, ev);


@@ -95,27 +134,6 @@ static void alias_device_free(struct device *dev)
        free(alias);
 }
 
        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;
 static int alias_check_state(struct device *dev)
 {
        struct alias_device *alias;


@@ -128,7 +146,7 @@ static int alias_check_state(struct device *dev)
        if (iface && iface->state == IFS_UP)
                ndev = iface->l3_dev.dev;
 
        if (iface && iface->state == IFS_UP)
                ndev = iface->l3_dev.dev;
 

-       __alias_notify_device(alias, ndev);
+       alias_set_device(alias, ndev);

 
        return 0;
 }
 
        return 0;
 }


@@ -149,7 +167,7 @@ alias_notify_device(const char *name, struct device *dev)
 
        alias = avl_find_element(&aliases, name, alias, avl);
        if (alias)
 
        alias = avl_find_element(&aliases, name, alias, avl);
        if (alias)

-               __alias_notify_device(alias, dev);
+               alias_set_device(alias, dev);

 
        device_unlock();
 }
 
        device_unlock();
 }