gpt-auto-generator: print debug messages when we ignore a block device

[elogind.git] / src / network / networkd-link.c

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index c10d947589f6f9b87eeea1d0dc5fb0f766b86d27..fdc351fed31a8a03327e893ec58a569a2f0cd364 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -116,31 +116,6 @@ int link_get(Manager *m, int ifindex, Link **ret) {
         return 0;
 }
 
-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;
-
-        return 0;
-}
-
 static int link_enter_configured(Link *link) {
         assert(link);
         assert(link->state == LINK_STATE_SETTING_ROUTES);
@@ -994,10 +969,8 @@ static int link_update_flags(Link *link, unsigned flags) {
         if (link->state == LINK_STATE_FAILED)
                 return 0;
 
-        if (link->flags == flags) {
-                log_debug_link(link, "link status unchanged: %#.8x", flags);
+        if (link->flags == flags)
                 return 0;
-        }
 
         if ((link->flags & IFF_UP) != (flags & IFF_UP))
                 log_info_link(link,
@@ -1038,8 +1011,8 @@ static int link_update_flags(Link *link, unsigned flags) {
                 }
         }
 
-        log_debug_link(link,
-                       "link status updated: %#.8x -> %#.8x", link->flags, flags);
+        log_debug_link(link, "link status updated: %#.8x -> %#.8x",
+                       link->flags, flags);
 
         link->flags = flags;
 
@@ -1056,18 +1029,14 @@ 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) {
-                log_struct_link(LOG_ERR, link,
+        if (r >= 0)
+                link_update_flags(link, link->flags | IFF_UP);
+        else
+                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;
-        }
-
-        link_update_flags(link, link->flags | IFF_UP);
-
         return 1;
 }
 
@@ -1194,6 +1163,27 @@ static int link_enter_enslave(Link *link) {
                 link->enslaving ++;
         }
 
+        if (link->network->bond) {
+                log_struct_link(LOG_DEBUG, link,
+                                "MESSAGE=%s: enslaving by '%s'",
+                                link->ifname, link->network->bond->name,
+                                NETDEV(link->network->bond),
+                                NULL);
+
+                r = netdev_enslave(link->network->bond, link, &enslave_handler);
+                if (r < 0) {
+                        log_struct_link(LOG_WARNING, link,
+                                        "MESSAGE=%s: could not enslave by '%s': %s",
+                                        link->ifname, link->network->bond->name, strerror(-r),
+                                        NETDEV(link->network->bond),
+                                        NULL);
+                        link_enter_failed(link);
+                        return r;
+                }
+
+                link->enslaving ++;
+        }
+
         HASHMAP_FOREACH(vlan, link->network->vlans, i) {
                 log_struct_link(LOG_DEBUG, link,
                                 "MESSAGE=%s: enslaving by '%s'",
@@ -1254,8 +1244,6 @@ static int link_getlink_handler(sd_rtnl *rtnl, sd_rtnl_message *m,
                 return 1;
         }
 
-        log_debug_link(link, "got link state");
-
         link_update(link, m);
 
         return 1;
@@ -1289,49 +1277,85 @@ static int link_getlink(Link *link) {
         return 0;
 }
 
-int link_configure(Link *link) {
+static int link_configure(Link *link) {
         int r;
 
         assert(link);
-        assert(link->network);
         assert(link->state == _LINK_STATE_INVALID);
 
         r = link_getlink(link);
-        if (r < 0) {
-                link_enter_failed(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;
+
+        r = link_configure(link);
+        if (r < 0)
+                return r;
+
+        return 0;
+}
+
 int link_update(Link *link, sd_rtnl_message *m) {
         unsigned flags;
-        void *data;
-        uint16_t type;
         int r;
 
         assert(link);
+        assert(link->network);
         assert(m);
 
         if (link->state == LINK_STATE_FAILED)
                 return 0;
 
+        if (link->network->dhcp && link->network->dhcp_mtu &&
+            !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);
+        }
+
+        r = sd_rtnl_message_read_ether_addr(m, IFLA_ADDRESS, &link->mac);
+        if (r >= 0) {
+                log_debug_link(link, "MAC address: "
+                               "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
+                                link->mac.ether_addr_octet[0],
+                                link->mac.ether_addr_octet[1],
+                                link->mac.ether_addr_octet[2],
+                                link->mac.ether_addr_octet[3],
+                                link->mac.ether_addr_octet[4],
+                                link->mac.ether_addr_octet[5]);
+        }
+
         r = sd_rtnl_message_link_get_flags(m, &flags);
         if (r < 0) {
                 log_warning_link(link, "Could not get link flags");
                 return r;
         }
 
-        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 link_update_flags(link, flags);
 }