networkd: netdev - give up early when setting already set ifindex

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

diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index 075a8790a091f442f6ad6a65ec946d3f3a5beaca..717ecdf0e5a6af5dae090486efd42435cae55f1a 100644 (file)
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -375,6 +375,7 @@ 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);
@@ -391,6 +392,42 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) {
                 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) {
                 log_error_netdev(netdev, "Could not get LINKINFO");
@@ -417,27 +454,10 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) {
         }
 
         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_error_netdev(netdev, "Could not get ifindex: %s", strerror(-r));
+                log_error_netdev(netdev, "Received newlink with wrong KIND %s, "
+                                 "expected %s", received_kind, kind);
                 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 && 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;
         }
 
         netdev->ifindex = ifindex;