* 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"
+/**
+ * @file
+ * Asynchronous resolver
+ */
+
#include "imp.h"
#include <assert.h>
#include <errno.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
+#include <signal.h>
#ifdef IDENTAUTH
#ifdef HAVE_IDENT_H
#include "array.h"
#include "conn.h"
+#include "conf.h"
#include "defines.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();
+ Log_Init_Subprocess("Resolver");
Do_ResolveAddr( Addr, identsock, pipefd[1]);
- Log_Exit_Resolver( );
+ Log_Exit_Subprocess("Resolver");
exit(0);
}
return false;
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");
Do_ResolveName(Host, pipefd[1]);
- Log_Exit_Resolver( );
+ Log_Exit_Subprocess("Resolver");
exit(0);
}
return false;
} /* Resolve_Name */
-/**
- * Signal handler for the forked resolver subprocess.
- */
-static void
-Signal_Handler(int Signal)
-{
- switch(Signal) {
- case SIGTERM:
-#ifdef DEBUG
- Log_Resolver(LOG_DEBUG, "Resolver: Got TERM signal, exiting.");
-#endif
- exit(1);
- }
-}
-
-
-/**
- * Initialize forked resolver subprocess.
- */
-static void
-Init_Subprocess(void)
-{
- signal(SIGTERM, Signal_Handler);
- Log_Init_Resolver();
-}
-
-
#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
#if !defined(WANT_IPV6) && defined(h_errno)
static char *
return;
#ifdef DEBUG
- Log_Resolver(LOG_DEBUG, "Doing IDENT lookup on socket %d ...", identsock);
+ Log_Subprocess(LOG_DEBUG, "Doing IDENT lookup on socket %d ...",
+ identsock);
#endif
res = ident_id( identsock, 10 );
#ifdef DEBUG
- Log_Resolver(LOG_DEBUG, "Ok, IDENT lookup on socket %d done: \"%s\"",
- identsock, res ? res : "(NULL)" );
+ 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))
- Log_Resolver(LOG_WARNING, "Resolver: Cannot copy IDENT result: %s!", strerror(errno));
+ Log_Subprocess(LOG_WARNING,
+ "Resolver: Cannot copy IDENT result: %s!",
+ strerror(errno));
free(res);
#else
assert(reslen >= NG_INET_ADDRSTRLEN);
ng_ipaddr_tostr_r(IpAddr, tmp_ip_str);
- Log_Resolver(LOG_WARNING, "%s: Can't resolve address \"%s\": %s",
+ Log_Subprocess(LOG_WARNING, "%s: Can't resolve address \"%s\": %s",
funcname, tmp_ip_str, errmsg);
strlcpy(resbuf, tmp_ip_str, reslen);
return false;
switch (res) {
case 0: break;
case EAI_SYSTEM:
- Log_Resolver(LOG_WARNING, "Can't resolve \"%s\": %s", hostname, strerror(errno));
+ Log_Subprocess(LOG_WARNING, "Can't resolve \"%s\": %s", hostname, strerror(errno));
return false;
default:
- Log_Resolver(LOG_WARNING, "Can't resolve \"%s\": %s", hostname, gai_strerror(res));
+ Log_Subprocess(LOG_WARNING, "Can't resolve \"%s\": %s", hostname, gai_strerror(res));
return false;
}
if (!h) {
#ifdef h_errno
- Log_Resolver(LOG_WARNING, "Can't resolve \"%s\": %s", hostname, Get_Error(h_errno));
+ Log_Subprocess(LOG_WARNING, "Can't resolve \"%s\": %s",
+ hostname, Get_Error(h_errno));
#else
- Log_Resolver(LOG_WARNING, "Can't resolve \"%s\"", hostname);
+ Log_Subprocess(LOG_WARNING, "Can't resolve \"%s\"", hostname);
#endif
return false;
}
tmpAddrs = array_start(resolved_addr);
while (len > 0) {
- Log_Resolver(LOG_WARNING, "Address mismatch: %s != %s",
+ Log_Subprocess(LOG_WARNING, "Address mismatch: %s != %s",
tmp_ip_str, ng_ipaddr_tostr(tmpAddrs));
tmpAddrs++;
len--;
static void
Log_Forgery_NoIP(const char *ip, const char *host)
{
- Log_Resolver(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_Resolver(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 different address)", ip, host);
}
assert(data);
if( (size_t)write(fd, data, len) != len )
- Log_Resolver( LOG_CRIT, "Resolver: Can't write to parent: %s!",
+ Log_Subprocess( LOG_CRIT, "Resolver: Can't write to parent: %s!",
strerror(errno));
}
array_init(&resolved_addr);
ng_ipaddr_tostr_r(Addr, tmp_ip_str);
#ifdef DEBUG
- Log_Resolver(LOG_DEBUG, "Now resolving %s ...", tmp_ip_str);
+ Log_Subprocess(LOG_DEBUG, "Now resolving %s ...", tmp_ip_str);
#endif
if (!ReverseLookup(Addr, hostname, sizeof(hostname)))
goto dns_done;
strlcpy(hostname, tmp_ip_str, sizeof(hostname));
}
#ifdef DEBUG
- Log_Resolver(LOG_DEBUG, "Ok, translated %s to \"%s\".", tmp_ip_str, hostname);
+ Log_Subprocess(LOG_DEBUG, "Ok, translated %s to \"%s\".", tmp_ip_str, hostname);
#endif
dns_done:
len = strlen(hostname);
hostname[len] = '\n';
if (!array_copyb(&resolved_addr, hostname, ++len)) {
- Log_Resolver(LOG_CRIT, "Resolver: Can't copy resolved name: %s!", strerror(errno));
+ Log_Subprocess(LOG_CRIT,
+ "Resolver: Can't copy resolved name: %s!",
+ strerror(errno));
array_free(&resolved_addr);
return;
}
ng_ipaddr_t *addr;
size_t len;
#endif
- Log_Resolver(LOG_DEBUG, "Now resolving \"%s\" ...", Host);
+ Log_Subprocess(LOG_DEBUG, "Now resolving \"%s\" ...", Host);
array_init(&IpAddrs);
/* Resolve hostname */
addr = array_start(&IpAddrs);
assert(addr);
for (; len > 0; --len,addr++) {
- Log_Resolver(LOG_DEBUG, "translated \"%s\" to %s.",
+ Log_Subprocess(LOG_DEBUG, "translated \"%s\" to %s.",
Host, ng_ipaddr_tostr(addr));
}
#endif
} /* 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