#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 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);
- 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 std::deque<command_t> command_table;
extern user_hash clientlist;
extern chan_hash chanlist;
-extern user_hash whowas;
+extern whowas_hash whowas;
extern command_table cmdlist;
-extern address_cache IP;
extern ClassVector Classes;
extern char DNSServer[MAXBUF];
+long max_fd_alloc = 0;
+
+extern time_t TIME;
class Lookup {
private:
- DNS* resolver;
- userrec* u;
+ DNS resolver;
+ char u[NICKMAX];
public:
Lookup()
{
- u = NULL;
- resolver = NULL;
+ strcpy(u,"");
+ }
+
+ void Reset()
+ {
+ strcpy(u,"");
}
~Lookup()
{
- if (resolver)
- delete resolver;
}
- Lookup(userrec* user)
+ bool DoLookup(std::string nick)
{
- u = user;
- log(DEBUG,"New Lookup class with DNSServer set to '%s'",DNSServer);
- resolver = new DNS(std::string(DNSServer));
- resolver->ReverseLookup(std::string(user->host));
+ userrec* usr = Find(nick);
+ if (usr)
+ {
+ log(DEBUG,"New Lookup class for %s with DNSServer set to '%s'",nick.c_str(),DNSServer);
+ resolver.SetNS(std::string(DNSServer));
+ if (!resolver.ReverseLookup(std::string(usr->host)))
+ return false;
+ strlcpy(u,nick.c_str(),NICKMAX);
+ return true;
+ }
+ return false;
}
bool Done()
{
- if (resolver->HasResult())
+ userrec* usr = NULL;
+ if (resolver.HasResult())
{
- log(DEBUG,"resolver says result available!");
- if (resolver->GetFD() != 0)
+ if (resolver.GetFD() != 0)
{
- log(DEBUG,"Resolver FD is not 0");
- std::string hostname = resolver->GetResult();
- if (u)
+ std::string hostname = resolver.GetResult();
+ log(DEBUG,"RESULT! %s",hostname.c_str());
+ usr = Find(u);
+ if (usr)
{
- log(DEBUG,"Applying hostname lookup to %s: %s",u->nick,hostname.c_str());
- if (hostname != "")
+ if (usr->registered > 3)
{
- strlcpy(u->host,hostname.c_str(),MAXBUF);
- WriteServ(u->fd,"NOTICE Auth :Resolved your hostname: %s",hostname.c_str());
- u->dns_done = true;
+ usr->dns_done = true;
return true;
}
- return false;
+ if ((hostname != "") && (usr->registered != 7))
+ {
+ strlcpy(usr->host,hostname.c_str(),MAXBUF);
+ strlcpy(usr->dhost,hostname.c_str(),MAXBUF);
+ WriteServ(usr->fd,"NOTICE Auth :Resolved your hostname: %s",hostname.c_str());
+ usr->dns_done = true;
+ return true;
+ }
+ usr->dns_done = true;
+ return true;
}
}
else
{
- u->dns_done = true;
+ usr = Find(u);
+ if (usr)
+ usr->dns_done = true;
return true;
}
}
int GetFD()
{
- if (u)
- {
- return u->fd;
- }
- else return 0;
+ userrec* usr = Find(u);
+ if (!usr)
+ return 0;
+ if (usr->dns_done)
+ return 0;
+ return usr->fd;
}
};
-typedef std::vector<Lookup> dns_queue;
-
-dns_queue dnsq;
+Lookup dnsq[255];
-bool lookup_dns(userrec* u)
+bool lookup_dns(std::string nick)
{
- // place a new user into the queue...
- log(DEBUG,"Queueing DNS lookup for %s",u->nick);
- WriteServ(u->fd,"NOTICE Auth :Looking up your hostname...");
- Lookup L(u);
- dnsq.push_back(L);
- return true;
+ userrec* u = Find(nick);
+ if (u)
+ {
+ // place a new user into the queue...
+ log(DEBUG,"Queueing DNS lookup for %s",u->nick);
+ WriteServ(u->fd,"NOTICE Auth :Looking up your hostname...");
+ Lookup L;
+ if (L.DoLookup(nick))
+ {
+ for (int j = 0; j < 255; j++)
+ {
+ if (!dnsq[j].GetFD())
+ {
+ dnsq[j] = L;
+ return true;
+ }
+ }
+ // calculate the maximum value, this saves cpu time later
+ for (int p = 0; p < 255; p++)
+ if (dnsq[p].GetFD())
+ max_fd_alloc = p;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ return false;
}
void dns_poll()
{
// do we have items in the queue?
- if (dnsq.size())
+ for (int j = 0; j <= max_fd_alloc; j++)
{
// are any ready, or stale?
- if (dnsq[0].Done() || (!dnsq[0].GetFD()))
+ if (dnsq[j].GetFD())
{
- log(DEBUG,"****** DNS lookup for fd %d is complete. ******",dnsq[0].GetFD());
- dnsq.erase(dnsq.begin());
+ if (dnsq[j].Done())
+ {
+ dnsq[j].Reset();
+ }
}
}
-}
+ // 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 < 255; p++)
+ if (dnsq[p].GetFD())
+ max_fd_alloc = p;
+}
projects / user / henk / code / inspircd.git / blobdiff