Comments, add more detail, remove dnsqueue.h include from tons of places

Remove THREADED_DNS defines from all over the place


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4629 e03df62e-2008-0410-955e-edbf42e46eb7

10 files changed, 16 insertions, 42 deletions

diff --git a/include/users.h b/include/users.h
index 9229cbe11..ea8700485 100644
--- a/include/users.h
+++ b/include/users.h
@@ -18,11 +18,6 @@
 #define __USERS_H__ 
 
 #include <string>
-
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
-
 #include "inspircd_config.h" 
 #include "socket.h"
 #include "channels.h"
@@ -69,9 +64,15 @@ class Invited : public classbase
 	 irc::string channel;
 };
 
+
+
+/** Derived from Resolver, and performs user forward/reverse lookups.
+ */
 class UserResolver : public Resolver
 {
  private:
+	/** User this class is 'attached' to.
+	 */
 	userrec* bound_user;
 	int bound_fd;
  public:
@@ -416,12 +417,6 @@ class userrec : public connection
 	/** Default destructor
 	 */
 	virtual ~userrec();
-
-#ifdef THREADED_DNS
-	/** Thread used for threaded lookups
-	 */
-	pthread_t dnsthread;
-#endif
 };
 
 /** Used to hold WHOWAS information
diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 17da0e8c8..b767bc32b 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -23,7 +23,6 @@
 #include "modules.h"
 #include "commands.h"
 #include "xline.h"
-#include "dnsqueue.h"
 #include "dns.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index e05736eda..310c91266 100644
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -30,7 +30,6 @@
 #include "mode.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "socketengine.h"
diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp
index dfa33e91c..0fff0ee52 100644
--- a/src/cmd_quit.cpp
+++ b/src/cmd_quit.cpp
@@ -30,7 +30,6 @@
 #include "mode.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "socketengine.h"
diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp
index a44091f6c..a79c34803 100644
--- a/src/cmd_stats.cpp
+++ b/src/cmd_stats.cpp
@@ -36,7 +36,6 @@
 #include "mode.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "socketengine.h"
diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 386f09321..08c082383 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -26,10 +26,6 @@
 #include <string>
 #include <sstream>
 #include <vector>
-#include <sched.h>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
 #include "users.h"
 #include "globals.h"
 #include "modules.h"
@@ -40,7 +36,6 @@
 #include "commands.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "socketengine.h"
diff --git a/src/commands.cpp b/src/commands.cpp
index c762510e7..247fc89b7 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -29,9 +29,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
 #ifndef RUSAGE_SELF
 #define   RUSAGE_SELF     0
 #define   RUSAGE_CHILDREN     -1
@@ -47,7 +44,6 @@
 #include "mode.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "socketengine.h"
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 7b298418e..23a4bb496 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -56,7 +56,6 @@
 #include "commands.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "socketengine.h"
diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index e8591c319..22a48fdcc 100644
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -33,10 +33,6 @@ using namespace std;
 #include <sstream>
 #include <vector>
 #include <deque>
-#include <sched.h>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
 #include "users.h"
 #include "ctables.h"
 #include "globals.h"
@@ -48,7 +44,6 @@ using namespace std;
 #include "commands.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "socketengine.h"
diff --git a/src/users.cpp b/src/users.cpp
index dcc33b22c..8e466592e 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -21,10 +21,6 @@
 #include "users.h"
 #include "inspircd.h"
 #include <stdio.h>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#include <signal.h>
-#endif
 #include "inspstring.h"
 #include "commands.h"
 #include "helperfuncs.h"
@@ -165,13 +161,21 @@ void UserResolver::OnLookupComplete(const std::string &result)
 		if (insp_ntoa(this->bound_user->ip4) == result)
 		{
 			std::string hostname = this->bound_user->stored_host;
-			if (hostname.length() < 64)
+			if (hostname.length() < 65)
 			{
-				WriteServ(this->bound_fd, "*** Found your hostname (%s)", this->bound_user->stored_host.c_str());
+				WriteServ(this->bound_fd, "NOTICE Auth :*** Found your hostname (%s)", this->bound_user->stored_host.c_str());
 				this->bound_user->dns_done = true;
 				strlcpy(this->bound_user->dhost, hostname.c_str(),64);
 				strlcpy(this->bound_user->host, hostname.c_str(),64);
 			}
+			else
+			{
+				WriteServ(this->bound_fd, "NOTICE Auth :*** Your hostname is longer than the maximum of 64 characters, using your IP address (%s) instead.", insp_ntoa(this->bound_user->ip4));
+			}
+		}
+		else
+		{
+			WriteServ(this->bound_fd, "NOTICE Auth :*** Your hostname does not match up with your IP address. Sorry, using your IP address (%s) instead.", insp_ntoa(this->bound_user->ip4));
 		}
 	}
 }
@@ -270,12 +274,6 @@ userrec::~userrec()
 		ucrec* x = (ucrec*)*n;
 		delete x;
 	}
-#ifdef THREADED_DNS
-	if ((IS_LOCAL(this)) && (!dns_done) && (registered >= REG_NICKUSER))
-	{
-		pthread_kill(this->dnsthread, SIGTERM);
-	}
-#endif
 }
 
 /* XXX - minor point, other *Host functions return a char *, this one creates it. Might be nice to be consistant? */