New configuration option "OperServerMode".

[ngircd-alex.git] / src / ngircd / resolve.c

diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c
index c8cf7621c506c01e0cbe8d30248d843e49eb313e..846e5236d40b1d630c22405a9e1477aa81622a9b 100644 (file)
--- a/src/ngircd/resolve.c
+++ b/src/ngircd/resolve.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: resolve.c,v 1.8 2004/03/11 22:16:31 alex Exp $";
+static char UNUSED id[] = "$Id: resolve.c,v 1.10 2005/03/05 12:57:14 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -53,6 +53,8 @@ LOCAL VOID Do_ResolveName PARAMS(( CHAR *Host, INT w_fd ));
 LOCAL CHAR *Get_Error PARAMS(( INT H_Error ));
 #endif
 
+LOCAL RES_STAT *New_Res_Stat PARAMS(( VOID ));
+
 
 GLOBAL VOID
 Resolve_Init( VOID )
@@ -77,21 +79,8 @@ Resolve_Addr( struct sockaddr_in *Addr )
        RES_STAT *s;
        INT pid;
 
-       /* 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 = New_Res_Stat( );
+       if( ! s ) return NULL;
 
        /* For sub-process */
        pid = fork( );
@@ -135,21 +124,8 @@ Resolve_Name( CHAR *Host )
        RES_STAT *s;
        INT pid;
 
-       /* Allocate memory */
-       s = (RES_STAT *)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( );
@@ -193,13 +169,13 @@ Do_ResolveAddr( struct sockaddr_in *Addr, INT w_fd )
 
        CHAR hostname[HOST_LEN];
        struct hostent *h;
+       INT len;
 #ifdef IDENTAUTH
        CHAR *res;
 #endif
 
-       Log_Resolver( LOG_DEBUG, "Now resolving %s ...", inet_ntoa( Addr->sin_addr ));
-
        /* Resolve IP address */
+       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
@@ -211,33 +187,35 @@ Do_ResolveAddr( struct sockaddr_in *Addr, INT w_fd )
 #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 */
+       len = strlen( res ? res : "" );
+       if( res != NULL ) res[len] = '\n';
+       len++;
+       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 */
 
 
@@ -250,6 +228,7 @@ Do_ResolveName( CHAR *Host, INT w_fd )
        CHAR ip[16];
        struct hostent *h;
        struct in_addr *addr;
+       INT len;
 
        Log_Resolver( LOG_DEBUG, "Now resolving \"%s\" ...", Host );
 
@@ -267,18 +246,18 @@ Do_ResolveName( CHAR *Host, INT w_fd )
 #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 */
 
 
@@ -307,4 +286,33 @@ Get_Error( INT 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- */