chiark / gitweb /
dhcp: fix creation of req_opts array
[elogind.git] / src / network / networkd-link.c
index 09de862819c69cb3a8bd029110c143b63a12c62a..cc5441bc3f088e8e3d94908331fe8c78c878df4f 100644 (file)
@@ -120,6 +120,9 @@ int link_add(Manager *m, struct udev_device *device) {
 }
 
 static int link_enter_configured(Link *link) {
+        assert(link);
+        assert(link->state == LINK_STATE_SETTING_ROUTES);
+
         log_info("Link '%s' configured", link->ifname);
 
         link->state = LINK_STATE_CONFIGURED;
@@ -127,27 +130,10 @@ static int link_enter_configured(Link *link) {
         return 0;
 }
 
-static int link_enter_failed(Link *link) {
-        log_warning("Could not configure link '%s'", link->ifname);
+static void link_enter_failed(Link *link) {
+        assert(link);
 
         link->state = LINK_STATE_FAILED;
-
-        return 0;
-}
-
-static bool link_is_up(Link *link) {
-        return link->flags & IFF_UP;
-}
-
-static int link_enter_routes_set(Link *link) {
-        log_info("Routes set for link '%s'", link->ifname);
-
-        if (link_is_up(link))
-                return link_enter_configured(link);
-
-        link->state = LINK_STATE_ROUTES_SET;
-
-        return 0;
 }
 
 static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
@@ -155,7 +141,7 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         int r;
 
         assert(link->rtnl_messages > 0);
-        assert(link->state == LINK_STATE_SET_ROUTES || link->state == LINK_STATE_FAILED);
+        assert(link->state == LINK_STATE_SETTING_ROUTES || link->state == LINK_STATE_FAILED);
 
         link->rtnl_messages --;
 
@@ -167,8 +153,10 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
                 log_warning("Could not set route on interface '%s': %s",
                             link->ifname, strerror(-r));
 
-        if (link->rtnl_messages == 0)
-                return link_enter_routes_set(link);
+        if (link->rtnl_messages == 0) {
+                log_info("Routes set for link '%s'", link->ifname);
+                link_enter_configured(link);
+        }
 
         return 1;
 }
@@ -180,17 +168,20 @@ static int link_enter_set_routes(Link *link) {
         assert(link);
         assert(link->network);
         assert(link->rtnl_messages == 0);
-        assert(link->state == LINK_STATE_ADDRESSES_SET);
+        assert(link->state == LINK_STATE_SETTING_ADDRESSES);
 
-        link->state = LINK_STATE_SET_ROUTES;
+        link->state = LINK_STATE_SETTING_ROUTES;
 
         if (!link->network->routes)
-                return link_enter_routes_set(link);
+                return link_enter_configured(link);
 
         LIST_FOREACH(routes, route, link->network->routes) {
                 r = route_configure(route, link, &route_handler);
-                if (r < 0)
-                        return link_enter_failed(link);
+                if (r < 0) {
+                        log_warning("Could not set routes for link '%s'", link->ifname);
+                        link_enter_failed(link);
+                        return r;
+                }
 
                 link->rtnl_messages ++;
         }
@@ -198,20 +189,12 @@ static int link_enter_set_routes(Link *link) {
         return 0;
 }
 
-static int link_enter_addresses_set(Link *link) {
-        log_info("Addresses set for link '%s'", link->ifname);
-
-        link->state = LINK_STATE_ADDRESSES_SET;
-
-        return link_enter_set_routes(link);
-}
-
 static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         Link *link = userdata;
         int r;
 
         assert(link->rtnl_messages > 0);
-        assert(link->state == LINK_STATE_SET_ADDRESSES || link->state == LINK_STATE_FAILED);
+        assert(link->state == LINK_STATE_SETTING_ADDRESSES || link->state == LINK_STATE_FAILED);
 
         link->rtnl_messages --;
 
@@ -223,8 +206,10 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
                 log_warning("Could not set address on interface '%s': %s",
                             link->ifname, strerror(-r));
 
-        if (link->rtnl_messages == 0)
-                link_enter_addresses_set(link);
+        if (link->rtnl_messages == 0) {
+                log_info("Addresses set for link '%s'", link->ifname);
+                link_enter_set_routes(link);
+        }
 
         return 1;
 }
@@ -235,17 +220,21 @@ static int link_enter_set_addresses(Link *link) {
 
         assert(link);
         assert(link->network);
+        assert(link->state == LINK_STATE_JOINING_BRIDGE);
         assert(link->rtnl_messages == 0);
 
-        if (!link->network->addresses)
-                return link_enter_addresses_set(link);
+        link->state = LINK_STATE_SETTING_ADDRESSES;
 
-        link->state = LINK_STATE_SET_ADDRESSES;
+        if (!link->network->addresses)
+                return link_enter_set_routes(link);
 
         LIST_FOREACH(addresses, address, link->network->addresses) {
                 r = address_configure(address, link, &address_handler);
-                if (r < 0)
-                        return link_enter_failed(link);
+                if (r < 0) {
+                        log_warning("Could not set addresses for link '%s'", link->ifname);
+                        link_enter_failed(link);
+                        return r;
+                }
 
                 link->rtnl_messages ++;
         }
@@ -253,21 +242,16 @@ static int link_enter_set_addresses(Link *link) {
         return 0;
 }
 
-static int link_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         Link *link = userdata;
         int r;
 
         r = sd_rtnl_message_get_errno(m);
-        if (r < 0)
+        if (r < 0) {
                 log_warning("Could not bring up interface '%s': %s",
                             link->ifname, strerror(-r));
-
-        link->flags |= IFF_UP;
-
-        log_info("Link '%s' is up", link->ifname);
-
-        if (link->state == LINK_STATE_ROUTES_SET)
-                return link_enter_configured(link);
+                link_enter_failed(link);
+        }
 
         return 1;
 }
@@ -280,13 +264,19 @@ static int link_up(Link *link) {
         assert(link->manager);
         assert(link->manager->rtnl);
 
-        r = sd_rtnl_message_link_new(RTM_NEWLINK, link->ifindex, 0, IFF_UP, &req);
+        r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
+        if (r < 0) {
+                log_error("Could not allocate RTM_SETLINK message");
+                return r;
+        }
+
+        r = sd_rtnl_message_link_set_flags(req, IFF_UP);
         if (r < 0) {
-                log_error("Could not allocate RTM_NEWLINK message");
+                log_error("Could not set link flags");
                 return r;
         }
 
-        r = sd_rtnl_call_async(link->manager->rtnl, req, link_handler, link, 0, NULL);
+        r = sd_rtnl_call_async(link->manager->rtnl, req, link_up_handler, link, 0, NULL);
         if (r < 0) {
                 log_error("Could not send rtnetlink message: %s", strerror(-r));
                 return r;
@@ -295,33 +285,48 @@ static int link_up(Link *link) {
         return 0;
 }
 
-static int link_enter_bridge_joined(Link *link) {
+static int link_bridge_joined(Link *link) {
         int r;
 
+        assert(link);
+        assert(link->state == LINK_STATE_JOINING_BRIDGE);
+
         r = link_up(link);
-        if (r < 0)
-                return link_enter_failed(link);
+        if (r < 0) {
+                link_enter_failed(link);
+                return r;
+        }
 
-        link->state = LINK_STATE_BRIDGE_JOINED;
+        r = link_enter_set_addresses(link);
+        if (r < 0) {
+                link_enter_failed(link);
+                return r;
+        }
 
-        return link_enter_set_addresses(link);
+        return 0;
 }
 
 static int bridge_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         Link *link = userdata;
         int r;
 
-        assert(link->state == LINK_STATE_JOIN_BRIDGE || link->state == LINK_STATE_FAILED);
+        assert(link->state == LINK_STATE_JOINING_BRIDGE || link->state == LINK_STATE_FAILED);
+        assert(link->network);
 
         if (link->state == LINK_STATE_FAILED)
                 return 1;
 
         r = sd_rtnl_message_get_errno(m);
-        if (r < 0)
-                log_warning("Could not join interface '%s' to bridge: %s",
-                            link->ifname, strerror(-r));
+        if (r < 0) {
+                log_warning("Could not join interface '%s' to bridge '%s': %s",
+                            link->ifname, link->network->bridge->name, strerror(-r));
+                link_enter_failed(link);
+                return 1;
+        } else
+                log_info("Join interface '%s' to bridge: %s",
+                            link->ifname, link->network->bridge->name);
 
-        link_enter_bridge_joined(link);
+        link_bridge_joined(link);
 
         return 1;
 }
@@ -331,15 +336,57 @@ static int link_enter_join_bridge(Link *link) {
 
         assert(link);
         assert(link->network);
+        assert(link->state == _LINK_STATE_INVALID);
 
-        if (!link->network->bridge)
-                return link_enter_bridge_joined(link);
+        link->state = LINK_STATE_JOINING_BRIDGE;
 
-        link->state = LINK_STATE_JOIN_BRIDGE;
+        if (!link->network->bridge)
+                return link_bridge_joined(link);
 
         r = bridge_join(link->network->bridge, link, &bridge_handler);
-        if (r < 0)
-                return link_enter_failed(link);
+        if (r < 0) {
+                log_warning("Could not join link '%s' to bridge '%s'", link->ifname,
+                            link->network->bridge->name);
+                link_enter_failed(link);
+                return r;
+        }
+
+        return 0;
+}
+
+static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+        Link *link = userdata;
+        int r;
+
+        r = sd_rtnl_message_get_errno(m);
+        if (r < 0) {
+                log_warning("Could not get state of interface '%s': %s",
+                            link->ifname, strerror(-r));
+                link_enter_failed(link);
+        }
+
+        return 1;
+}
+
+static int link_get(Link *link) {
+        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+        int r;
+
+        assert(link);
+        assert(link->manager);
+        assert(link->manager->rtnl);
+
+        r = sd_rtnl_message_link_new(RTM_GETLINK, link->ifindex, &req);
+        if (r < 0) {
+                log_error("Could not allocate RTM_GETLINK message");
+                return r;
+        }
+
+        r = sd_rtnl_call_async(link->manager->rtnl, req, link_get_handler, link, 0, NULL);
+        if (r < 0) {
+                log_error("Could not send rtnetlink message: %s", strerror(-r));
+                return r;
+        }
 
         return 0;
 }
@@ -347,9 +394,47 @@ static int link_enter_join_bridge(Link *link) {
 int link_configure(Link *link) {
         int r;
 
+        assert(link);
+        assert(link->network);
+        assert(link->state == _LINK_STATE_INVALID);
+
+        r = link_get(link);
+        if (r < 0) {
+                link_enter_failed(link);
+                return r;
+        }
+
         r = link_enter_join_bridge(link);
         if (r < 0)
-                return link_enter_failed(link);
+                return r;
+
+        return 0;
+}
+
+int link_update(Link *link, sd_rtnl_message *m) {
+        unsigned flags;
+        int r;
+
+        assert(link);
+        assert(m);
+
+        r = sd_rtnl_message_link_get_flags(m, &flags);
+        if (r < 0) {
+                log_warning("Could not get link flags of '%s'", link->ifname);
+                return r;
+        }
+
+        if (link->flags & IFF_UP && !(flags & IFF_UP))
+                log_info("Interface '%s' is down", link->ifname);
+        else if (!(link->flags & IFF_UP) && flags & IFF_UP)
+                log_info("Interface '%s' is up", link->ifname);
+
+        if (link->flags & IFF_LOWER_UP && !(flags & IFF_LOWER_UP))
+                log_info("Interface '%s' is disconnected", link->ifname);
+        else if (!(link->flags & IFF_LOWER_UP) && flags & IFF_LOWER_UP)
+                log_info("Interface '%s' is connected", link->ifname);
+
+        link->flags = flags;
 
         return 0;
 }