(1) remove CleanAndResolve.

(2) remove feature of being able to bind hostnames in <bind> tags (it used CleanAndResolve) :p
(3) Fix the stuff in SpanningTree that used CleanAndResolve to validate connecting ip addresses - it now builds an 'allowed ip cache' on rehash/startup instead


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

2 files changed, 5 insertions, 10 deletions

diff --git a/include/inspsocket.h b/include/inspsocket.h
index 077f20a65..b644151dc 100644
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -59,10 +59,6 @@ class InspSocket : public Extensible
         int fd;
 
 	/**
-	 * The resolver for this socket
-	 */
-
-	/**
 	 * The hostname connected to
 	 */
 	char host[MAXBUF];
@@ -184,15 +180,15 @@ class InspSocket : public Extensible
 	/**
 	 * This constructor is used to create a new
 	 * socket, either listening for connections, or an outbound connection to another host.
-	 * Note that if you specify a hostname in the 'host' parameter, then there will be an extra
-	 * step involved (a nonblocking DNS lookup) which will cause your connection to be established
-	 * slower than if it was an IP. Therefore, use an IP address where it is available instead.
-	 * @param host The hostname to connect to, or bind to
+	 * Note that if you specify a hostname in the 'ipaddr' parameter, this class will not
+	 * connect. You must resolve your hostnames before passing them to InspSocket. To do so,
+	 * you should use the nonblocking class 'Resolver'.
+	 * @param ipaddr The IP to connect to, or bind to
 	 * @param port The port number to connect to, or bind to
 	 * @param listening true to listen on the given host:port pair, or false to connect to them
 	 * @param maxtime Number of seconds to wait, if connecting, before the connection times out and an OnTimeout() event is generated
 	 */
-	InspSocket(const std::string &host, int port, bool listening, unsigned long maxtime);
+	InspSocket(const std::string &ipaddr, int port, bool listening, unsigned long maxtime);
 
 	/**
 	 * This method is called when an outbound
diff --git a/include/message.h b/include/message.h
index fd9d47ff2..f7fcba278 100644
--- a/include/message.h
+++ b/include/message.h
@@ -31,7 +31,6 @@
 int common_channels(userrec *u, userrec *u2);
 void Blocking(int s);
 void NonBlocking(int s);
-int CleanAndResolve(char *resolvedHost, const char *unresolvedHost, bool forward, unsigned long timeout);
 int c_count(userrec* u);
 void ChangeName(userrec* user, const char* gecos);
 void ChangeDisplayedHost(userrec* user, const char* host);