From cc007f8a3baa92ac46f17457a9a321e9b6530ded Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Wed, 13 May 2015 00:56:35 +0200 Subject: [PATCH] core_dns Set the TTL of the cache entry to the lowest TTL in a set of ResourceRecords --- src/coremods/core_dns.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/coremods/core_dns.cpp b/src/coremods/core_dns.cpp index 6652841d0..e1494b7f3 100644 --- a/src/coremods/core_dns.cpp +++ b/src/coremods/core_dns.cpp @@ -374,7 +374,18 @@ class MyManager : public Manager, public Timer, public EventHandler */ void AddCache(Query& r) { - const ResourceRecord& rr = r.answers[0]; + // Determine the lowest TTL value and use that as the TTL of the cache entry + unsigned int cachettl = UINT_MAX; + for (std::vector::const_iterator i = r.answers.begin(); i != r.answers.end(); ++i) + { + const ResourceRecord& rr = *i; + if (rr.ttl < cachettl) + cachettl = rr.ttl; + } + + ResourceRecord& rr = r.answers.front(); + // Set TTL to what we've determined to be the lowest + rr.ttl = cachettl; ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "cache: added cache for " + rr.name + " -> " + rr.rdata + " ttl: " + ConvToStr(rr.ttl)); this->cache[r.question] = r; } -- 2.39.2