X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fdns.h;h=8284971032300b29644e677b2ab3a805ad89b9df;hb=c38e2fcdc8404f7a6505f2f9c7c6fc26edf5ad87;hp=f79121ab3fd3ac90c36867053c176e4d9ef8bc4d;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/dns.h b/include/dns.h
index f79121ab3..828497103 100644
--- a/include/dns.h
+++ b/include/dns.h
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2005-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
  *
- * ---------------------------------------------------
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 /*
 dns.h - dns library very very loosely based on
 firedns, Copyright (C) 2002 Ian Gulliver
@@ -29,8 +37,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef _DNS_H
-#define _DNS_H
+#ifndef DNS_H
+#define DNS_H
 
 #include "socket.h"
 #include "hashcomp.h"
@@ -84,19 +92,12 @@ class CoreExport CachedQuery
 	 * @param res The result data, an IP or hostname
 	 * @param ttl The time-to-live value of the query result
 	 */
-	CachedQuery(const std::string &res, unsigned int ttl) : data(res)
-	{
-		expires = time(NULL) + ttl;
-	}
+	CachedQuery(const std::string &res, unsigned int ttl);
 
 	/** Returns the number of seconds remaining before this
 	 * cache item has expired and should be removed.
 	 */
-	int CalcTTLRemaining()
-	{
-		int n = (int)expires - (int)time(NULL);
-		return (n < 0 ? 0 : n);
-	}
+	int CalcTTLRemaining();
 };
 
 /** DNS cache information. Holds IPs mapped to hostnames, and hostnames mapped to IPs.
@@ -104,7 +105,7 @@ class CoreExport CachedQuery
 #if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
 typedef nspace::hash_map<irc::string, CachedQuery, nspace::hash_compare<irc::string> > dnscache;
 #else
-typedef nspace::hash_map<irc::string, CachedQuery, nspace::hash<irc::string> > dnscache;
+typedef nspace::hash_map<irc::string, CachedQuery, irc::hash> dnscache;
 #endif
 
 /**
@@ -412,13 +413,6 @@ class CoreExport DNS : public EventHandler
 	 */
 	~DNS();
 
-	/** Portable random number generator, generates
-	 * its random number from the ircd stats counters,
-	 * effective user id, time of day and the rollover
-	 * counter (currid)
-	 */
-	unsigned long PRNG();
-
 	/**
 	 * Turn an in6_addr into a .ip6.arpa domain
 	 */