Removed __single_client_alloc again because gcc devs were smoking crack and removed it

[user/henk/code/inspircd.git] / src / dnsqueue.cpp

diff --git a/src/dnsqueue.cpp b/src/dnsqueue.cpp
index f00c9e25de12bcf82be77f3743c6a375186e388e..116f09010b963f50f56232e1e77d303c9a639721 100644 (file)
--- a/src/dnsqueue.cpp
+++ b/src/dnsqueue.cpp
@@ -23,7 +23,6 @@ using namespace std;
 #include "inspircd_util.h"
 #include "inspircd_config.h"
 #include <unistd.h>
-#include <fcntl.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
@@ -38,11 +37,7 @@ using namespace std;
 #include <map>
 #include <sstream>
 #include <vector>
-#include <errno.h>
 #include <deque>
-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>
 #include "connection.h"
 #include "users.h"
 #include "servers.h"
@@ -57,7 +52,6 @@ using namespace std;
 #include "xline.h"
 #include "inspstring.h"
 #include "dnsqueue.h"
-#include <stdlib.h>
 #include <time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -65,96 +59,22 @@ using namespace std;
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <string.h>
-#include <unistd.h>
-#include <stdio.h>
-#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;
 
 extern std::vector<Module*> modules;
 extern std::vector<std::string> module_names;
 extern std::vector<ircd_module*> factory;
-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;
-typedef nspace::hash_map<std::string, WhoWasUser*, nspace::hash<string>, StrHashComp> whowas_hash;
+typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHashComp> user_hash;
+typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, irc::StrHashComp> chan_hash;
+typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, irc::InAddr_HashComp> address_cache;
+typedef nspace::hash_map<std::string, WhoWasUser*, nspace::hash<string>, irc::StrHashComp> whowas_hash;
 typedef std::deque<command_t> command_table;
 
 extern user_hash clientlist;
@@ -254,7 +174,7 @@ public:
        }
 };
 
-Lookup dnsq[MAXBUF];
+Lookup dnsq[255];
 
 bool lookup_dns(std::string nick)
 {
@@ -267,7 +187,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 +196,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 +224,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;