#include "portab.h"
-static char UNUSED id[] = "$Id: resolve.c,v 1.7 2003/12/27 13:01:12 alex Exp $";
+static char UNUSED id[] = "$Id: resolve.c,v 1.13 2005/07/07 18:39:08 fw Exp $";
#include "imp.h"
#include <assert.h>
#include "exp.h"
#include "resolve.h"
+#include "io.h"
#ifdef IDENTAUTH
-LOCAL VOID Do_ResolveAddr PARAMS(( struct sockaddr_in *Addr, INT Sock, INT w_fd ));
+LOCAL void Do_ResolveAddr PARAMS(( struct sockaddr_in *Addr, int Sock, int w_fd ));
#else
-LOCAL VOID Do_ResolveAddr PARAMS(( struct sockaddr_in *Addr, INT w_fd ));
+LOCAL void Do_ResolveAddr PARAMS(( struct sockaddr_in *Addr, int w_fd ));
#endif
-LOCAL VOID Do_ResolveName PARAMS(( CHAR *Host, INT w_fd ));
+LOCAL void Do_ResolveName PARAMS(( char *Host, int w_fd ));
#ifdef h_errno
-LOCAL CHAR *Get_Error PARAMS(( INT H_Error ));
+LOCAL char *Get_Error PARAMS(( int H_Error ));
#endif
+LOCAL RES_STAT *New_Res_Stat PARAMS(( void ));
-GLOBAL VOID
-Resolve_Init( VOID )
-{
- /* Initialize module */
- FD_ZERO( &Resolver_FDs );
-} /* Resolve_Init */
+static void
+cb_resolver(int fd, short unused) {
+ (void) unused; /* shut up compiler warning */
+ Read_Resolver_Result(fd);
+}
#ifdef IDENTAUTH
* can't be forked, this functions returns NULL. */
RES_STAT *s;
- INT pid;
+ int pid;
- /* Allocate memory */
- s = malloc( sizeof( RES_STAT ));
- if( ! s )
- {
- Log( LOG_EMERG, "Resolver: Can't allocate memory! [Resolve_Addr]" );
- return NULL;
- }
-
- /* Initialize pipe for result */
- if( pipe( s->pipe ) != 0 )
- {
- free( s );
- Log( LOG_ALERT, "Resolver: Can't create output pipe: %s!", strerror( errno ));
- return NULL;
- }
+ s = New_Res_Stat( );
+ if( ! s ) return NULL;
/* For sub-process */
pid = fork( );
if( pid > 0 )
{
+ close( s->pipe[1] );
/* Main process */
Log( LOG_DEBUG, "Resolver for %s created (PID %d).", inet_ntoa( Addr->sin_addr ), pid );
- FD_SET( s->pipe[0], &Resolver_FDs );
- if( s->pipe[0] > Conn_MaxFD ) Conn_MaxFD = s->pipe[0];
+ if (!io_setnonblock( s->pipe[0] )) {
+ Log( LOG_DEBUG, "Could not set Non-Blocking mode for pipefd %d", s->pipe[0] );
+ goto out;
+ }
+ if (!io_event_create( s->pipe[0], IO_WANTREAD, cb_resolver )) {
+ Log( LOG_DEBUG, "Could not add pipefd %dto event watchlist: %s",
+ s->pipe[0], strerror(errno) );
+ goto out;
+ }
s->pid = pid;
return s;
}
else if( pid == 0 )
{
+ close( s->pipe[0] );
/* Sub process */
Log_Init_Resolver( );
#ifdef IDENTAUTH
Log_Exit_Resolver( );
exit( 0 );
}
- else
- {
- /* Error! */
- free( s );
- Log( LOG_CRIT, "Resolver: Can't fork: %s!", strerror( errno ));
- return NULL;
- }
+
+ Log( LOG_CRIT, "Resolver: Can't fork: %s!", strerror( errno ));
+
+out: /* Error! */
+ close( s->pipe[0] );
+ free( s );
+return NULL;
} /* Resolve_Addr */
GLOBAL RES_STAT *
-Resolve_Name( CHAR *Host )
+Resolve_Name( char *Host )
{
/* Resolve hostname (asynchronous!). On errors, e.g. if the child
* process can't be forked, this functions returns NULL. */
RES_STAT *s;
- INT pid;
+ int pid;
- /* Allocate memory */
- s = malloc( sizeof( RES_STAT ));
- if( ! s )
- {
- Log( LOG_EMERG, "Resolver: Can't allocate memory! [Resolve_Name]" );
- return NULL;
- }
-
- /* Initialize the pipe for the result */
- if( pipe( s->pipe ) != 0 )
- {
- free( s );
- Log( LOG_ALERT, "Resolver: Can't create output pipe: %s!", strerror( errno ));
- return NULL;
- }
+ s = New_Res_Stat( );
+ if( ! s ) return NULL;
/* Fork sub-process */
pid = fork( );
if( pid > 0 )
{
+ close( s->pipe[1] );
/* Main process */
Log( LOG_DEBUG, "Resolver for \"%s\" created (PID %d).", Host, pid );
- FD_SET( s->pipe[0], &Resolver_FDs );
- if( s->pipe[0] > Conn_MaxFD ) Conn_MaxFD = s->pipe[0];
+ if (!io_setnonblock( s->pipe[0] )) {
+ Log( LOG_DEBUG, "Could not set Non-Blocking mode for pipefd %d", s->pipe[0] );
+ goto out;
+ }
+ if (!io_event_create( s->pipe[0], IO_WANTREAD, cb_resolver )) {
+ Log( LOG_DEBUG, "Could not add pipefd %dto event watchlist: %s",
+ s->pipe[0], strerror(errno) );
+ goto out;
+ }
s->pid = pid;
return s;
}
else if( pid == 0 )
{
+ close( s->pipe[0] );
/* Sub process */
Log_Init_Resolver( );
Do_ResolveName( Host, s->pipe[1] );
Log_Exit_Resolver( );
exit( 0 );
}
- else
- {
- /* Error! */
- free( s );
- Log( LOG_CRIT, "Resolver: Can't fork: %s!", strerror( errno ));
- return NULL;
- }
+
+ Log( LOG_CRIT, "Resolver: Can't fork: %s!", strerror( errno ));
+
+out: /* Error! */
+ close( s->pipe[0] );
+ free( s );
+ return NULL;
} /* Resolve_Name */
#ifdef IDENTAUTH
-LOCAL VOID
-Do_ResolveAddr( struct sockaddr_in *Addr, int Sock, INT w_fd )
+LOCAL void
+Do_ResolveAddr( struct sockaddr_in *Addr, int Sock, int w_fd )
#else
-LOCAL VOID
-Do_ResolveAddr( struct sockaddr_in *Addr, INT w_fd )
+LOCAL void
+Do_ResolveAddr( struct sockaddr_in *Addr, int w_fd )
#endif
{
/* Resolver sub-process: resolve IP address and write result into
* pipe to parent. */
- CHAR hostname[HOST_LEN];
+ char hostname[HOST_LEN];
struct hostent *h;
+ size_t len;
#ifdef IDENTAUTH
- CHAR *res;
+ char *res;
#endif
- Log_Resolver( LOG_DEBUG, "Now resolving %s ...", inet_ntoa( Addr->sin_addr ));
-
/* Resolve IP address */
- h = gethostbyaddr( (CHAR *)&Addr->sin_addr, sizeof( Addr->sin_addr ), AF_INET );
+ Log_Resolver( LOG_DEBUG, "Now resolving %s ...", inet_ntoa( Addr->sin_addr ));
+ h = gethostbyaddr( (char *)&Addr->sin_addr, sizeof( Addr->sin_addr ), AF_INET );
if( h ) strlcpy( hostname, h->h_name, sizeof( hostname ));
else
{
#endif
strlcpy( hostname, inet_ntoa( Addr->sin_addr ), sizeof( hostname ));
}
+ Log_Resolver( LOG_DEBUG, "Ok, translated %s to \"%s\".", inet_ntoa( Addr->sin_addr ), hostname );
-#ifdef IDENTAUTH
- /* Do "IDENT" (aka "AUTH") lookup and write result to parent */
- Log_Resolver( LOG_DEBUG, "Doing IDENT lookup on socket %d ...", Sock );
- res = ident_id( Sock, 10 );
- Log_Resolver( LOG_DEBUG, "IDENT lookup on socket %d done.", Sock );
-#endif
-
- /* Write result into pipe to parent */
- if( (size_t)write( w_fd, hostname, strlen( hostname ) + 1 ) != (size_t)( strlen( hostname ) + 1 ))
+ /* Write resolver result into pipe to parent */
+ len = strlen( hostname );
+ hostname[len] = '\n'; len++;
+ if( (size_t)write( w_fd, hostname, len ) != (size_t)len )
{
Log_Resolver( LOG_CRIT, "Resolver: Can't write to parent: %s!", strerror( errno ));
close( w_fd );
return;
}
+
#ifdef IDENTAUTH
- if( (size_t)write( w_fd, res ? res : "", strlen( res ? res : "" ) + 1 ) != (size_t)( strlen( res ? res : "" ) + 1 ))
+ /* Do "IDENT" (aka "AUTH") lookup and write result to parent */
+ Log_Resolver( LOG_DEBUG, "Doing IDENT lookup on socket %d ...", Sock );
+ res = ident_id( Sock, 10 );
+ Log_Resolver( LOG_DEBUG, "Ok, IDENT lookup on socket %d done: \"%s\"", Sock, res ? res : "" );
+
+ /* Write IDENT result into pipe to parent */
+ if (res) {
+ len = strlen(res);
+ res[len] = '\n';
+ len++;
+ } else len = 1;
+
+ if( (size_t)write( w_fd, res ? res : "\n", len ) != (size_t)len )
{
Log_Resolver( LOG_CRIT, "Resolver: Can't write to parent (IDENT): %s!", strerror( errno ));
close( w_fd );
- free( res );
- return;
}
free( res );
#endif
-
- Log_Resolver( LOG_DEBUG, "Ok, translated %s to \"%s\".", inet_ntoa( Addr->sin_addr ), hostname );
} /* Do_ResolveAddr */
-LOCAL VOID
-Do_ResolveName( CHAR *Host, INT w_fd )
+LOCAL void
+Do_ResolveName( char *Host, int w_fd )
{
/* Resolver sub-process: resolve name and write result into pipe
* to parent. */
- CHAR ip[16];
+ char ip[16];
struct hostent *h;
struct in_addr *addr;
+ int len;
Log_Resolver( LOG_DEBUG, "Now resolving \"%s\" ...", Host );
#else
Log_Resolver( LOG_WARNING, "Can't resolve \"%s\"!", Host );
#endif
- strcpy( ip, "" );
+ ip[0] = '\0';
}
+ if( ip[0] ) Log_Resolver( LOG_DEBUG, "Ok, translated \"%s\" to %s.", Host, ip );
/* Write result into pipe to parent */
- if( (size_t)write( w_fd, ip, strlen( ip ) + 1 ) != (size_t)( strlen( ip ) + 1 ))
+ len = strlen( ip );
+ ip[len] = '\n'; len++;
+ if( (size_t)write( w_fd, ip, len ) != (size_t)len )
{
Log_Resolver( LOG_CRIT, "Resolver: Can't write to parent: %s!", strerror( errno ));
close( w_fd );
- return;
}
-
- if( ip[0] ) Log_Resolver( LOG_DEBUG, "Ok, translated \"%s\" to %s.", Host, ip );
} /* Do_ResolveName */
#ifdef h_errno
-LOCAL CHAR *
-Get_Error( INT H_Error )
+LOCAL char *
+Get_Error( int H_Error )
{
/* Get error message for H_Error */
#endif
+LOCAL RES_STAT *
+New_Res_Stat( void )
+{
+ RES_STAT *s;
+
+ /* Allocate memory */
+ s = (RES_STAT *)malloc( sizeof( RES_STAT ));
+ if( ! s )
+ {
+ Log( LOG_EMERG, "Resolver: Can't allocate memory! [Resolve_Addr]" );
+ return NULL;
+ }
+
+ /* Initialize pipe for result */
+ if( pipe( s->pipe ) != 0 )
+ {
+ free( s );
+ Log( LOG_ALERT, "Resolver: Can't create output pipe: %s!", strerror( errno ));
+ return NULL;
+ }
+
+ s->stage = 0;
+ s->bufpos = 0;
+ s->pid = -1;
+
+ return s;
+} /* New_Res_Stat */
+
+
/* -eof- */
projects / ngircd-alex.git / blobdiff