networkd: netdev - support joining already existing netdevs

diff --git a/TODO b/TODO
index e823f0a4c2a936b720453aa3a2e64971105d59b1..efaded7623396a5aec5957586e9e839bc13ffc57 100644 (file)
--- a/TODO
+++ b/TODO
@@ -667,6 +667,7 @@ Features:
    - add support for more attribute types
 
 * networkd:
    - add support for more attribute types
 
 * networkd:

+   - make sure RTM_NEWLINK messages match both the ifname and kind when setting the ifindex of a netdev

    - add more keys to [Route] and [Address] sections
    - add support for more DHCPv4 options (and, longer term, other kinds of dynamic config)
    - add proper initrd support (in particular generate .network/.link files based on /proc/cmdline)
    - add more keys to [Route] and [Address] sections
    - add support for more DHCPv4 options (and, longer term, other kinds of dynamic config)
    - add proper initrd support (in particular generate .network/.link files based on /proc/cmdline)

diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index 57960321007aef420be2c8ddc7074993b18aec93..298bf277f31e526bc44b4e38f36dd6757d905ffc 100644 (file)
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -154,6 +154,78 @@ static int netdev_enter_ready(NetDev *netdev) {
         return 0;
 }
 
         return 0;
 }
 

+static int netdev_getlink_handler(sd_rtnl *rtnl, sd_rtnl_message *m,
+                                void *userdata) {
+        NetDev *netdev = userdata;
+        int r, ifindex;
+
+        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;
+        }
+
+        r = sd_rtnl_message_link_get_ifindex(m, &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 1;
+        }
+
+        r = netdev_set_ifindex(netdev, ifindex);
+        if (r < 0)
+                log_warning_netdev(netdev, "could not set ifindex to %d", ifindex);
+
+        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;
 static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         NetDev *netdev = userdata;
         int r;


@@ -161,6 +233,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);
         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);
         if (r < 0) {
                 log_warning_netdev(netdev, "netdev failed: %s", strerror(-r));
                 netdev_enter_failed(netdev);