Make the debug loglevel always available

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

diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c
index 3f99b3a90178ede568e5212352cf78839db6a5f4..1931bc712e3be470672b92d484c7c9a9c9846f41 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-2011 Alexander Barton (alex@barton.de) and Contributors.
+ * 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 ));
@@ -98,9 +93,7 @@ Resolve_Name( PROC_STAT *s, const char *Host, void (*cbfunc)(int, short))
        pid = Proc_Fork(s, pipefd, cbfunc, RESOLVER_TIMEOUT);
        if (pid > 0) {
                /* Main process */
-#ifdef DEBUG
                Log( LOG_DEBUG, "Resolver for \"%s\" created (PID %d).", Host, pid );
-#endif
                return true;
        } else if( pid == 0 ) {
                /* Sub process */
@@ -113,9 +106,8 @@ Resolve_Name( PROC_STAT *s, const char *Host, void (*cbfunc)(int, short))
        return false;
 } /* Resolve_Name */
 
-
-#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
-#if !defined(WANT_IPV6) && defined(h_errno)
+#if !defined(HAVE_WORKING_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
+#ifdef h_errno
 static char *
 Get_Error( int H_Error )
 {
@@ -146,15 +138,11 @@ Do_IdentQuery(int identsock, array *resolved_addr)
        if (identsock < 0)
                return;
 
-#ifdef DEBUG
        Log_Subprocess(LOG_DEBUG, "Doing IDENT lookup on socket %d ...",
                       identsock);
-#endif
        res = ident_id( identsock, 10 );
-#ifdef DEBUG
        Log_Subprocess(LOG_DEBUG, "Ok, IDENT lookup on socket %d done: \"%s\"",
                       identsock, res ? res : "(NULL)");
-#endif
        if (!res) /* no result */
                return;
        if (!array_cats(resolved_addr, res))
@@ -222,8 +210,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;
 }
@@ -238,18 +226,19 @@ ReverseLookup(const ng_ipaddr_t *IpAddr, char *resbuf, size_t reslen)
  * @return true if lookup successful, false if domain name not found
  */
 static bool
+#ifdef HAVE_WORKING_GETADDRINFO
 ForwardLookup(const char *hostname, array *IpAddr, int af)
+#else
+ForwardLookup(const char *hostname, array *IpAddr, UNUSED int af)
+#endif
 {
        ng_ipaddr_t addr;
 
-#ifdef HAVE_GETADDRINFO
+#ifdef HAVE_WORKING_GETADDRINFO
        int res;
        struct addrinfo *a, *ai_results;
        static struct addrinfo hints;
 
-#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;
@@ -268,7 +257,7 @@ ForwardLookup(const char *hostname, array *IpAddr, int af)
        }
 
        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 ((size_t)a->ai_addrlen > sizeof(addr))
                        continue;
@@ -339,14 +328,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);
 }
 
 
@@ -376,9 +367,7 @@ Do_ResolveAddr(const ng_ipaddr_t *Addr, int identsock, int w_fd)
 
        array_init(&resolved_addr);
        ng_ipaddr_tostr_r(Addr, tmp_ip_str);
-#ifdef DEBUG
        Log_Subprocess(LOG_DEBUG, "Now resolving %s ...", tmp_ip_str);
-#endif
        if (!ReverseLookup(Addr, hostname, sizeof(hostname)))
                goto dns_done;
 
@@ -391,9 +380,7 @@ Do_ResolveAddr(const ng_ipaddr_t *Addr, int identsock, int w_fd)
                Log_Forgery_NoIP(tmp_ip_str, hostname);
                strlcpy(hostname, tmp_ip_str, sizeof(hostname));
        }
-#ifdef DEBUG
        Log_Subprocess(LOG_DEBUG, "Ok, translated %s to \"%s\".", tmp_ip_str, hostname);
-#endif
  dns_done:
        len = strlen(hostname);
        hostname[len] = '\n';
@@ -420,10 +407,8 @@ Do_ResolveName( const char *Host, int w_fd )
         * to parent. */
        array IpAddrs;
        int af;
-#ifdef DEBUG
        ng_ipaddr_t *addr;
        size_t len;
-#endif
        Log_Subprocess(LOG_DEBUG, "Now resolving \"%s\" ...", Host);
 
        array_init(&IpAddrs);
@@ -443,7 +428,6 @@ Do_ResolveName( const char *Host, int w_fd )
                close(w_fd);
                return;
        }
-#ifdef DEBUG
        len = array_length(&IpAddrs, sizeof(*addr));
        assert(len > 0);
        addr = array_start(&IpAddrs);
@@ -452,7 +436,6 @@ Do_ResolveName( const char *Host, int w_fd )
                Log_Subprocess(LOG_DEBUG, "translated \"%s\" to %s.",
                                        Host, ng_ipaddr_tostr(addr));
        }
-#endif
        /* Write result into pipe to parent */
        ArrayWrite(w_fd, &IpAddrs);