/*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information.
- *
- * Asynchronous resolver
*/
+#define RESOLVER_TIMEOUT (Conf_PongTimeout*3)/4
#include "portab.h"
-#include "imp.h"
+/**
+ * @file
+ * Asynchronous resolver
+ */
+
#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>
#endif
#endif
-#include "array.h"
#include "conn.h"
-#include "defines.h"
+#include "conf.h"
#include "log.h"
#include "ng_ipaddr.h"
-#include "proc.h"
-#include "exp.h"
#include "resolve.h"
-#include "io.h"
-
-static void Init_Subprocess PARAMS(( void ));
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 ));
assert(s != NULL);
- pid = Proc_Fork(s, pipefd, cbfunc);
+ pid = Proc_Fork(s, pipefd, cbfunc, RESOLVER_TIMEOUT);
if (pid > 0) {
LogDebug("Resolver for %s created (PID %d).", ng_ipaddr_tostr(Addr), pid);
return true;
} else if( pid == 0 ) {
/* Sub process */
- Init_Subprocess();
- Do_ResolveAddr( Addr, identsock, pipefd[1]);
+ Log_Init_Subprocess("Resolver");
+ Conn_CloseAllSockets(identsock);
+ Do_ResolveAddr(Addr, identsock, pipefd[1]);
Log_Exit_Subprocess("Resolver");
exit(0);
}
assert(s != NULL);
- pid = Proc_Fork(s, pipefd, cbfunc);
+ pid = Proc_Fork(s, pipefd, cbfunc, RESOLVER_TIMEOUT);
if (pid > 0) {
/* Main process */
#ifdef DEBUG
return true;
} else if( pid == 0 ) {
/* Sub process */
- Init_Subprocess();
+ Log_Init_Subprocess("Resolver");
+ Conn_CloseAllSockets(NONE);
Do_ResolveName(Host, pipefd[1]);
Log_Exit_Subprocess("Resolver");
exit(0);
} /* Resolve_Name */
-/**
- * Initialize forked resolver subprocess.
- */
-static void
-Init_Subprocess(void)
-{
- signal(SIGTERM, Proc_GenericSignalHandler);
- Log_Init_Subprocess("Resolver");
-}
-
-
#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
#if !defined(WANT_IPV6) && defined(h_errno)
static char *
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;
}
* @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);
}
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);
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);
+ Log_Subprocess(LOG_WARNING,
+ "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);
+ Log_Subprocess(LOG_WARNING,
+ "Possible forgery: %s resolved to \"%s\", which points to a different address!",
+ ip, host);
}
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));
/* 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;
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;
}
} /* Do_ResolveName */
-/**
- * Read result of resolver sub-process from pipe
- */
-GLOBAL size_t
-Resolve_Read( PROC_STAT *s, void* readbuf, size_t buflen)
-{
- ssize_t bytes_read;
-
- assert(buflen > 0);
-
- /* Read result from pipe */
- bytes_read = read(Proc_GetPipeFd(s), readbuf, buflen);
- if (bytes_read < 0) {
- if (errno == EAGAIN)
- return 0;
-
- Log( LOG_CRIT, "Resolver: Can't read result: %s!", strerror(errno));
- bytes_read = 0;
- }
-#ifdef DEBUG
- else if (bytes_read == 0)
- Log( LOG_DEBUG, "Resolver: Can't read result: EOF");
-#endif
- Proc_Kill(s);
- return (size_t)bytes_read;
-}
-
-
/* -eof- */
projects / ngircd-alex.git / blobdiff