From: Tom Gundersen <teg@jklm.no>
Date: Tue, 28 Jul 2015 00:45:04 +0000 (+0200)
Subject: resolved: cache - use clock_boottime_or_monotonic()
X-Git-Tag: v225~127^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=240b589b143311fda721701312ec15021e96caf9;p=thirdparty%2Fsystemd.git

resolved: cache - use clock_boottime_or_monotonic()

We cannot rely on CLOCK_BOOTTIME being supported by the kernel, so fallack
to CLOCK_MONOTONIC if the former is not supported.
---

diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c
index be528916812..9ffaf4b19f2 100644
--- a/src/resolve/resolved-dns-cache.c
+++ b/src/resolve/resolved-dns-cache.c
@@ -152,7 +152,7 @@ void dns_cache_prune(DnsCache *c) {
                         break;
 
                 if (t <= 0)
-                        t = now(CLOCK_BOOTTIME);
+                        t = now(clock_boottime_or_monotonic());
 
                 if (i->until > t)
                         break;
@@ -406,7 +406,7 @@ int dns_cache_put(
         dns_cache_make_space(c, answer->n_rrs + q->n_keys);
 
         if (timestamp <= 0)
-                timestamp = now(CLOCK_BOOTTIME);
+                timestamp = now(clock_boottime_or_monotonic());
 
         /* Second, add in positive entries for all contained RRs */
         for (i = 0; i < MIN(max_rrs, answer->n_rrs); i++) {