X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.c;h=ea94966f18fd77f4389ecbceca1da66d63c54407;hp=b93df63f211b205cc6d04ef3a1136d26a2d8c208;hb=f048a16b464295a4e0a4f4c1210f06343ad31231;hpb=5a3eb5a77d7c491a31818c4dfdcf8fd7dcaaadb2

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index b93df63f2..ea94966f1 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -30,6 +30,7 @@ int link_new(Manager *manager, struct udev_device *device, Link **ret) {
         _cleanup_link_free_ Link *link = NULL;
         const char *mac;
         struct ether_addr *mac_addr;
+        const char *ifname;
         int r;
 
         assert(device);
@@ -53,6 +54,9 @@ int link_new(Manager *manager, struct udev_device *device, Link **ret) {
                         memcpy(&link->mac, mac_addr, sizeof(struct ether_addr));
         }
 
+        ifname = udev_device_get_sysname(device);
+        link->ifname = strdup(ifname);
+
         r = hashmap_put(manager->links, &link->ifindex, link);
         if (r < 0)
                 return r;
@@ -71,6 +75,8 @@ void link_free(Link *link) {
 
         hashmap_remove(link->manager->links, &link->ifindex);
 
+        free(link->ifname);
+
         free(link);
 }
 
@@ -79,6 +85,7 @@ int link_add(Manager *m, struct udev_device *device) {
         Network *network;
         int r;
         uint64_t ifindex;
+        const char *devtype;
 
         assert(m);
         assert(device);
@@ -90,10 +97,17 @@ int link_add(Manager *m, struct udev_device *device) {
 
         r = link_new(m, device, &link);
         if (r < 0) {
-                log_error("could not create link: %s", strerror(-r));
+                log_error("Could not create link: %s", strerror(-r));
                 return r;
         }
 
+        devtype = udev_device_get_devtype(device);
+        if (streq_ptr(devtype, "bridge")) {
+                r = bridge_set_link(m, link);
+                if (r < 0)
+                        return r == -ENOENT ? 0 : r;
+        }
+
         r = network_get(m, device, &network);
         if (r < 0)
                 return r == -ENOENT ? 0 : r;
@@ -106,34 +120,20 @@ int link_add(Manager *m, struct udev_device *device) {
 }
 
 static int link_enter_configured(Link *link) {
-        log_info("Link configured successfully.");
+        assert(link);
+        assert(link->state == LINK_STATE_SETTING_ROUTES);
+
+        log_info("Link '%s' configured", link->ifname);
 
         link->state = LINK_STATE_CONFIGURED;
 
         return 0;
 }
 
-static int link_enter_failed(Link *link) {
-        log_warning("Could not configure link.");
+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 %u", (unsigned)link->ifindex);
-
-        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) {
@@ -141,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 --;
 
@@ -149,14 +149,14 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
                 return 1;
 
         r = sd_rtnl_message_get_errno(m);
-        if (r < 0 && r != -EEXIST) {
-                log_warning("Could not set route on interface %u: %s",
-                            (unsigned)link->ifindex, strerror(-r));
-                return link_enter_failed(link);
-        }
+        if (r < 0 && r != -EEXIST)
+                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;
 }
@@ -168,36 +168,33 @@ 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);
+        if (!link->network->static_routes)
+                return link_enter_configured(link);
 
-        LIST_FOREACH(routes, route, link->network->routes) {
+        LIST_FOREACH(static_routes, route, link->network->static_routes) {
                 r = route_configure(route, link, &route_handler);
-                if (r < 0)
+                if (r < 0) {
+                        log_warning("Could not set routes for link '%s'", link->ifname);
                         link_enter_failed(link);
+                        return r;
+                }
+
+                link->rtnl_messages ++;
         }
 
         return 0;
 }
 
-static int link_enter_addresses_set(Link *link) {
-        log_info("Addresses set for link %u", (unsigned)link->ifindex);
-
-        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 --;
 
@@ -205,14 +202,14 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
                 return 1;
 
         r = sd_rtnl_message_get_errno(m);
-        if (r < 0 && r != -EEXIST) {
-                log_warning("Could not set address on interface %u: %s",
-                            (unsigned)link->ifindex, strerror(-r));
-                link_enter_failed(link);
-        }
+        if (r < 0 && r != -EEXIST)
+                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;
 }
@@ -223,44 +220,155 @@ 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->static_addresses)
+                return link_enter_set_routes(link);
 
-        LIST_FOREACH(addresses, address, link->network->addresses) {
+        LIST_FOREACH(static_addresses, address, link->network->static_addresses) {
                 r = address_configure(address, link, &address_handler);
-                if (r < 0)
+                if (r < 0) {
+                        log_warning("Could not set addresses for link '%s'", link->ifname);
                         link_enter_failed(link);
+                        return r;
+                }
+
+                link->rtnl_messages ++;
         }
 
         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) {
-                log_warning("Could not bring up interface %u: %s",
-                            (unsigned)link->ifindex, strerror(-r));
-                return link_enter_failed(link);
+                log_warning("Could not bring up interface '%s': %s",
+                            link->ifname, strerror(-r));
+                link_enter_failed(link);
         }
 
-        link->flags |= IFF_UP;
+        return 1;
+}
 
-        log_info("Link is UP.");
+static int link_up(Link *link) {
+        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+        int r;
 
-        if (link->state == LINK_STATE_ROUTES_SET)
-                return link_enter_configured(link);
+        assert(link);
+        assert(link->manager);
+        assert(link->manager->rtnl);
+
+        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 set link flags");
+                return r;
+        }
+
+        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;
+        }
+
+        return 0;
+}
+
+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) {
+                link_enter_failed(link);
+                return r;
+        }
+
+        r = link_enter_set_addresses(link);
+        if (r < 0) {
+                link_enter_failed(link);
+                return r;
+        }
+
+        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_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': %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_bridge_joined(link);
 
         return 1;
 }
 
-static int link_up(Link *link) {
+static int link_enter_join_bridge(Link *link) {
+        int r;
+
+        assert(link);
+        assert(link->network);
+        assert(link->state == _LINK_STATE_INVALID);
+
+        link->state = LINK_STATE_JOINING_BRIDGE;
+
+        if (!link->network->bridge)
+                return link_bridge_joined(link);
+
+        r = bridge_join(link->network->bridge, link, &bridge_handler);
+        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;
 
@@ -268,13 +376,13 @@ 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_GETLINK, link->ifindex, &req);
         if (r < 0) {
-                log_error("Could not allocate RTM_NEWLINK message");
+                log_error("Could not allocate RTM_GETLINK message");
                 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_get_handler, link, 0, NULL);
         if (r < 0) {
                 log_error("Could not send rtnetlink message: %s", strerror(-r));
                 return r;
@@ -286,13 +394,47 @@ static int link_up(Link *link) {
 int link_configure(Link *link) {
         int r;
 
-        r = link_up(link);
-        if (r < 0)
-                return link_enter_failed(link);
+        assert(link);
+        assert(link->network);
+        assert(link->state == _LINK_STATE_INVALID);
 
-        r = link_enter_set_addresses(link);
+        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;
 }