*/
+#define RESOLVER_TIMEOUT (Conf_PongTimeout*3)/4
+
#include "portab.h"
#include "imp.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_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");
Do_ResolveName(Host, pipefd[1]);
Log_Exit_Subprocess("Resolver");
exit(0);
} /* Resolve_Name */
-/**
- * Signal handler for the forked resolver subprocess.
- */
-static void
-Signal_Handler(int Signal)
-{
- switch(Signal) {
- case SIGTERM:
-#ifdef DEBUG
- Log_Subprocess(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_Subprocess("Resolver");
-}
-
-
#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
#if !defined(WANT_IPV6) && defined(h_errno)
static char *
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 different address)", ip, host);
}
} /* 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- */