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=fb873a9089416f21fae4a7250d29346465bac414;hp=45276ba2dd58107a9155c903b1df9d51d7945e7d;hb=df9aa406e8e32a2fb3b2a4b42d5871ef75a32ed8;hpb=ffba61663aa5f11b2066928d74c09f00e60e9e20

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 45276ba2d..fb873a908 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -24,7 +24,9 @@
 
 #include "networkd.h"
 #include "libudev-private.h"
+#include "udev-util.h"
 #include "util.h"
+#include "virt.h"
 #include "bus-util.h"
 #include "network-internal.h"
 
@@ -33,41 +35,53 @@
 static int ipv4ll_address_update(Link *link, bool deprecate);
 static bool ipv4ll_is_bound(sd_ipv4ll *ll);
 
-int link_new(Manager *manager, struct udev_device *device, Link **ret) {
+static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) {
         _cleanup_link_free_ Link *link = NULL;
-        const char *ifname;
-        int r;
+        uint16_t type;
+        char *ifname;
+        int r, ifindex;
 
         assert(manager);
         assert(manager->links);
-        assert(device);
+        assert(message);
         assert(ret);
 
+        r = sd_rtnl_message_get_type(message, &type);
+        if (r < 0)
+                return r;
+        else if (type != RTM_NEWLINK)
+                return -EINVAL;
+
+        r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
+        if (r < 0)
+                return r;
+        else if (ifindex <= 0)
+                return -EINVAL;
+
+        r = sd_rtnl_message_read_string(message, IFLA_IFNAME, &ifname);
+        if (r < 0)
+                return r;
+
         link = new0(Link, 1);
         if (!link)
                 return -ENOMEM;
 
         link->manager = manager;
-        link->state = _LINK_STATE_INVALID;
-
-        link->ifindex = udev_device_get_ifindex(device);
-        if (link->ifindex <= 0)
-                return -EINVAL;
+        link->state = LINK_STATE_INITIALIZING;
+        link->ifindex = ifindex;
+        link->ifname = strdup(ifname);
+        if (!link->ifname)
+                return -ENOMEM;
 
         r = asprintf(&link->state_file, "/run/systemd/network/links/%"PRIu64,
                      link->ifindex);
         if (r < 0)
                 return -ENOMEM;
 
-        ifname = udev_device_get_sysname(device);
-        link->ifname = strdup(ifname);
-
         r = hashmap_put(manager->links, &link->ifindex, link);
         if (r < 0)
                 return r;
 
-        link->udev_device = udev_device_ref(device);
-
         *ret = link;
         link = NULL;
 
@@ -127,13 +141,61 @@ static int link_enter_configured(Link *link) {
         return 0;
 }
 
+static void link_enter_unmanaged(Link *link) {
+        assert(link);
+
+        log_debug_link(link, "unmanaged");
+
+        link->state = LINK_STATE_UNMANAGED;
+
+        link_save(link);
+}
+
+static int link_stop_clients(Link *link) {
+        int r = 0, k;
+
+        assert(link);
+        assert(link->manager);
+        assert(link->manager->event);
+
+        if (!link->network)
+                return 0;
+
+        if (link->network->dhcp) {
+                assert(link->dhcp_client);
+
+                k = sd_dhcp_client_stop(link->dhcp_client);
+                if (k < 0) {
+                        log_warning_link(link, "Could not stop DHCPv4 client: %s", strerror(-r));
+                        r = k;
+                }
+        }
+
+        if (link->network->ipv4ll) {
+                assert(link->ipv4ll);
+
+                k = sd_ipv4ll_stop(link->ipv4ll);
+                if (k < 0) {
+                        log_warning_link(link, "Could not stop IPv4 link-local: %s", strerror(-r));
+                        r = k;
+                }
+        }
+
+        return r;
+}
+
 static void link_enter_failed(Link *link) {
         assert(link);
 
+        if (link->state == LINK_STATE_FAILED)
+                return;
+
         log_warning_link(link, "failed");
 
         link->state = LINK_STATE_FAILED;
 
+        link_stop_clients(link);
+
         link_save(link);
 }
 
@@ -1013,8 +1075,11 @@ static int link_acquire_conf(Link *link) {
                 log_debug_link(link, "acquiring IPv4 link-local address");
 
                 r = sd_ipv4ll_start(link->ipv4ll);
-                if (r < 0)
+                if (r < 0) {
+                        log_warning_link(link, "could not acquire IPv4 "
+                                         "link-local address");
                         return r;
+                }
         }
 
         if (link->network->dhcp) {
@@ -1023,84 +1088,149 @@ static int link_acquire_conf(Link *link) {
                 log_debug_link(link, "acquiring DHCPv4 lease");
 
                 r = sd_dhcp_client_start(link->dhcp_client);
-                if (r < 0)
+                if (r < 0) {
+                        log_warning_link(link, "could not acquire DHCPv4 "
+                                         "lease");
                         return r;
+                }
         }
 
         return 0;
 }
 
-static int link_update_flags(Link *link, unsigned flags) {
-        unsigned flags_added, flags_removed, generic_flags;
+static bool link_has_carrier(unsigned flags, uint8_t operstate) {
+        /* see Documentation/networking/operstates.txt in the kernel sources */
+
+        if (operstate == IF_OPER_UP)
+                return true;
+
+        if (operstate == IF_OPER_UNKNOWN)
+                /* operstate may not be implemented, so fall back to flags */
+                if ((flags & IFF_LOWER_UP) && !(flags & IFF_DORMANT))
+                        return true;
+
+        return false;
+}
+
+static int link_update_flags(Link *link, sd_rtnl_message *m) {
+        unsigned flags, flags_added, flags_removed, generic_flags;
+        uint8_t operstate;
+        bool carrier_gained = false, carrier_lost = false;
         int r;
 
         assert(link);
-        assert(link->network);
 
         if (link->state == LINK_STATE_FAILED)
                 return 0;
 
-        if (link->flags == flags)
+        r = sd_rtnl_message_link_get_flags(m, &flags);
+        if (r < 0) {
+                log_warning_link(link, "Could not get link flags");
+                return r;
+        }
+
+        r = sd_rtnl_message_read_u8(m, IFLA_OPERSTATE, &operstate);
+        if (r < 0)
+                /* if we got a message without operstate, take it to mean
+                   the state was unchanged */
+                operstate = link->operstate;
+
+        if ((link->flags == flags) && (link->operstate == operstate))
                 return 0;
 
         flags_added = (link->flags ^ flags) & flags;
         flags_removed = (link->flags ^ flags) & link->flags;
-        generic_flags = ~(IFF_UP | IFF_LOWER_UP | IFF_RUNNING);
-
-        if (flags_added & generic_flags)
-                log_debug_link(link, "link flags gained: %#.8x",
-                               flags_added & generic_flags);
-
-        if (flags_removed & generic_flags)
-                log_debug_link(link, "link flags lost: %#.8x",
-                                flags_removed & generic_flags);
+        generic_flags = ~(IFF_UP | IFF_LOWER_UP | IFF_DORMANT | IFF_DEBUG |
+                          IFF_MULTICAST | IFF_BROADCAST | IFF_PROMISC |
+                          IFF_NOARP | IFF_MASTER | IFF_SLAVE);
 
         if (flags_added & IFF_UP)
-                log_info_link(link, "link is up");
+                log_debug_link(link, "link is up");
         else if (flags_removed & IFF_UP)
-                log_info_link(link, "link is down");
+                log_debug_link(link, "link is down");
 
         if (flags_added & IFF_LOWER_UP)
-                log_info_link(link, "carrier on");
+                log_debug_link(link, "link is lower up");
         else if (flags_removed & IFF_LOWER_UP)
-                log_info_link(link, "carrier off");
+                log_debug_link(link, "link is lower down");
+
+        if (flags_added & IFF_DORMANT)
+                log_debug_link(link, "link is dormant");
+        else if (flags_removed & IFF_DORMANT)
+                log_debug_link(link, "link is not dormant");
+
+        if (flags_added & IFF_DEBUG)
+                log_debug_link(link, "debugging enabled in the kernel");
+        else if (flags_removed & IFF_DEBUG)
+                log_debug_link(link, "debugging disabled in the kernel");
+
+        if (flags_added & IFF_MULTICAST)
+                log_debug_link(link, "multicast enabled");
+        else if (flags_removed & IFF_MULTICAST)
+                log_debug_link(link, "multicast disabled");
+
+        if (flags_added & IFF_BROADCAST)
+                log_debug_link(link, "broadcast enabled");
+        else if (flags_removed & IFF_BROADCAST)
+                log_debug_link(link, "broadcast disabled");
+
+        if (flags_added & IFF_PROMISC)
+                log_debug_link(link, "promiscuous mode enabled");
+        else if (flags_removed & IFF_PROMISC)
+                log_debug_link(link, "promiscuous mode disabled");
+
+        if (flags_added & IFF_NOARP)
+                log_debug_link(link, "ARP protocol disabled");
+        else if (flags_removed & IFF_NOARP)
+                log_debug_link(link, "ARP protocol enabled");
+
+        if (flags_added & IFF_MASTER)
+                log_debug_link(link, "link is master");
+        else if (flags_removed & IFF_MASTER)
+                log_debug_link(link, "link is no longer master");
+
+        if (flags_added & IFF_SLAVE)
+                log_debug_link(link, "link is slave");
+        else if (flags_removed & IFF_SLAVE)
+                log_debug_link(link, "link is no longer slave");
+
+        /* link flags are currently at most 18 bits, let's default to printing 20 */
+        if (flags_added & generic_flags)
+                log_debug_link(link, "unknown link flags gained: %#.5x (ignoring)",
+                               flags_added & generic_flags);
 
+        if (flags_removed & generic_flags)
+                log_debug_link(link, "unknown link flags lost: %#.5x (ignoring)",
+                               flags_removed & generic_flags);
 
-        if (flags_added & IFF_RUNNING) {
-                log_info_link(link, "running");
+        carrier_gained = !link_has_carrier(link->flags, link->operstate) &&
+                       link_has_carrier(flags, operstate);
+        carrier_lost = link_has_carrier(link->flags, link->operstate) &&
+                         !link_has_carrier(flags, operstate);
 
-                if (link->network->dhcp || link->network->ipv4ll) {
-                        r = link_acquire_conf(link);
-                        if (r < 0) {
-                                log_warning_link(link, "Could not acquire configuration: %s", strerror(-r));
-                                link_enter_failed(link);
-                                return r;
-                        }
-                }
-        } else if (flags_removed & IFF_RUNNING) {
-                log_info_link(link, "not running");
+        link->flags = flags;
+        link->operstate = operstate;
+
+        if (carrier_gained) {
+                log_info_link(link, "gained carrier");
 
-                if (link->network->dhcp) {
-                        r = sd_dhcp_client_stop(link->dhcp_client);
+                if (link->network) {
+                        r = link_acquire_conf(link);
                         if (r < 0) {
-                                log_warning_link(link, "Could not stop DHCPv4 client: %s", strerror(-r));
                                 link_enter_failed(link);
                                 return r;
                         }
                 }
+        } else if (carrier_lost) {
+                log_info_link(link, "lost carrier");
 
-                if (link->network->ipv4ll) {
-                        r = sd_ipv4ll_stop(link->ipv4ll);
-                        if (r < 0) {
-                                log_warning_link(link, "Could not stop IPv4 link-local: %s", strerror(-r));
-                                link_enter_failed(link);
-                                return r;
-                        }
+                r = link_stop_clients(link);
+                if (r < 0) {
+                        link_enter_failed(link);
+                        return r;
                 }
         }
 
-        link->flags = flags;
-
         return 0;
 }
 
@@ -1114,14 +1244,15 @@ static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
                 return 1;
 
         r = sd_rtnl_message_get_errno(m);
-        if (r >= 0)
-                link_update_flags(link, link->flags | IFF_UP);
-        else
+        if (r < 0) {
                 log_struct_link(LOG_WARNING, link,
                                 "MESSAGE=%s: could not bring up interface: %s",
                                 link->ifname, strerror(-r),
                                 "ERRNO=%d", -r,
                                 NULL);
+                link_enter_failed(link);
+        }
+
         return 1;
 }
 
@@ -1165,10 +1296,12 @@ static int link_enslaved(Link *link) {
         assert(link->state == LINK_STATE_ENSLAVING);
         assert(link->network);
 
-        r = link_up(link);
-        if (r < 0) {
-                link_enter_failed(link);
-                return r;
+        if (!(link->flags & IFF_UP)) {
+                r = link_up(link);
+                if (r < 0) {
+                        link_enter_failed(link);
+                        return r;
+                }
         }
 
         if (!link->network->dhcp && !link->network->ipv4ll)
@@ -1216,7 +1349,7 @@ static int link_enter_enslave(Link *link) {
 
         assert(link);
         assert(link->network);
-        assert(link->state == _LINK_STATE_INVALID);
+        assert(link->state == LINK_STATE_INITIALIZING);
 
         link->state = LINK_STATE_ENSLAVING;
 
@@ -1308,113 +1441,36 @@ static int link_enter_enslave(Link *link) {
         return 0;
 }
 
-static int link_getlink_handler(sd_rtnl *rtnl, sd_rtnl_message *m,
-                                void *userdata) {
-        Link *link = userdata;
-        int r;
-
-        assert(link);
-        assert(link->ifname);
-
-        if (link->state == LINK_STATE_FAILED)
-                return 1;
-
-        r = sd_rtnl_message_get_errno(m);
-        if (r < 0) {
-                log_struct_link(LOG_ERR, link,
-                                "MESSAGE=%s: could not get state: %s",
-                                link->ifname, strerror(-r),
-                                "ERRNO=%d", -r,
-                                NULL);
-                link_enter_failed(link);
-                return 1;
-        }
-
-        link_update(link, m);
-
-        return 1;
-}
-
-static int link_getlink(Link *link) {
-        _cleanup_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_new_link(link->manager->rtnl, &req,
-                                     RTM_GETLINK, link->ifindex);
-        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_getlink_handler,
-                               link, 0, NULL);
-        if (r < 0) {
-                log_error_link(link,
-                               "Could not send rtnetlink message: %s", strerror(-r));
-                return r;
-        }
-
-        return 0;
-}
-
 static int link_configure(Link *link) {
         int r;
 
         assert(link);
-        assert(link->state == _LINK_STATE_INVALID);
-
-        r = link_getlink(link);
-        if (r < 0)
-                return r;
-
-        return link_enter_enslave(link);
-}
-
-int link_add(Manager *m, struct udev_device *device, Link **ret) {
-        Link *link = NULL;
-        Network *network;
-        int r;
-
-        assert(m);
-        assert(device);
-
-        r = link_new(m, device, &link);
-        if (r < 0)
-                return r;
-
-        *ret = link;
-
-        r = network_get(m, device, &network);
-        if (r < 0)
-                return r == -ENOENT ? 0 : r;
-
-        r = network_apply(m, network, link);
-        if (r < 0)
-                return r;
+        assert(link->state == LINK_STATE_INITIALIZING);
 
         if (link->network->ipv4ll) {
                 uint8_t seed[8];
+
                 r = sd_ipv4ll_new(&link->ipv4ll);
                 if (r < 0)
                         return r;
 
-                r = net_get_unique_predictable_data(link->udev_device, seed);
-                if (r >= 0) {
-                        r = sd_ipv4ll_set_address_seed(link->ipv4ll, seed);
-                        if (r < 0)
-                                return r;
+                if (link->udev_device) {
+                        r = net_get_unique_predictable_data(link->udev_device, seed);
+                        if (r >= 0) {
+                                r = sd_ipv4ll_set_address_seed(link->ipv4ll, seed);
+                                if (r < 0)
+                                        return r;
+                        }
                 }
 
                 r = sd_ipv4ll_attach_event(link->ipv4ll, NULL, 0);
                 if (r < 0)
                         return r;
 
+                r = sd_ipv4ll_set_mac(link->ipv4ll, &link->mac);
+                if (r < 0)
+                        return r;
+
                 r = sd_ipv4ll_set_index(link->ipv4ll, link->ifindex);
                 if (r < 0)
                         return r;
@@ -1433,6 +1489,10 @@ int link_add(Manager *m, struct udev_device *device, Link **ret) {
                 if (r < 0)
                         return r;
 
+                r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac);
+                if (r < 0)
+                        return r;
+
                 r = sd_dhcp_client_set_index(link->dhcp_client, link->ifindex);
                 if (r < 0)
                         return r;
@@ -1448,6 +1508,41 @@ int link_add(Manager *m, struct udev_device *device, Link **ret) {
                 }
         }
 
+        if (link_has_carrier(link->flags, link->operstate))
+                r = link_acquire_conf(link);
+                if (r < 0)
+                        return r;
+
+        return link_enter_enslave(link);
+}
+
+int link_initialized(Link *link, struct udev_device *device) {
+        Network *network;
+        int r;
+
+        assert(link);
+        assert(link->ifname);
+        assert(link->manager);
+
+        if (link->state != LINK_STATE_INITIALIZING)
+                return 0;
+
+        if (device)
+                link->udev_device = udev_device_ref(device);
+
+        log_debug_link(link, "link initialized");
+
+        r = network_get(link->manager, device, link->ifname, &link->mac, &network);
+        if (r == -ENOENT) {
+                link_enter_unmanaged(link);
+                return 0;
+        } else if (r < 0)
+                return r;
+
+        r = network_apply(link->manager, network, link);
+        if (r < 0)
+                return r;
+
         r = link_configure(link);
         if (r < 0)
                 return r;
@@ -1455,30 +1550,78 @@ int link_add(Manager *m, struct udev_device *device, Link **ret) {
         return 0;
 }
 
+int link_add(Manager *m, sd_rtnl_message *message, Link **ret) {
+        Link *link;
+        _cleanup_udev_device_unref_ struct udev_device *device = NULL;
+        char ifindex_str[2 + DECIMAL_STR_MAX(int)];
+        int r;
+
+        assert(m);
+        assert(message);
+        assert(ret);
+
+        r = link_new(m, message, ret);
+        if (r < 0)
+                return r;
+
+        link = *ret;
+
+        log_debug_link(link, "link added");
+
+        if (detect_container(NULL) <= 0) {
+                /* not in a container, udev will be around */
+                sprintf(ifindex_str, "n%"PRIu64, link->ifindex);
+                device = udev_device_new_from_device_id(m->udev, ifindex_str);
+                if (!device) {
+                        log_warning_link(link, "could not find udev device");
+                        return -errno;
+                }
+
+                if (udev_device_get_is_initialized(device) <= 0)
+                        /* not yet ready */
+                        return 0;
+        }
+
+        r = link_initialized(link, device);
+        if (r < 0)
+                return r;
+
+        return 0;
+}
+
 int link_update(Link *link, sd_rtnl_message *m) {
-        unsigned flags;
         struct ether_addr mac;
+        char *ifname;
         int r;
 
         assert(link);
-        assert(link->network);
+        assert(link->ifname);
         assert(m);
 
-        if (link->state == LINK_STATE_FAILED)
+        if (link->state == LINK_STATE_FAILED || link->state == LINK_STATE_UNMANAGED)
                 return 0;
 
-        if (link->network->dhcp && link->network->dhcp_mtu &&
-            !link->original_mtu) {
+        r = sd_rtnl_message_read_string(m, IFLA_IFNAME, &ifname);
+        if (r >= 0 && !streq(ifname, link->ifname)) {
+                log_info_link(link, "renamed to %s", ifname);
+
+                free(link->ifname);
+                link->ifname = strdup(ifname);
+                if (!link->ifname)
+                        return -ENOMEM;
+        }
+
+        if (!link->original_mtu) {
                 r = sd_rtnl_message_read_u16(m, IFLA_MTU, &link->original_mtu);
                 if (r >= 0)
                         log_debug_link(link, "saved original MTU: %"
                                        PRIu16, link->original_mtu);
         }
 
+        /* The kernel may broadcast NEWLINK messages without the MAC address
+           set, simply ignore them. */
         r = sd_rtnl_message_read_ether_addr(m, IFLA_ADDRESS, &mac);
-        if (r < 0)
-                log_debug_link(link, "Could not get MAC address: %s", strerror(-r));
-        else {
+        if (r >= 0) {
                 if (memcmp(link->mac.ether_addr_octet, mac.ether_addr_octet, ETH_ALEN)) {
 
                         memcpy(link->mac.ether_addr_octet, mac.ether_addr_octet, ETH_ALEN);
@@ -1514,13 +1657,7 @@ int link_update(Link *link, sd_rtnl_message *m) {
                 }
         }
 
-        r = sd_rtnl_message_link_get_flags(m, &flags);
-        if (r < 0) {
-                log_warning_link(link, "Could not get link flags");
-                return r;
-        }
-
-        return link_update_flags(link, flags);
+        return link_update_flags(link, m);
 }
 
 int link_save(Link *link) {
@@ -1576,10 +1713,12 @@ finish:
 }
 
 static const char* const link_state_table[_LINK_STATE_MAX] = {
+        [LINK_STATE_INITIALIZING] = "configuring",
         [LINK_STATE_ENSLAVING] = "configuring",
         [LINK_STATE_SETTING_ADDRESSES] = "configuring",
         [LINK_STATE_SETTING_ROUTES] = "configuring",
         [LINK_STATE_CONFIGURED] = "configured",
+        [LINK_STATE_UNMANAGED] = "unmanaged",
         [LINK_STATE_FAILED] = "failed",
 };