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=444af8f6db18b64bbc36ac3da1c31bb23bc5d817;hp=447b2a91e69a9df101185f25a45035afa5d3560e;hb=1346b1f0388f4100bb3c2a2bb23bc881769c020c;hpb=22936833e177d9e477e059ec2b4f4fa9213b4e19

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 447b2a91e..444af8f6d 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -25,6 +25,7 @@
 #include "networkd.h"
 #include "libudev-private.h"
 #include "util.h"
+#include "bus-util.h"
 
 int link_new(Manager *manager, struct udev_device *device, Link **ret) {
         _cleanup_link_free_ Link *link = NULL;
@@ -73,6 +74,15 @@ void link_free(Link *link) {
 
         assert(link->manager);
 
+        if (link->dhcp)
+                sd_dhcp_client_free(link->dhcp);
+
+        route_free(link->dhcp_route);
+        link->dhcp_route = NULL;
+
+        address_free(link->dhcp_address);
+        link->dhcp_address = NULL;
+
         hashmap_remove(link->manager->links, &link->ifindex);
 
         free(link->ifname);
@@ -80,7 +90,7 @@ void link_free(Link *link) {
         free(link);
 }
 
-int link_add(Manager *m, struct udev_device *device) {
+int link_add(Manager *m, struct udev_device *device, Link **ret) {
         Link *link;
         Network *network;
         int r;
@@ -92,20 +102,22 @@ int link_add(Manager *m, struct udev_device *device) {
 
         ifindex = udev_device_get_ifindex(device);
         link = hashmap_get(m->links, &ifindex);
-        if (link)
-                return 0;
+        if (link) {
+                *ret = link;
+                return -EEXIST;
+        }
 
         r = link_new(m, device, &link);
-        if (r < 0) {
-                log_error("Could not create link: %s", strerror(-r));
+        if (r < 0)
                 return r;
-        }
+
+        *ret = link;
 
         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;
+                if (r < 0 && r != -ENOENT)
+                        return r;
         }
 
         r = network_get(m, device, &network);
@@ -120,38 +132,46 @@ int link_add(Manager *m, struct udev_device *device) {
 }
 
 static int link_enter_configured(Link *link) {
-        log_info("Link '%s' configured", link->ifname);
+        assert(link);
+        assert(link->state == LINK_STATE_SETTING_ROUTES);
+
+        log_info_link(link, "link configured");
 
         link->state = LINK_STATE_CONFIGURED;
 
         return 0;
 }
 
-static int link_enter_failed(Link *link) {
-        link->state = LINK_STATE_FAILED;
+static void link_enter_failed(Link *link) {
+        assert(link);
 
-        return 0;
+        log_warning_link(link, "failed");
+
+        link->state = LINK_STATE_FAILED;
 }
 
 static int route_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_ROUTES || link->state == LINK_STATE_FAILED);
+        assert(link->route_messages > 0);
+        assert(link->state == LINK_STATE_SETTING_ADDRESSES ||
+               link->state == LINK_STATE_SETTING_ROUTES ||
+               link->state == LINK_STATE_FAILED);
 
-        link->rtnl_messages --;
+        link->route_messages --;
 
         if (link->state == LINK_STATE_FAILED)
                 return 1;
 
         r = sd_rtnl_message_get_errno(m);
         if (r < 0 && r != -EEXIST)
-                log_warning("Could not set route on interface '%s': %s",
-                            link->ifname, strerror(-r));
+                log_warning_link(link, "could not set route: %s", strerror(-r));
 
-        if (link->rtnl_messages == 0) {
-                log_info("Routes set for link '%s'", link->ifname);
+        /* we might have received an old reply after moving back to SETTING_ADDRESSES,
+         * ignore it */
+        if (link->route_messages == 0 && link->state == LINK_STATE_SETTING_ROUTES) {
+                log_debug_link(link, "routes set");
                 link_enter_configured(link);
         }
 
@@ -164,53 +184,68 @@ 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)
+        if (!link->network->static_routes && !link->dhcp_route)
                 return link_enter_configured(link);
 
-        LIST_FOREACH(routes, route, link->network->routes) {
+        log_debug_link(link, "setting routes");
+
+        LIST_FOREACH(static_routes, route, link->network->static_routes) {
                 r = route_configure(route, link, &route_handler);
                 if (r < 0) {
-                        log_warning("Could not set routes for link '%s'", link->ifname);
-                        return link_enter_failed(link);
+                        log_warning_link(link,
+                                         "could not set routes: %s", strerror(-r));
+                        link_enter_failed(link);
+                        return r;
                 }
 
-                link->rtnl_messages ++;
+                link->route_messages ++;
         }
 
-        return 0;
-}
+        if (link->dhcp_route) {
+                r = route_configure(link->dhcp_route, link, &route_handler);
+                if (r < 0) {
+                        log_warning_link(link,
+                                         "could not set routes: %s", strerror(-r));
+                        link_enter_failed(link);
+                        return r;
+                }
 
-static int link_enter_addresses_set(Link *link) {
-        link->state = LINK_STATE_ADDRESSES_SET;
+                link->route_messages ++;
+        }
 
-        return link_enter_set_routes(link);
+        return 0;
 }
 
 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(m);
+        assert(link);
+        assert(link->ifname);
+        assert(link->addr_messages > 0);
+        assert(link->state == LINK_STATE_SETTING_ADDRESSES || link->state == LINK_STATE_FAILED);
 
-        link->rtnl_messages --;
+        link->addr_messages --;
 
         if (link->state == LINK_STATE_FAILED)
                 return 1;
 
         r = sd_rtnl_message_get_errno(m);
         if (r < 0 && r != -EEXIST)
-                log_warning("Could not set address on interface '%s': %s",
-                            link->ifname, strerror(-r));
-
-        if (link->rtnl_messages == 0) {
-                log_info("Addresses set for link '%s'", link->ifname);
-                link_enter_addresses_set(link);
+                log_struct_link(LOG_ERR, link,
+                                "MESSAGE=%s: could not set address: %s",
+                                link->ifname, strerror(-r),
+                                "ERRNO=%d", -r,
+                                NULL);
+
+        if (link->addr_messages == 0) {
+                log_debug_link(link, "addresses set");
+                link_enter_set_routes(link);
         }
 
         return 1;
@@ -222,41 +257,119 @@ static int link_enter_set_addresses(Link *link) {
 
         assert(link);
         assert(link->network);
-        assert(link->rtnl_messages == 0);
+        assert(link->state != _LINK_STATE_INVALID);
+
+        link->state = LINK_STATE_SETTING_ADDRESSES;
 
-        if (!link->network->addresses)
-                return link_enter_addresses_set(link);
+        if (!link->network->static_addresses && !link->dhcp_address)
+                return link_enter_set_routes(link);
 
-        link->state = LINK_STATE_SET_ADDRESSES;
+        log_debug_link(link, "setting addresses");
 
-        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) {
-                        log_warning("Could not set addresses for link '%s'", link->ifname);
-                        return link_enter_failed(link);
+                        log_warning_link(link,
+                                         "could not set addresses: %s", strerror(-r));
+                        link_enter_failed(link);
+                        return r;
                 }
 
-                link->rtnl_messages ++;
+                link->addr_messages ++;
+        }
+
+        if (link->dhcp_address) {
+                r = address_configure(link->dhcp_address, link, &address_handler);
+                if (r < 0) {
+                        log_warning_link(link,
+                                         "could not set addresses: %s", strerror(-r));
+                        link_enter_failed(link);
+                        return r;
+                }
+
+                link->addr_messages ++;
         }
 
         return 0;
 }
 
-static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         Link *link = userdata;
         int r;
 
+        assert(m);
+        assert(link);
+        assert(link->ifname);
+
+        if (link->state == LINK_STATE_FAILED)
+                return 1;
+
         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);
-        }
+        if (r < 0 && r != -EEXIST)
+                log_warning_link(link, "could not drop address: %s", strerror(-r));
 
         return 1;
 }
 
