Change log message for "Can't resolve address"

[ngircd-alex.git] / src / ngircd / resolve.c

diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c
index 9aeb68e35e82a9fc0db263d573d2ca91e8e3d158..32791901215c475c95982616e8d95b321efe7680 100644 (file)
--- a/src/ngircd/resolve.c
+++ b/src/ngircd/resolve.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2009 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,16 +18,16 @@
  * Asynchronous resolver
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#include <signal.h>
 
 #ifdef IDENTAUTH
 #ifdef HAVE_IDENT_H
@@ -35,17 +35,12 @@
 #endif
 #endif
 
-#include "array.h"
 #include "conn.h"
 #include "conf.h"
-#include "defines.h"
 #include "log.h"
 #include "ng_ipaddr.h"
 
-#include "exp.h"
 #include "resolve.h"
-#include "io.h"
-
 
 static void Do_ResolveAddr PARAMS(( const ng_ipaddr_t *Addr, int Sock, int w_fd ));
 static void Do_ResolveName PARAMS(( const char *Host, int w_fd ));
@@ -75,7 +70,8 @@ Resolve_Addr(PROC_STAT * s, const ng_ipaddr_t *Addr, int identsock,
        } else if( pid == 0 ) {
                /* Sub process */
                Log_Init_Subprocess("Resolver");
-               Do_ResolveAddr( Addr, identsock, pipefd[1]);
+               Conn_CloseAllSockets(identsock);
+               Do_ResolveAddr(Addr, identsock, pipefd[1]);
                Log_Exit_Subprocess("Resolver");
                exit(0);
        }
@@ -104,6 +100,7 @@ Resolve_Name( PROC_STAT *s, const char *Host, void (*cbfunc)(int, short))
        } else if( pid == 0 ) {
                /* Sub process */
                Log_Init_Subprocess("Resolver");
+               Conn_CloseAllSockets(NONE);
                Do_ResolveName(Host, pipefd[1]);
                Log_Exit_Subprocess("Resolver");
                exit(0);
@@ -220,8 +217,8 @@ ReverseLookup(const ng_ipaddr_t *IpAddr, char *resbuf, size_t reslen)
        assert(reslen >= NG_INET_ADDRSTRLEN);
        ng_ipaddr_tostr_r(IpAddr, tmp_ip_str);
 
-       Log_Subprocess(LOG_WARNING, "%s: Can't resolve address \"%s\": %s",
-                               funcname, tmp_ip_str, errmsg);
+       Log_Subprocess(LOG_WARNING, "Can't resolve address \"%s\": %s [%s].",
+                      tmp_ip_str, errmsg, funcname);
        strlcpy(resbuf, tmp_ip_str, reslen);
        return false;
 }
@@ -236,32 +233,22 @@ ReverseLookup(const ng_ipaddr_t *IpAddr, char *resbuf, size_t reslen)
  * @return true if lookup successful, false if domain name not found
  */
 static bool
-ForwardLookup(const char *hostname, array *IpAddr)
+ForwardLookup(const char *hostname, array *IpAddr, int af)
 {
        ng_ipaddr_t addr;
 
-#ifdef HAVE_GETADDRINFO
+#ifdef HAVE_WORKING_GETADDRINFO
        int res;
        struct addrinfo *a, *ai_results;
        static struct addrinfo hints;
 
-#ifndef WANT_IPV6
-       hints.ai_family = AF_INET;
-#endif
 #ifdef AI_ADDRCONFIG   /* glibc has this, but not e.g. netbsd 4.0 */
        hints.ai_flags = AI_ADDRCONFIG;
 #endif
        hints.ai_socktype = SOCK_STREAM;
        hints.ai_protocol = IPPROTO_TCP;
+       hints.ai_family = af;
 
-#ifdef WANT_IPV6
-       assert(Conf_ConnectIPv6 || Conf_ConnectIPv4);
-
-       if (!Conf_ConnectIPv6)
-               hints.ai_family = AF_INET;
-       if (!Conf_ConnectIPv4)
-               hints.ai_family = AF_INET6;
-#endif
        memset(&addr, 0, sizeof(addr));
 
        res = getaddrinfo(hostname, NULL, &hints, &ai_results);
@@ -276,9 +263,9 @@ ForwardLookup(const char *hostname, array *IpAddr)
        }
 
        for (a = ai_results; a != NULL; a = a->ai_next) {
-               assert(a->ai_addrlen <= sizeof(addr));
+               assert((size_t)a->ai_addrlen <= sizeof(addr));
 
-               if (a->ai_addrlen > sizeof(addr))
+               if ((size_t)a->ai_addrlen > sizeof(addr))
                        continue;
 
                memcpy(&addr, a->ai_addr, a->ai_addrlen);
@@ -347,14 +334,16 @@ static void
 Log_Forgery_NoIP(const char *ip, const char *host)
 {
        Log_Subprocess(LOG_WARNING,
-               "Possible forgery: %s resolved to %s (which has no ip address)", ip, host);
+               "Possible forgery: %s resolved to \"%s\", which has no IP address!",
+               ip, host);
 }
 
 static void
 Log_Forgery_WrongIP(const char *ip, const char *host)
 {
        Log_Subprocess(LOG_WARNING,
-               "Possible forgery: %s resolved to %s (which points to different address)", ip, host);
+               "Possible forgery: %s resolved to \"%s\", which points to a different address!",
+               ip, host);
 }
 
 
@@ -390,7 +379,7 @@ Do_ResolveAddr(const ng_ipaddr_t *Addr, int identsock, int w_fd)
        if (!ReverseLookup(Addr, hostname, sizeof(hostname)))
                goto dns_done;
 
-       if (ForwardLookup(hostname, &resolved_addr)) {
+       if (ForwardLookup(hostname, &resolved_addr, ng_ipaddr_af(Addr))) {
                if (!Addr_in_list(&resolved_addr, Addr)) {
                        Log_Forgery_WrongIP(tmp_ip_str, hostname);
                        strlcpy(hostname, tmp_ip_str, sizeof(hostname));
@@ -427,6 +416,7 @@ Do_ResolveName( const char *Host, int w_fd )
        /* Resolver sub-process: resolve name and write result into pipe
         * to parent. */
        array IpAddrs;
+       int af;
 #ifdef DEBUG
        ng_ipaddr_t *addr;
        size_t len;
@@ -434,8 +424,19 @@ Do_ResolveName( const char *Host, int w_fd )
        Log_Subprocess(LOG_DEBUG, "Now resolving \"%s\" ...", Host);
 
        array_init(&IpAddrs);
-       /* Resolve hostname */
-       if (!ForwardLookup(Host, &IpAddrs)) {
+
+#ifdef WANT_IPV6
+       af = AF_UNSPEC;
+       assert(Conf_ConnectIPv6 || Conf_ConnectIPv4);
+
+       if (!Conf_ConnectIPv6)
+               af = AF_INET;
+       if (!Conf_ConnectIPv4)
+               af = AF_INET6;
+#else
+       af = AF_INET;
+#endif
+       if (!ForwardLookup(Host, &IpAddrs, af)) {
                close(w_fd);
                return;
        }