diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-07-24 18:53:01 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-07-24 19:02:58 +0200 |
| commit | fa94c34b083b5b4019975624453e53d0cbad2a5d (patch) | |
| tree | 8bd0d0486f7b9f3b0c36e9075bc3999ec7b28c09 /src/libsystemd-network/sd-dhcp-server.c | |
| parent | 77ff2de999b7ea6b1b4a3a218fbd9d62bb07cd54 (diff) | |
libsystemd-network: use CLOCK_BOOTTIME instead of CLOCK_MONOTONIC where possible
The timeouts in the networking library (DHCP lease timeouts and similar) should not be affected
by suspend. In the cases where CLOCK_BOOTTIME is not implemented, it is still safe to fallback to
CLOCK_MONOTONIC, as the consumers of the library (i.e., networkd) _should_ renew the leases when
coming out of suspend.
Diffstat (limited to 'src/libsystemd-network/sd-dhcp-server.c')
| -rw-r--r-- | src/libsystemd-network/sd-dhcp-server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c index 53cf0d7e46..bcf7d1fa2c 100644 --- a/src/libsystemd-network/sd-dhcp-server.c +++ b/src/libsystemd-network/sd-dhcp-server.c @@ -712,9 +712,9 @@ int dhcp_server_handle_message(sd_dhcp_server *server, DHCPMessage *message, } else lease = existing_lease; - r = sd_event_now(server->event, CLOCK_MONOTONIC, &time_now); + r = sd_event_now(server->event, clock_boottime_or_monotonic(), &time_now); if (r < 0) - time_now = now(CLOCK_MONOTONIC); + time_now = now(clock_boottime_or_monotonic()); lease->expiration = req->lifetime * USEC_PER_SEC + time_now; r = server_send_ack(server, req, address); |