-static int link_get(Link *link) {
+static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
+        int r;
+
+        r = sd_bus_message_get_errno(m);
+        if (r < 0)
+                log_warning("Could not set hostname: %s", strerror(-r));
+
+        return 1;
+}
+
+static int set_hostname(sd_bus *bus, const char *hostname) {
+        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+        int r = 0;
+
+        assert(bus);
+        assert(hostname);
+
+        log_debug("Setting transient hostname: '%s'", hostname);
+
+        r = sd_bus_message_new_method_call(
+                        bus,
+                        "org.freedesktop.hostname1",
+                        "/org/freedesktop/hostname1",
+                        "org.freedesktop.hostname1",
+                        "SetHostname",
+                        &m);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_append(m, "sb", hostname, false);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_call_async(bus, m, set_hostname_handler, NULL, 0, NULL);
+        if (r < 0)
+                log_error("Could not set transient hostname: %s", strerror(-r));
+
+        return r;
+}
+
+static int set_mtu_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+        Link *link = userdata;
+        int r;
+
+        assert(m);
+        assert(link);
+        assert(link->ifname);
+
+        if (link->state == LINK_STATE_FAILED)
+                return 1;
+
+        r = sd_rtnl_message_get_errno(m);
+        if (r < 0 && r != -EEXIST)
+                log_warning_link(link, "Could not set MTU: %s", strerror(-r));
+
+        return 1;
+}
+
+static int link_set_mtu(Link *link, uint32_t mtu) {
         _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
         int r;
 
@@ -264,32 +377,314 @@ static int link_get(Link *link) {
         assert(link->manager);
         assert(link->manager->rtnl);
 
-        r = sd_rtnl_message_link_new(RTM_GETLINK, link->ifindex, &req);
+        log_debug_link(link, "setting MTU: %" PRIu32, mtu);
+
+        r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
         if (r < 0) {
-                log_error("Could not allocate RTM_GETLINK message");
+                log_error_link(link, "Could not allocate RTM_SETLINK message");
                 return r;
         }
 
-        r = sd_rtnl_call_async(link->manager->rtnl, req, link_get_handler, link, 0, NULL);
+        r = sd_rtnl_message_append_u32(req, IFLA_MTU, mtu);
+        if (r < 0) {
+                log_error_link(link, "Could not append MTU: %s", strerror(-r));
+                return r;
+        }
+
+        r = sd_rtnl_call_async(link->manager->rtnl, req, set_mtu_handler, link, 0, NULL);
         if (r < 0) {
-                log_error("Could not send rtnetlink message: %s", strerror(-r));
+                log_error_link(link,
+                               "Could not send rtnetlink message: %s", strerror(-r));
                 return r;
         }
 
         return 0;
 }
 
+static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
+        Link *link = userdata;
+        struct in_addr address;
+        struct in_addr netmask;
+        struct in_addr gateway;
+        int prefixlen;
+        int r;
+
+        assert(link);
+        assert(link->network);
+        assert(link->manager);
+
+        if (link->state == LINK_STATE_FAILED)
+                return;
+
+        if (event < 0) {
+                log_warning_link(link, "DHCP error: %s", strerror(-event));
+                link_enter_failed(link);
+                return;
+        }
+
+        if (event == DHCP_EVENT_NO_LEASE)
+                log_debug_link(link, "IP address in use.");
+
+        if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_EXPIRED ||
+            event == DHCP_EVENT_STOP) {
+                if (link->dhcp_address) {
+                        address_drop(link->dhcp_address, link, address_drop_handler);
+
+                        address_free(link->dhcp_address);
+                        link->dhcp_address = NULL;
+                }
+
+                if (link->dhcp_route) {
+                        route_free(link->dhcp_route);
+                        link->dhcp_route = NULL;
+                }
+
+                if (link->network->dhcp_mtu) {
+                        uint16_t mtu;
+
+                        r = sd_dhcp_client_get_mtu(client, &mtu);
+                        if (r >= 0 && link->original_mtu != mtu) {
+                                r = link_set_mtu(link, link->original_mtu);
+                                if (r < 0) {
+                                        log_warning_link(link, "DHCP error: could not reset MTU");
+                                        link_enter_failed(link);
+                                        return;
+                                }
+                        }
+                }
+
+                if (link->network->dhcp_hostname) {
+                        r = set_hostname(link->manager->bus, "");
+                        if (r < 0)
+                                log_error("Failed to reset transient hostname");
+                }
+        }
+
+        r = sd_dhcp_client_get_address(client, &address);
+        if (r < 0) {
+                log_warning_link(link, "DHCP error: no address");
+                link_enter_failed(link);
+                return;
+        }
+
+        r = sd_dhcp_client_get_netmask(client, &netmask);
+        if (r < 0) {
+                log_warning_link(link, "DHCP error: no netmask");
+                link_enter_failed(link);
+                return;
+        }
+
+        prefixlen = sd_dhcp_client_prefixlen(&netmask);
+        if (prefixlen < 0) {
+                log_warning_link(link, "DHCP error: no prefixlen");
+                link_enter_failed(link);
+                return;
+        }
+
+        r = sd_dhcp_client_get_router(client, &gateway);
+        if (r < 0) {
+                log_warning_link(link, "DHCP error: no router");
+                link_enter_failed(link);
+                return;
+        }
+
+        if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_IP_ACQUIRE) {
+                _cleanup_address_free_ Address *addr = NULL;
+                _cleanup_route_free_ Route *rt = NULL;
+                struct in_addr **nameservers;
+
+                log_struct_link(LOG_INFO, link,
+                                "MESSAGE=%s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u",
+                                link->ifname,
+                                ADDRESS_FMT_VAL(address),
+                                prefixlen,
+                                ADDRESS_FMT_VAL(gateway),
+                                "ADDRESS=%u.%u.%u.%u",
+                                ADDRESS_FMT_VAL(address),
+                                "PREFIXLEN=%u",
+                                prefixlen,
+                                "GATEWAY=%u.%u.%u.%u",
+                                ADDRESS_FMT_VAL(gateway),
+                                NULL);
+
+                r = address_new_dynamic(&addr);
+                if (r < 0) {
+                        log_error_link(link, "Could not allocate address");
+                        link_enter_failed(link);
+                        return;
+                }
+
+                addr->family = AF_INET;
+                addr->in_addr.in = address;
+                addr->prefixlen = prefixlen;
+                addr->netmask = netmask;
+
+                r = route_new_dynamic(&rt);
+                if (r < 0) {
+                        log_error_link(link, "Could not allocate route");
+                        link_enter_failed(link);
+                        return;
+                }
+
+                rt->family = AF_INET;
+                rt->in_addr.in = gateway;
+
+                link->dhcp_address = addr;
+                link->dhcp_route = rt;
+                addr = NULL;
+                rt = NULL;
+
+                if (link->network->dhcp_dns) {
+                        r = sd_dhcp_client_get_dns(client, &nameservers);
+                        if (r >= 0) {
+                                r = manager_update_resolv_conf(link->manager);
+                                if (r < 0)
+                                        log_error("Failed to update resolv.conf");
+                        }
+                }
+
+                if (link->network->dhcp_mtu) {
+                        uint16_t mtu;
+
+                        r = sd_dhcp_client_get_mtu(client, &mtu);
+                        if (r >= 0) {
+                                r = link_set_mtu(link, mtu);
+                                if (r < 0)
+                                        log_error_link(link, "Failed to set MTU "
+                                                             "to %" PRIu16, mtu);
+                        }
+                }
+
+                if (link->network->dhcp_hostname) {
+                        const char *hostname;
+
+                        r = sd_dhcp_client_get_hostname(client, &hostname);
+                        if (r >= 0) {
+                                r = set_hostname(link->manager->bus, hostname);
+                                if (r < 0)
+                                        log_error("Failed to set transient hostname "
+                                                  "to '%s'", hostname);
+                        }
+                }
+
+                link_enter_set_addresses(link);
+        }
+
+        return;
+}
+
+static int link_acquire_conf(Link *link) {
+        int r;
+
+        assert(link);
+        assert(link->network);
+        assert(link->network->dhcp);
+        assert(link->manager);
+        assert(link->manager->event);
+
+        if (!link->dhcp) {
+                link->dhcp = sd_dhcp_client_new(link->manager->event);
+                if (!link->dhcp)
+                        return -ENOMEM;
+
+                r = sd_dhcp_client_set_index(link->dhcp, link->ifindex);
+                if (r < 0)
+                        return r;
+
+                r = sd_dhcp_client_set_mac(link->dhcp, &link->mac);
+                if (r < 0)
+                        return r;
+
+                r = sd_dhcp_client_set_callback(link->dhcp, dhcp_handler, link);
+                if (r < 0)
+                        return r;
+
+                if (link->network->dhcp_mtu) {
+                        r = sd_dhcp_client_set_request_option(link->dhcp, 26);
+                        if (r < 0)
+                                return r;
+                }
+        }
+
+        log_debug_link(link, "acquiring DHCPv4 lease");
+
+        r = sd_dhcp_client_start(link->dhcp);
+        if (r < 0)
+                return r;
+
+        return 0;
+}
+
+static int link_update_flags(Link *link, unsigned flags) {
+        int r;
+
+        assert(link);
+        assert(link->network);
+
+        if (link->state == LINK_STATE_FAILED)
+                return 0;
+
+        if (link->flags == flags) {
+                log_debug_link(link, "link status unchanged: %#.8x", flags);
+                return 0;
+        }
+
+        if ((link->flags & IFF_UP) != (flags & IFF_UP))
+                log_info_link(link,
+                              "power %s", flags & IFF_UP ? "on": "off");
+
+        if ((link->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) {
+                if (flags & IFF_LOWER_UP) {
+                        log_info_link(link, "carrier on");
+
+                        if (link->network->dhcp) {
+                                r = link_acquire_conf(link);
+                                if (r < 0) {
+                                        log_warning_link(link, "Could not acquire DHCPv4 lease: %s", strerror(-r));
+                                        link_enter_failed(link);
+                                        return r;
+                                }
+                        }
+                } else {
+                        log_info_link(link, "carrier off");
+
+                        if (link->network->dhcp) {
+                                r = sd_dhcp_client_stop(link->dhcp);
+                                if (r < 0) {
+                                        log_warning_link(link, "Could not stop DHCPv4 client: %s", strerror(-r));
+                                        link_enter_failed(link);
+                                        return r;
+                                }
+                        }
+                }
+        }
+
+        log_debug_link(link,
+                       "link status updated: %#.8x -> %#.8x", link->flags, flags);
+
+        link->flags = flags;
+
+        return 0;
+}
+
 static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         Link *link = userdata;
         int r;
 
+        assert(link);
+
+        if (link->state == LINK_STATE_FAILED)
+                return 1;
+
         r = sd_rtnl_message_get_errno(m);
         if (r < 0) {
-                log_warning("Could not bring up interface '%s': %s",
-                            link->ifname, strerror(-r));
+                log_warning_link(link,
+                                 "could not bring up interface: %s", strerror(-r));
                 link_enter_failed(link);
         }
 
+        link_update_flags(link, link->flags | IFF_UP);
+
         return 1;
 }
 
