X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdnsqueue.cpp;h=2198d0bed2e19677b98a8fbb5e791b57703d7eba;hb=eb7125445e8740e177ad05a74a5cc90324a35f98;hp=f00c9e25de12bcf82be77f3743c6a375186e388e;hpb=194838af39aa5fc823571afe9d61b2453573a32d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dnsqueue.cpp b/src/dnsqueue.cpp
index f00c9e25d..2198d0bed 100644
--- a/src/dnsqueue.cpp
+++ b/src/dnsqueue.cpp
@@ -70,12 +70,8 @@ using namespace std;
 #include <errno.h>
 #include <fcntl.h>
 #include "dns.h"
-
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
+#include "helperfuncs.h"
+#include "hashcomp.h"
 
 extern int MaxWhoResults;
 
@@ -86,71 +82,6 @@ extern std::vector<int> fd_reap;
 
 extern int MODCOUNT;
 
-namespace nspace
-{
-#ifdef GCC34
-        template<> struct hash<in_addr>
-#else
-        template<> struct nspace::hash<in_addr>
-#endif
-        {
-                size_t operator()(const struct in_addr &a) const
-                {
-                        size_t q;
-                        memcpy(&q,&a,sizeof(size_t));
-                        return q;
-                }
-        };
-#ifdef GCC34
-        template<> struct hash<string>
-#else
-        template<> struct nspace::hash<string>
-#endif
-        {
-                size_t operator()(const string &s) const
-                {
-                        char a[MAXBUF];
-                        static struct hash<const char *> strhash;
-                        strlcpy(a,s.c_str(),MAXBUF);
-                        strlower(a);
-                        return strhash(a);
-                }
-        };
-}
-
-
-struct StrHashComp
-{
-
-	bool operator()(const string& s1, const string& s2) const
-	{
-		char a[MAXBUF],b[MAXBUF];
-		strlcpy(a,s1.c_str(),MAXBUF);
-		strlcpy(b,s2.c_str(),MAXBUF);
-                strlower(a);
-                strlower(b);
-		return (strcasecmp(a,b) == 0);
-	}
-
-};
-
-struct InAddr_HashComp
-{
-
-	bool operator()(const in_addr &s1, const in_addr &s2) const
-	{
-		size_t q;
-		size_t p;
-		
-		memcpy(&q,&s1,sizeof(size_t));
-		memcpy(&p,&s2,sizeof(size_t));
-		
-		return (q == p);
-	}
-
-};
-
-
 typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, StrHashComp> user_hash;
 typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, StrHashComp> chan_hash;
 typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, InAddr_HashComp> address_cache;
@@ -254,7 +185,7 @@ public:
 	}
 };
 
-Lookup dnsq[MAXBUF];
+Lookup dnsq[255];
 
 bool lookup_dns(std::string nick)
 {
@@ -267,7 +198,7 @@ bool lookup_dns(std::string nick)
 		Lookup L;
 		if (L.DoLookup(nick))
 		{
-			for (int j = 0; j < MAXBUF; j++)
+			for (int j = 0; j < 255; j++)
 			{
 				if (!dnsq[j].GetFD())
 				{
@@ -276,7 +207,7 @@ bool lookup_dns(std::string nick)
 				}
 			}
 			// calculate the maximum value, this saves cpu time later
-			for (int p = 0; p < MAXBUF; p++)
+			for (int p = 0; p < 255; p++)
 				if (dnsq[p].GetFD())
 					max_fd_alloc = p;
 		}
@@ -304,7 +235,7 @@ void dns_poll()
 	}
 	// looks like someones freed an item, recalculate end of list.
 	if ((!dnsq[max_fd_alloc].GetFD()) && (max_fd_alloc != 0))
-		for (int p = 0; p < MAXBUF; p++)
+		for (int p = 0; p < 255; p++)
 			if (dnsq[p].GetFD())
 				max_fd_alloc = p;