Add 'no such server' on remote stats to invalid name

[user/henk/code/inspircd.git] / src / socket.cpp

diff --git a/src/socket.cpp b/src/socket.cpp
index 1b8455c65eb5c9e2f9cf926d5a03a43f06303384..d826bfb8c0a8a8491f63ab2e751f3f4a02123918 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -28,66 +28,43 @@ extern ServerConfig* Config;
 extern time_t TIME;
 
 /** This will bind a socket to a port. It works for UDP/TCP.
- * If a hostname is given to bind to, the function will first
- * attempt to resolve the hostname, then bind to the IP the 
- * hostname resolves to. This is a blocking lookup blocking for
- * a maximum of one second before it times out, using the DNS
- * server specified in the configuration file.
+ * It can only bind to IP addresses, if you wish to bind to hostnames
+ * you should first resolve them using class 'Resolver'.
  */ 
 bool BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr)
 {
        memset(&server,0,sizeof(server));
        insp_inaddr addy;
-       bool resolved = false;
-       char resolved_addr[128];
 
        if (*addr == '*')
                *addr = 0;
 
-       if (*addr && !insp_aton(addr,&addy))
+       if ((*addr) && (insp_aton(addr,&addy) < 1))
        {
-               /* If they gave a hostname, bind to the IP it resolves to */
-               if (CleanAndResolve(resolved_addr, addr, true, 1))
-               {
-                       insp_aton(resolved_addr,&addy);
-                       log(DEFAULT,"Resolved binding '%s' -> '%s'",addr,resolved_addr);
-#ifdef IPV6
-                       /* Todo: Deal with resolution of IPV6 */
-                       server.sin6_addr = addy;
-#else
-                       server.sin_addr = addy;
-#endif
-                       resolved = true;
-               }
-               else
-               {
-                       log(DEFAULT,"WARNING: Could not resolve '%s' to an IP for binding to on port %d",addr,port);
-                       return false;
-               }
+               log(DEBUG,"Invalid IP '%s' given to BindSocket()", addr);
+               return false;;
        }
+
 #ifdef IPV6
        server.sin6_family = AF_FAMILY;
 #else
        server.sin_family = AF_FAMILY;
 #endif
-       if (!resolved)
+       if (!*addr)
        {
-               if (!*addr)
-               {
 #ifdef IPV6
-                       memcpy(&addy, &server.sin6_addr, sizeof(in6_addr));
+               memcpy(&addy, &server.sin6_addr, sizeof(in6_addr));
 #else
-                       server.sin_addr.s_addr = htonl(INADDR_ANY);
+               server.sin_addr.s_addr = htonl(INADDR_ANY);
 #endif
-               }
-               else
-               {
+       }
+       else
+       {
 #ifdef IPV6
-                       memcpy(&addy, &server.sin6_addr, sizeof(in6_addr));
+               memcpy(&addy, &server.sin6_addr, sizeof(in6_addr));
 #else
-                       server.sin_addr = addy;
+               server.sin_addr = addy;
 #endif
-               }
        }
 #ifdef IPV6
        server.sin6_port = htons(port);
@@ -278,5 +255,6 @@ const char* insp_ntoa(insp_inaddr n)
 
 int insp_aton(const char* a, insp_inaddr* n)
 {
-       return (inet_pton(AF_FAMILY, a, &n) < 0);
+       return inet_pton(AF_FAMILY, a, n);
 }
+