@@ -301,57 +696,78 @@ static int link_up(Link *link) {
         assert(link->manager);
         assert(link->manager->rtnl);
 
+        log_debug_link(link, "bringing link up");
+
         r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
         if (r < 0) {
-                log_error("Could not allocate RTM_SETLINK message");
+                log_error_link(link, "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");
+                log_error_link(link, "Could not set link flags: %s", strerror(-r));
                 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));
+                log_error_link(link,
+                               "Could not send rtnetlink message: %s", strerror(-r));
                 return r;
         }
 
         return 0;
 }
 
-static int link_enter_bridge_joined(Link *link) {
+static int link_bridge_joined(Link *link) {
         int r;
 
-        link->state = LINK_STATE_BRIDGE_JOINED;
+        assert(link);
+        assert(link->state == LINK_STATE_JOINING_BRIDGE);
+        assert(link->network);
 
         r = link_up(link);
-        if (r < 0)
-                return link_enter_failed(link);
+        if (r < 0) {
+                link_enter_failed(link);
+                return r;
+        }
 
-        return link_enter_set_addresses(link);
+        if (!link->network->dhcp)
+                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);
+        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));
-        else
-                log_info("Join interface '%s' to bridge: %s",
-                            link->ifname, link->network->bridge->name);
+        if (r < 0) {
+                log_struct_link(LOG_ERR, link,
+                                "MESSAGE=%s: could not join bridge '%s': %s",
+                                link->ifname, link->network->bridge->name, strerror(-r),
+                                BRIDGE(link->network->bridge),
+                                NULL);
+                link_enter_failed(link);
+                return 1;
+        }
 
