X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fresolve.c;h=be41ec8a97517087840444321c520e4a4adc2f3b;hb=84ff5a6eb975fbabfaaa92447246571721a016bc;hp=c7e600381e81b571ded2cd343887529418e7d59c;hpb=30796698a9fca0037ea48f70ceafac1e783d06fb;p=ngircd-alex.git diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index c7e60038..be41ec8a 100644 --- 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 #include #include #include #include +#include +#include #include #include #include -#include #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 )); @@ -242,7 +237,7 @@ 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; @@ -268,9 +263,9 @@ 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 (a->ai_addrlen > sizeof(addr)) + if ((size_t)a->ai_addrlen > sizeof(addr)) continue; memcpy(&addr, a->ai_addr, a->ai_addrlen);