networkd: handle suspend events

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index a8d9bc0a13a444d26da7b486d06eb83dcb6011f9..22864bd403b89552650ef1f0f9c04643a8c1ecab 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1656,6 +1656,57 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) {
         return 0;
 }
 
         return 0;
 }
 

+static int link_carrier_gained(Link *link) {
+        int r;
+
+        assert(link);
+
+        if (link->network) {
+                r = link_acquire_conf(link);
+                if (r < 0) {
+                        link_enter_failed(link);
+                        return r;
+                }
+        }
+
+        return 0;
+}
+
+static int link_carrier_lost(Link *link) {
+        int r;
+
+        assert(link);
+
+        r = link_stop_clients(link);
+        if (r < 0) {
+                link_enter_failed(link);
+                return r;
+        }
+
+        return 0;
+}
+
+int link_carrier_reset(Link *link) {
+        int r;
+
+        assert(link);
+
+        if (link_has_carrier(link)) {
+                r = link_carrier_lost(link);
+                if (r < 0)
+                        return r;
+
+                r = link_carrier_gained(link);
+                if (r < 0)
+                        return r;
+
+                log_link_info(link, "reset carrier");
+        }
+
+        return 0;
+}
+
+

 int link_update(Link *link, sd_rtnl_message *m) {
         struct ether_addr mac;
         const char *ifname;
 int link_update(Link *link, sd_rtnl_message *m) {
         struct ether_addr mac;
         const char *ifname;


@@ -1773,21 +1824,16 @@ int link_update(Link *link, sd_rtnl_message *m) {
         if (carrier_gained) {
                 log_link_info(link, "gained carrier");
 
         if (carrier_gained) {
                 log_link_info(link, "gained carrier");
 

-                if (link->network) {
-                        r = link_acquire_conf(link);
-                        if (r < 0) {
-                                link_enter_failed(link);
-                                return r;
-                        }
-                }
+                r = link_carrier_gained(link);
+                if (r < 0)
+                        return r;

         } else if (carrier_lost) {
                 log_link_info(link, "lost carrier");
 
         } else if (carrier_lost) {
                 log_link_info(link, "lost carrier");
 

-                r = link_stop_clients(link);
-                if (r < 0) {
-                        link_enter_failed(link);
+                r = link_carrier_lost(link);
+                if (r < 0)

                         return r;
                         return r;

-                }
+

         }
 
         return 0;
         }
 
         return 0;

diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 0e2f55832509da241172340fc0a0d0efdfc45eff..81e97fa9510bb8d3a0a4a6b4723b0d13d54a57e5 100644 (file)
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -115,6 +115,7 @@ int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *use
 
 int link_save(Link *link);
 
 
 int link_save(Link *link);
 

+int link_carrier_reset(Link *link);

 bool link_has_carrier(Link *link);
 
 int link_set_mtu(Link *link, uint32_t mtu);
 bool link_has_carrier(Link *link);
 
 int link_set_mtu(Link *link, uint32_t mtu);

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index ac207851cbb5b46ac5d2414fffefc79a3baec4fc..09958c40daef42d54afe11a81d0dd75d4882c28c 100644 (file)
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -76,6 +76,99 @@ static int setup_default_address_pool(Manager *m) {
         return 0;
 }
 
         return 0;
 }
 

+int manager_connect_bus(Manager *m);
+
+static int on_bus_retry(sd_event_source *s, usec_t usec, void *userdata) {
+        Manager *m = userdata;
+
+        assert(s);
+        assert(m);
+
+        m->bus_retry_event_source = sd_event_source_unref(m->bus_retry_event_source);
+
+        manager_connect_bus(m);
+
+        return 0;
+}
+
+static int manager_reset_all(Manager *m) {
+        Link *link;
+        Iterator i;
+        int r;
+
+        assert(m);
+
+        HASHMAP_FOREACH(link, m->links, i) {
+                r = link_carrier_reset(link);
+                if (r < 0)
+                        log_link_warning_errno(link, r, "could not reset carrier: %m");
+        }
+
+        return 0;
+}
+
+static int match_prepare_for_sleep(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *ret_error) {
+        Manager *m = userdata;
+        int b, r;
+
+        assert(bus);
+        assert(bus);
+
+        r = sd_bus_message_read(message, "b", &b);
+        if (r < 0) {
+                log_debug_errno(r, "Failed to parse PrepareForSleep signal: %m");
+                return 0;
+        }
+
+        if (b)
+                return 0;
+
+        log_debug("Coming back from suspend, resetting all connections...");
+
+        manager_reset_all(m);
+
+        return 0;
+}
+
+int manager_connect_bus(Manager *m) {
+        int r;
+
+        assert(m);
+
+        r = sd_bus_default_system(&m->bus);
+        if (r == -ENOENT) {
+                /* We failed to connect? Yuck, we must be in early
+                 * boot. Let's try in 5s again. As soon as we have
+                 * kdbus we can stop doing this... */
+
+                log_debug_errno(r, "Failed to connect to bus, trying again in 5s: %m");
+
+                r = sd_event_add_time(m->event, &m->bus_retry_event_source, CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + 5*USEC_PER_SEC, 0, on_bus_retry, m);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to install bus reconnect time event: %m");
+
+                return 0;
+        } if (r < 0)
+                return r;
+
+        r = sd_bus_attach_event(m->bus, m->event, 0);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_add_match(m->bus, &m->prepare_for_sleep_slot,
+                             "type='signal',"
+                             "sender='org.freedesktop.login1',"
+                             "interface='org.freedesktop.login1.Manager',"
+                             "member='PrepareForSleep',"
+                             "path='/org/freedesktop/login1'",
+                             match_prepare_for_sleep,
+                             m);
+        if (r < 0)
+                return log_error_errno(r, "Failed to add match for PrepareForSleep: %m");
+
+        return 0;
+}
+

 static int systemd_netlink_fd(void) {
         int n, fd, rtnl_fd = -EINVAL;
 
 static int systemd_netlink_fd(void) {
         int n, fd, rtnl_fd = -EINVAL;
 


@@ -124,14 +217,10 @@ int manager_new(Manager **ret) {
         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 

-        r = sd_rtnl_inc_rcvbuf(m->rtnl, RCVBUF_SIZE);
+        r = manager_connect_bus(m);

         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 

-        r = sd_bus_default_system(&m->bus);
-        if (r < 0 && r != -ENOENT) /* TODO: drop when we can rely on kdbus */
-                return r;
-

         /* udev does not initialize devices inside containers,
          * so we rely on them being already initialized before
          * entering the container */
         /* udev does not initialize devices inside containers,
          * so we rely on them being already initialized before
          * entering the container */


@@ -175,7 +264,9 @@ void manager_free(Manager *m) {
         udev_monitor_unref(m->udev_monitor);
         udev_unref(m->udev);
         sd_bus_unref(m->bus);
         udev_monitor_unref(m->udev_monitor);
         udev_unref(m->udev);
         sd_bus_unref(m->bus);

+        sd_bus_slot_unref(m->prepare_for_sleep_slot);

         sd_event_source_unref(m->udev_event_source);
         sd_event_source_unref(m->udev_event_source);

+        sd_event_source_unref(m->bus_retry_event_source);

         sd_event_unref(m->event);
 
         while ((link = hashmap_first(m->links)))
         sd_event_unref(m->event);
 
         while ((link = hashmap_first(m->links)))

diff --git a/src/network/networkd.h b/src/network/networkd.h
index 719a75b8b72d6794f5a24abcf12870be8447a214..a4ac8e3503ab1f71f293d97859fda68ad93bcf48 100644 (file)
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -199,7 +199,9 @@ struct AddressPool {
 struct Manager {
         sd_rtnl *rtnl;
         sd_event *event;
 struct Manager {
         sd_rtnl *rtnl;
         sd_event *event;

+        sd_event_source *bus_retry_event_source;

         sd_bus *bus;
         sd_bus *bus;

+        sd_bus_slot *prepare_for_sleep_slot;

         struct udev *udev;
         struct udev_monitor *udev_monitor;
         sd_event_source *udev_event_source;
         struct udev *udev;
         struct udev_monitor *udev_monitor;
         sd_event_source *udev_event_source;