-        link_enter_bridge_joined(link);
+        log_struct_link(LOG_DEBUG, link,
+                        "MESSAGE=%s: joined bridge '%s'",
+                        link->network->bridge->name,
+                        BRIDGE(link->network->bridge),
+                        NULL);
+
+        link_bridge_joined(link);
 
         return 1;
 }
@@ -361,60 +777,124 @@ static int link_enter_join_bridge(Link *link) {
 
         assert(link);
         assert(link->network);
+        assert(link->state == _LINK_STATE_INVALID);
+
+        link->state = LINK_STATE_JOINING_BRIDGE;
 
         if (!link->network->bridge)
-                return link_enter_bridge_joined(link);
+                return link_bridge_joined(link);
 
-        link->state = LINK_STATE_JOIN_BRIDGE;
+        log_struct_link(LOG_DEBUG, link,
+                        "MESSAGE=%s: joining bridge '%s'",
+                        link->network->bridge->name,
+                        BRIDGE(link->network->bridge),
+                        NULL);
+        log_debug_link(link, "joining bridge");
 
         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);
-                return link_enter_failed(link);
+                log_struct_link(LOG_WARNING, link,
+                                "MESSAGE=%s: could not join bridge '%s': %s",
+                                link->network->bridge->name, strerror(-r),
+                                BRIDGE(link->network->bridge),
+                                NULL);
+                link_enter_failed(link);
+                return r;
         }
 
         return 0;
 }
 
