X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fresolve.c;h=846e5236d40b1d630c22405a9e1477aa81622a9b;hb=1d08d51e2eaff14b71f20d3f0898d5a86582b7e5;hp=4ed83f992fbbb6208c95ae8d3c8d9e1e1c80efc0;hpb=46ec0f24f60cf476ccad300f80a47dc31753443c;p=ngircd-alex.git diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index 4ed83f99..846e5236 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -1,22 +1,21 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de) * - * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen - * der GNU General Public License (GPL), wie von der Free Software Foundation - * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 - * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. - * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste - * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. + * 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. * - * $Id: resolve.c,v 1.1 2002/05/27 11:23:27 alex Exp $ - * - * resolve.c: asyncroner Resolver + * Asynchronous resolver */ #include "portab.h" +static char UNUSED id[] = "$Id: resolve.c,v 1.10 2005/03/05 12:57:14 alex Exp $"; + #include "imp.h" #include #include @@ -28,6 +27,12 @@ #include #include +#ifdef IDENTAUTH +#ifdef HAVE_IDENT_H +#include +#endif +#endif + #include "conn.h" #include "defines.h" #include "log.h" @@ -36,54 +41,52 @@ #include "resolve.h" +#ifdef IDENTAUTH +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 )); +#endif + LOCAL VOID Do_ResolveName PARAMS(( CHAR *Host, INT w_fd )); #ifdef h_errno -LOCAL CHAR *Resolve_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 ) { - /* Modul initialisieren */ + /* Initialize module */ FD_ZERO( &Resolver_FDs ); } /* Resolve_Init */ +#ifdef IDENTAUTH +GLOBAL RES_STAT * +Resolve_Addr( struct sockaddr_in *Addr, int Sock ) +#else GLOBAL RES_STAT * Resolve_Addr( struct sockaddr_in *Addr ) +#endif { - /* IP (asyncron!) aufloesen. Bei Fehler, z.B. wenn der - * Child-Prozess nicht erzeugt werden kann, wird NULL geliefert. - * Der Host kann dann nicht aufgeloest werden. */ + /* Resolve IP (asynchronous!). On errors, e.g. if the child process + * can't be forked, this functions returns NULL. */ RES_STAT *s; INT pid; - /* Speicher anfordern */ - s = malloc( sizeof( RES_STAT )); - if( ! s ) - { - Log( LOG_EMERG, "Resolver: Can't allocate memory!" ); - return NULL; - } + s = New_Res_Stat( ); + if( ! s ) return NULL; - /* Pipe fuer Antwort initialisieren */ - if( pipe( s->pipe ) != 0 ) - { - free( s ); - Log( LOG_ALERT, "Resolver: Can't create output pipe: %s!", strerror( errno )); - return NULL; - } - - /* Sub-Prozess erzeugen */ + /* For sub-process */ pid = fork( ); if( pid > 0 ) { - /* Haupt-Prozess */ + /* 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]; @@ -92,15 +95,19 @@ Resolve_Addr( struct sockaddr_in *Addr ) } else if( pid == 0 ) { - /* Sub-Prozess */ + /* Sub process */ Log_Init_Resolver( ); +#ifdef IDENTAUTH + Do_ResolveAddr( Addr, Sock, s->pipe[1] ); +#else Do_ResolveAddr( Addr, s->pipe[1] ); +#endif Log_Exit_Resolver( ); exit( 0 ); } else { - /* Fehler */ + /* Error! */ free( s ); Log( LOG_CRIT, "Resolver: Can't fork: %s!", strerror( errno )); return NULL; @@ -111,34 +118,20 @@ Resolve_Addr( struct sockaddr_in *Addr ) GLOBAL RES_STAT * Resolve_Name( CHAR *Host ) { - /* Hostnamen (asyncron!) aufloesen. Bei Fehler, z.B. wenn der - * Child-Prozess nicht erzeugt werden kann, wird NULL geliefert. - * Der Host kann dann nicht aufgeloest werden. */ + /* Resolve hostname (asynchronous!). On errors, e.g. if the child + * process can't be forked, this functions returns NULL. */ RES_STAT *s; INT pid; - /* Speicher anfordern */ - s = malloc( sizeof( RES_STAT )); - if( ! s ) - { - Log( LOG_EMERG, "Resolver: Can't allocate memory!" ); - return NULL; - } + s = New_Res_Stat( ); + if( ! s ) return NULL; - /* Pipe fuer Antwort initialisieren */ - if( pipe( s->pipe ) != 0 ) - { - free( s ); - Log( LOG_ALERT, "Resolver: Can't create output pipe: %s!", strerror( errno )); - return NULL; - } - - /* Sub-Prozess erzeugen */ + /* Fork sub-process */ pid = fork( ); if( pid > 0 ) { - /* Haupt-Prozess */ + /* 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]; @@ -147,7 +140,7 @@ Resolve_Name( CHAR *Host ) } else if( pid == 0 ) { - /* Sub-Prozess */ + /* Sub process */ Log_Init_Resolver( ); Do_ResolveName( Host, s->pipe[1] ); Log_Exit_Resolver( ); @@ -155,7 +148,7 @@ Resolve_Name( CHAR *Host ) } else { - /* Fehler */ + /* Error! */ free( s ); Log( LOG_CRIT, "Resolver: Can't fork: %s!", strerror( errno )); return NULL; @@ -163,19 +156,28 @@ Resolve_Name( CHAR *Host ) } /* Resolve_Name */ +#ifdef IDENTAUTH +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 ) +#endif { - /* Resolver Sub-Prozess: IP aufloesen und Ergebnis in Pipe schreiben. */ + /* Resolver sub-process: resolve IP address and write result into + * pipe to parent. */ CHAR hostname[HOST_LEN]; struct hostent *h; + INT len; +#ifdef IDENTAUTH + CHAR *res; +#endif + /* Resolve IP address */ Log_Resolver( LOG_DEBUG, "Now resolving %s ...", inet_ntoa( Addr->sin_addr )); - - /* Namen aufloesen */ h = gethostbyaddr( (CHAR *)&Addr->sin_addr, sizeof( Addr->sin_addr ), AF_INET ); - if( h ) strcpy( hostname, h->h_name ); + if( h ) strlcpy( hostname, h->h_name, sizeof( hostname )); else { #ifdef h_errno @@ -183,38 +185,59 @@ Do_ResolveAddr( struct sockaddr_in *Addr, INT w_fd ) #else Log_Resolver( LOG_WARNING, "Can't resolve address \"%s\"!", inet_ntoa( Addr->sin_addr )); #endif - strcpy( hostname, inet_ntoa( Addr->sin_addr )); + strlcpy( hostname, inet_ntoa( Addr->sin_addr ), sizeof( hostname )); } + Log_Resolver( LOG_DEBUG, "Ok, translated %s to \"%s\".", inet_ntoa( Addr->sin_addr ), hostname ); - /* Antwort an Parent schreiben */ - if( write( w_fd, hostname, strlen( hostname ) + 1 ) != ( 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; } - 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, "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 ); +#endif } /* Do_ResolveAddr */ LOCAL VOID Do_ResolveName( CHAR *Host, INT w_fd ) { - /* Resolver Sub-Prozess: Name aufloesen und Ergebnis in Pipe schreiben. */ + /* Resolver sub-process: resolve name and write result into pipe + * to parent. */ CHAR ip[16]; struct hostent *h; struct in_addr *addr; + INT len; Log_Resolver( LOG_DEBUG, "Now resolving \"%s\" ...", Host ); - /* Namen aufloesen */ + /* Resolve hostname */ h = gethostbyname( Host ); if( h ) { addr = (struct in_addr *)h->h_addr; - strcpy( ip, inet_ntoa( *addr )); + strlcpy( ip, inet_ntoa( *addr ), sizeof( ip )); } else { @@ -223,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 ); - /* Antwort an Parent schreiben */ - if( write( w_fd, ip, strlen( ip ) + 1 ) != ( strlen( ip ) + 1 )) + /* Write result into pipe to parent */ + 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 */ @@ -243,7 +266,7 @@ Do_ResolveName( CHAR *Host, INT w_fd ) LOCAL CHAR * Get_Error( INT H_Error ) { - /* Fehlerbeschreibung fuer H_Error liefern */ + /* Get error message for H_Error */ switch( H_Error ) { @@ -263,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- */