X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-netdev.c;h=356341a8735817c20e7c99427fe0674e9f446834;hp=57960321007aef420be2c8ddc7074993b18aec93;hb=d39edfc72f9296078a18014627bf0a2543b60627;hpb=2c5859afecee81e345fc9526b1083bf79990ffb8

diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index 579603210..356341a87 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -20,7 +20,7 @@
 ***/
 
 #include "networkd.h"
-#include "net-util.h"
+#include "network-internal.h"
 #include "path-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
@@ -154,6 +154,66 @@ 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;
@@ -161,6 +221,9 @@ static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userda
         assert(netdev->state != _NETDEV_STATE_INVALID);
 
         r = sd_rtnl_message_get_errno(m);
+        if (r == -EEXIST)
+                r = netdev_getlink(netdev);
+
         if (r < 0) {
                 log_warning_netdev(netdev, "netdev failed: %s", strerror(-r));
                 netdev_enter_failed(netdev);
@@ -317,10 +380,46 @@ int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callbac
         return 0;
 }
 
-int netdev_set_ifindex(NetDev *netdev, int ifindex) {
+int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) {
+        const char *kind;
+        char *received_kind;
+        int r, ifindex;
+
         assert(netdev);
         assert(ifindex > 0);
 
+        kind = netdev_kind_to_string(netdev->kind);
+        if (!kind)
+                log_error_netdev(netdev, "Could not get kind");
+
+        r = sd_rtnl_message_enter_container(message, IFLA_LINKINFO);
+        if (r < 0) {
+                log_error_netdev(netdev, "Could not get LINKINFO");
+                return r;
+        }
+
+        r = sd_rtnl_message_read_string(message, IFLA_INFO_KIND, &received_kind);
+        if (r < 0) {
+                log_error_netdev(netdev, "Could not get KIND");
+                return r;
+        }
+
+        if (!streq(kind, received_kind)) {
+                log_error_netdev(netdev, "Received newlink with wrong KIND");
+                netdev_enter_failed(netdev);
+                return r;
+        }
+
+        r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
+        if (r < 0) {
+                log_struct_netdev(LOG_ERR, netdev,
+                                "MESSAGE=%s: could not get ifindex: %s",
+                                netdev->name, strerror(-r),
+                                "ERRNO=%d", -r,
+                                NULL);
+                return r;
+        }
+
         if (netdev->ifindex > 0) {
                 if (netdev->ifindex == ifindex)
                         return 0;