X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdnsqueue.cpp;h=975884796f7dd24f9963c58dfb98cc77b9257077;hb=fc9e00f49299cb3b402406b5f185d5f4af1e9780;hp=7e2ad86c345340c18b7ca23930c776de49d686b0;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dnsqueue.cpp b/src/dnsqueue.cpp
index 7e2ad86c3..975884796 100644
--- a/src/dnsqueue.cpp
+++ b/src/dnsqueue.cpp
@@ -14,41 +14,23 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
+#include "configreader.h"
 #include <unistd.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
-#include <cstdio>
-#include <time.h>
 #include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
 #include "users.h"
 #include "globals.h"
 #include "inspstring.h"
 #include "dnsqueue.h"
-#include <time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <string.h>
 #include "dns.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "socketengine.h"
+#include "socket.h"
 
 extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
@@ -69,11 +51,13 @@ public:
 	Lookup()
 	{
 		*u = 0;
+		hostname = "";
 	}
 
 	void Reset()
 	{
 		*u = 0;
+		hostname = "";
 	}
 
 	~Lookup()
@@ -91,7 +75,7 @@ public:
 			{
 				return false;
 			}
-			strlcpy(u,nick.c_str(),NICKMAX);
+			strlcpy(u,nick.c_str(),NICKMAX-1);
 
 			/* ASSOCIATE WITH DNS LOOKUP LIST */
 			if (resolver1.GetFD() != -1)
@@ -125,10 +109,17 @@ public:
 						}
 						if ((hostname != "") && (usr->registered != 7))
 						{
-							if (std::string(usr->ip) == ip)
+							if ((std::string((char*)inet_ntoa(usr->ip4)) == ip) && (hostname.length() < 65))
 							{
-								strlcpy(usr->host,hostname.c_str(),MAXBUF);
-								strlcpy(usr->dhost,hostname.c_str(),MAXBUF);
+								strlcpy(usr->host,hostname.c_str(),64);
+								strlcpy(usr->dhost,hostname.c_str(),64);
+								/*address_cache::iterator address = addrcache.find(usr->ip4);
+								if (address == addrcache.end())
+								{
+									log(DEBUG,"Caching hostname %s -> %s",(char*)inet_ntoa(usr->ip4),hostname.c_str());
+									addrcache[usr->ip4] = new std::string(hostname);
+								}*/
+								WriteServ(usr->fd,"NOTICE Auth :*** Found your hostname");
 							}
 							usr->dns_done = true;
 							return true;
@@ -168,6 +159,7 @@ public:
 					{
 						if ((usr->registered > 3) || (hostname == ""))
 						{
+							WriteServ(usr->fd,"NOTICE Auth :*** Could not resolve your hostname -- Using your IP address instead");
 							usr->dns_done = true;
 							return true;
 						}
@@ -195,12 +187,23 @@ public:
 	}
 };
 
-bool lookup_dns(std::string nick)
+bool lookup_dns(const std::string &nick)
 {
 	/* First attempt to find the nickname */
 	userrec* u = Find(nick);
 	if (u)
 	{
+		/* Check the cache */
+		/*address_cache::iterator address = addrcache.find(u->ip4);
+		if (address != addrcache.end())
+		{
+			WriteServ(u->fd,"NOTICE Auth :*** Found your hostname (cached)");
+			log(DEBUG,"Found cached host");
+			strlcpy(u->host,address->second->c_str(),MAXBUF);
+			strlcpy(u->dhost,address->second->c_str(),MAXBUF);
+			u->dns_done = true;
+			return true;
+		}*/
 		/* If the user exists, create a new
 		 * lookup object, and associate it
 		 * with the user. The lookup object
@@ -244,7 +247,7 @@ void dns_poll(int fdcheck)
 				 * from the socket engine, as dns.cpp tracks it
 				 * for us if we are in single-threaded country.
 				 */
-				delete x;
+				DELETE(x);
 			}
 		}
 		else
@@ -252,7 +255,7 @@ void dns_poll(int fdcheck)
 			/* its fd is dodgy, the dns code probably
 			 * bashed it due to error. Free the class.
 			 */
-			delete x;
+			DELETE(x);
 		}
 		/* If we got down here, the dns lookup was valid, BUT,
 		 * its still in progress. Be patient, and wait for
@@ -267,4 +270,3 @@ void dns_poll(int fdcheck)
 	if (ServerInstance && ServerInstance->SE)
 		ServerInstance->SE->DelFd(fdcheck);
 }
-