networkd: netdev - log when loading a .netdev file

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

diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index 15a5d7cdff2e22a21bb36953d2cee8c903424617..a8a629bd1ff2519575bf39603db325c828e75735 100644 (file)
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -146,6 +146,9 @@ static int netdev_enter_ready(NetDev *netdev) {
         assert(netdev);
         assert(netdev->name);
 
+        if (netdev->state != NETDEV_STATE_CREATING)
+                return 0;
+
         netdev->state = NETDEV_STATE_READY;
 
         log_info_netdev(netdev, "netdev ready");
@@ -158,67 +161,6 @@ static int netdev_enter_ready(NetDev *netdev) {
 
         return 0;
 }
-
-static int netdev_getlink_handler(sd_rtnl *rtnl, sd_rtnl_message *m,
-                                void *userdata) {
-        NetDev *netdev = userdata;
-        int r;
-
-        assert(netdev);
-
-        if (netdev->state == NETDEV_STATE_FAILED)
-                return 1;
-
-        r = sd_rtnl_message_get_errno(m);
-        if (r < 0) {
-                log_struct_netdev(LOG_ERR, netdev,
-                                "MESSAGE=%s: could not get link: %s",
-                                netdev->name, strerror(-r),
-                                "ERRNO=%d", -r,
-                                NULL);
-                return 1;
-        }
-
-        netdev_set_ifindex(netdev, m);
-
-        return 1;
-}
-
-static int netdev_getlink(NetDev *netdev) {
-        _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
-        int r;
-
-        assert(netdev->manager);
-        assert(netdev->manager->rtnl);
-        assert(netdev->name);
-
-        log_debug_netdev(netdev, "requesting netdev status");
-
-        r = sd_rtnl_message_new_link(netdev->manager->rtnl, &req,
-                                     RTM_GETLINK, 0);
-        if (r < 0) {
-                log_error_netdev(netdev, "Could not allocate RTM_GETLINK message");
-                return r;
-        }
-
-        r = sd_rtnl_message_append_string(req, IFLA_IFNAME, netdev->name);
-        if (r < 0) {
-                log_error_netdev(netdev, "Colud not append ifname to message: %s",
-                                 strerror(-r));
-                return r;
-        }
-
-        r = sd_rtnl_call_async(netdev->manager->rtnl, req, netdev_getlink_handler,
-                               netdev, 0, NULL);
-        if (r < 0) {
-                log_error_netdev(netdev,
-                               "Could not send rtnetlink message: %s", strerror(-r));
-                return r;
-        }
-
-        return 0;
-}
-
 static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         NetDev *netdev = userdata;
         int r;
@@ -227,9 +169,8 @@ static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userda
 
         r = sd_rtnl_message_get_errno(m);
         if (r == -EEXIST)
-                r = netdev_getlink(netdev);
-
-        if (r < 0) {
+                log_debug_netdev(netdev, "netdev exists, using existing");
+        else if (r < 0) {
                 log_warning_netdev(netdev, "netdev failed: %s", strerror(-r));
                 netdev_enter_failed(netdev);
 
@@ -379,17 +320,58 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) {
         uint16_t type;
         const char *kind;
         char *received_kind;
+        char *received_name;
         int r, ifindex;
 
         assert(netdev);
         assert(message);
 
         r = sd_rtnl_message_get_type(message, &type);
-        if (r < 0)
+        if (r < 0) {
+                log_error_netdev(netdev, "Could not get rtnl message type");
                 return r;
+        }
 
-        if (type != RTM_NEWLINK)
+        if (type != RTM_NEWLINK) {
+                log_error_netdev(netdev, "Can not set ifindex from unexpected rtnl message type");
                 return -EINVAL;
+        }
+
+        r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
+        if (r < 0) {
+                log_error_netdev(netdev, "Could not get ifindex: %s", strerror(-r));
+                netdev_enter_failed(netdev);
+                return r;
+        } else if (ifindex <= 0) {
+                log_error_netdev(netdev, "Got invalid ifindex: %d", ifindex);
+                netdev_enter_failed(netdev);
+                return r;
+        }
+
+
+        if (netdev->ifindex > 0) {
+                if (netdev->ifindex != ifindex) {
+                        log_error_netdev(netdev, "Could not set ifindex to %d, already set to %d",
+                                         ifindex, netdev->ifindex);
+                        netdev_enter_failed(netdev);
+                        return -EEXIST;
+                } else
+                        /* ifindex already set to the same for this netdev */
+                        return 0;
+        }
+
+        r = sd_rtnl_message_read_string(message, IFLA_IFNAME, &received_name);
+        if (r < 0) {
+                log_error_netdev(netdev, "Could not get IFNAME");
+                return r;
+        }
+
+        if (!streq(netdev->name, received_name)) {
+                log_error_netdev(netdev, "Received newlink with wrong IFNAME %s",
+                                 received_name);
+                netdev_enter_failed(netdev);
+                return r;
+        }
 
         r = sd_rtnl_message_enter_container(message, IFLA_LINKINFO);
         if (r < 0) {
@@ -403,6 +385,12 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) {
                 return r;
         }
 
+        r = sd_rtnl_message_exit_container(message);
+        if (r < 0) {
+                log_error_netdev(netdev, "Could not exit container");
+                return r;
+        }
+
         kind = netdev_kind_to_string(netdev->kind);
         if (!kind) {
                 log_error_netdev(netdev, "Could not get kind");
@@ -411,29 +399,12 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) {
         }
 
         if (!streq(kind, received_kind)) {
-                log_error_netdev(netdev, "Received newlink with wrong KIND");
+                log_error_netdev(netdev, "Received newlink with wrong KIND %s, "
+                                 "expected %s", received_kind, kind);
                 netdev_enter_failed(netdev);
                 return r;
         }
 
-        r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
-        if (r < 0) {
-                log_error_netdev(netdev, "Could not get ifindex: %s", strerror(-r));
-                netdev_enter_failed(netdev);
-                return r;
-        } else if (ifindex <= 0) {
-                log_error_netdev(netdev, "Got invalid ifindex: %d", ifindex);
-                netdev_enter_failed(netdev);
-                return r;
-        }
-
-        if (netdev->ifindex > 0) {
-                if (netdev->ifindex == ifindex)
-                        return 0;
-                else
-                        return -EEXIST;
-        }
-
         netdev->ifindex = ifindex;
 
         netdev_enter_ready(netdev);
@@ -449,12 +420,17 @@ static int netdev_load_one(Manager *manager, const char *filename) {
         assert(manager);
         assert(filename);
 
+        if (null_or_empty_path(filename)) {
+                log_debug("skipping empty file: %s", filename);
+                return 0;
+        }
+
         file = fopen(filename, "re");
         if (!file) {
                 if (errno == ENOENT)
                         return 0;
                 else
-                        return errno;
+                        return -errno;
         }
 
         netdev = new0(NetDev, 1);
@@ -526,6 +502,8 @@ static int netdev_load_one(Manager *manager, const char *filename) {
                         return r;
         }
 
+        log_debug_netdev(netdev, "loaded %s", netdev_kind_to_string(netdev->kind));
+
         netdev = NULL;
 
         return 0;