-int link_configure(Link *link) {
+static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+        Link *link = userdata;
         int r;
 
-        r = link_get(link);
-        if (r < 0)
-                return link_enter_failed(link);
+        assert(link);
 
-        r = link_enter_join_bridge(link);
-        if (r < 0)
-                return link_enter_failed(link);
+        if (link->state == LINK_STATE_FAILED)
+                return 1;
+
+        r = sd_rtnl_message_get_errno(m);
+        if (r < 0) {
+                log_warning_link(link, "could not get state: %s", strerror(-r));
+                link_enter_failed(link);
+        }
+
+        log_debug_link(link, "got link state");
+
+        link_update(link, m);
+
+        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);
+
+        log_debug_link(link, "requesting link status");
+
+        r = sd_rtnl_message_link_new(RTM_GETLINK, link->ifindex, &req);
+        if (r < 0) {
+                log_error_link(link, "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_link(link,
+                               "Could not send rtnetlink message: %s", strerror(-r));
+                return r;
+        }
 
         return 0;
 }
 
+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;
+        }
+
+        return link_enter_join_bridge(link);
+}
+
 int link_update(Link *link, sd_rtnl_message *m) {
         unsigned flags;
+        void *data;
+        uint16_t type;
         int r;
 
         assert(link);
         assert(m);
 
+        if (link->state == LINK_STATE_FAILED)
+                return 0;
+
         r = sd_rtnl_message_link_get_flags(m, &flags);
         if (r < 0) {
-                log_warning("Could not get link flags of '%s'", link->ifname);
+                log_warning_link(link, "Could not get link flags");
                 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;
+        while (sd_rtnl_message_read(m, &type, &data) > 0) {
+                if (type == IFLA_MTU && link->network->dhcp &&
+                    link->network->dhcp_mtu && !link->original_mtu) {
+                        link->original_mtu = *(uint16_t *) data;
+                        log_debug_link(link, "saved original MTU: %" PRIu16,
+                                       link->original_mtu);
+                }
+        }
 
-        return 0;
+        return link_update_flags(link, flags);
 }