X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdns.cpp;h=dee83d3acc3e8e44a7e984bd4b771b764de37b0b;hb=ce04e74ea53d6e649dc90e97118d9a58155f9d94;hp=ba1e8f2a4c271e5554308d509ea079532e36e26c;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dns.cpp b/src/dns.cpp
index ba1e8f2a4..dee83d3ac 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -147,6 +147,17 @@ class RequestTimeout : public Timer
 	}
 };
 
+CachedQuery::CachedQuery(const std::string &res, unsigned int ttl) : data(res)
+{
+	expires = ServerInstance->Time() + ttl;
+}
+
+int CachedQuery::CalcTTLRemaining()
+{
+	int n = expires - ServerInstance->Time();
+	return (n < 0 ? 0 : n);
+}
+
 /* Allocate the processing buffer */
 DNSRequest::DNSRequest(DNS* dns, int rid, const std::string &original) : dnsobj(dns)
 {
@@ -1035,11 +1046,9 @@ void DNS::CleanResolvers(Module* module)
 unsigned long DNS::PRNG()
 {
 	unsigned long val = 0;
-	timeval n;
 	serverstats* s = ServerInstance->stats;
-	gettimeofday(&n,NULL);
-	val = (n.tv_usec ^ (getpid() ^ geteuid()) ^ ((this->currid++)) ^ s->statsAccept) + n.tv_sec;
-	val = val + (s->statsCollisions ^ s->statsDnsGood) - s->statsDnsBad;
-	val += (s->statsConnects ^ (unsigned long)s->statsSent ^ (unsigned long)s->statsRecv) - ServerInstance->ports.size();
+	val = (rand() ^ this->currid++ ^ s->statsAccept) + ServerInstance->Time_ns();
+	val += (s->statsCollisions ^ s->statsDnsGood) * s->statsDnsBad;
+	val += (s->statsConnects ^ (unsigned long)s->statsSent ^ (unsigned long)s->statsRecv);
 	return val;
 }