sd-dhcp-server: also expose lease expiration timestamp in realtime

Here, we use map_clock_usec_raw(), instead of map_clock_usec() to reduce
number of calls of now() -> clock_gettime().

diff --git a/src/libsystemd-network/sd-dhcp-server-lease.c b/src/libsystemd-network/sd-dhcp-server-lease.c
index deec9356a1d3f88712d4231c420e0c339fad8f6b..17160445632f90cb02b29e5eaf151e2916689963 100644 (file)
--- a/src/libsystemd-network/sd-dhcp-server-lease.c
+++ b/src/libsystemd-network/sd-dhcp-server-lease.c
@@ -219,11 +219,20 @@ static int dhcp_server_lease_append_json(sd_dhcp_server_lease *lease, JsonVarian
 int dhcp_server_bound_leases_append_json(sd_dhcp_server *server, JsonVariant **v) {
         _cleanup_(json_variant_unrefp) JsonVariant *array = NULL;
         sd_dhcp_server_lease *lease;
+        usec_t now_b, now_r;
         int r;
 
         assert(server);
         assert(v);
 
+        r = sd_event_now(server->event, CLOCK_BOOTTIME, &now_b);
+        if (r < 0)
+                return r;
+
+        r = sd_event_now(server->event, CLOCK_REALTIME, &now_r);
+        if (r < 0)
+                return r;
+
         HASHMAP_FOREACH(lease, server->bound_leases_by_client_id) {
                 _cleanup_(json_variant_unrefp) JsonVariant *w = NULL;
 
@@ -231,9 +240,12 @@ int dhcp_server_bound_leases_append_json(sd_dhcp_server *server, JsonVariant **v
                 if (r < 0)
                         return r;
 
+                usec_t exp_r = map_clock_usec_raw(lease->expiration, now_b, now_r);
+
                 r = json_variant_merge_objectb(&w,
                                  JSON_BUILD_OBJECT(
-                                         JSON_BUILD_PAIR_UNSIGNED("ExpirationUSec", lease->expiration)));
+                                         JSON_BUILD_PAIR_UNSIGNED("ExpirationUSec", lease->expiration),
+                                         JSON_BUILD_PAIR_UNSIGNED("ExpirationRealtimeUSec", exp_r)));
                 if (r < 0)
                         return r;