X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdnsqueue.cpp;h=6d62b7ede9a228ec8d2bd2df58882c3d22f368bf;hb=bb81e1a5f38b1d6487e53aa5ac69ca7ced9f6562;hp=1495316c5ba23dfd00ae4e94498c4b51ca57a0a4;hpb=f278bdbbad200b5424c5721ac85ee3dd8d982d60;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dnsqueue.cpp b/src/dnsqueue.cpp
index 1495316c5..6d62b7ede 100644
--- a/src/dnsqueue.cpp
+++ b/src/dnsqueue.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -69,11 +69,13 @@ public:
 	Lookup()
 	{
 		*u = 0;
+		hostname = "";
 	}
 
 	void Reset()
 	{
 		*u = 0;
+		hostname = "";
 	}
 
 	~Lookup()
@@ -91,7 +93,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 +127,17 @@ public:
 						}
 						if ((hostname != "") && (usr->registered != 7))
 						{
-							if (std::string(usr->ip) == ip)
+							if (std::string((char*)inet_ntoa(usr->ip4)) == ip)
 							{
 								strlcpy(usr->host,hostname.c_str(),MAXBUF);
 								strlcpy(usr->dhost,hostname.c_str(),MAXBUF);
+								/*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 +177,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;
 						}
@@ -201,6 +211,17 @@ bool lookup_dns(std::string nick)
 	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