- h_error wird nur noch ausgewertet, wenn vorhanden.

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

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 5e2546a97efcce2abfbbfab355835b80d955c719..7d2c4c6adb212f2a58c1c78050997c704b3e9968 100644 (file)
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: conn.c,v 1.55 2002/03/13 00:15:55 alex Exp $
+ * $Id: conn.c,v 1.62 2002/05/18 21:53:53 alex Exp $
  *
  * connect.h: Verwaltung aller Netz-Verbindungen ("connections")
  */
@@ -92,7 +92,10 @@ LOCAL RES_STAT *ResolveName( CHAR *Host );
 LOCAL VOID Do_ResolveAddr( struct sockaddr_in *Addr, INT w_fd );
 LOCAL VOID Do_ResolveName( CHAR *Host, INT w_fd );
 LOCAL VOID Read_Resolver_Result( INT r_fd );
+
+#ifdef h_errno
 LOCAL CHAR *Resolv_Error( INT H_Error );
+#endif
 
 
 LOCAL fd_set My_Listeners;
@@ -163,7 +166,7 @@ GLOBAL VOID Conn_Exit( VOID )
 } /* Conn_Exit */
 
 
-GLOBAL BOOLEAN Conn_NewListener( CONST INT Port )
+GLOBAL BOOLEAN Conn_NewListener( CONST UINT Port )
 {
        /* Neuen Listen-Socket erzeugen: der Server wartet dann auf
         * dem angegebenen Port auf Verbindungen. Kann der Listen-
@@ -332,6 +335,10 @@ GLOBAL BOOLEAN Conn_WriteStr( CONN_ID Idx, CHAR *Format, ... )
        BOOLEAN ok;
        va_list ap;
 
+       assert( Idx >= 0 );
+       assert( My_Connections[Idx].sock > NONE );
+       assert( Format != NULL );
+       
        va_start( ap, Format );
        if( vsnprintf( buffer, COMMAND_LEN - 2, Format, ap ) == COMMAND_LEN - 2 )
        {
@@ -805,7 +812,7 @@ LOCAL VOID Check_Connections( VOID )
                                if( My_Connections[i].lastping < time( NULL ) - Conf_PongTimeout )
                                {
                                        /* Timeout */
-                                       Log( LOG_DEBUG, "Connection %d: Ping timeout.", i );
+                                       Log( LOG_DEBUG, "Connection %d: Ping timeout: %d seconds.", i, Conf_PongTimeout );
                                        Conn_Close( i, NULL, "Ping timeout", TRUE );
                                }
                        }
@@ -972,6 +979,7 @@ LOCAL VOID New_Server( INT Server, CONN_ID Idx )
                return;
        }
        Client_SetIntroducer( c, c );
+       Client_SetToken( c, TOKEN_OUTBOUND );
 
        /* Verbindung registrieren */
        My_Connections[Idx].sock = new_sock;
@@ -1149,7 +1157,11 @@ LOCAL VOID Do_ResolveAddr( struct sockaddr_in *Addr, INT w_fd )
        if( h ) strcpy( hostname, h->h_name );
        else
        {
-               Log_Resolver( LOG_WARNING, "Can't resolve address %s: code %s!", inet_ntoa( Addr->sin_addr ), Resolv_Error( h_errno ));
+#ifdef h_errno
+               Log_Resolver( LOG_WARNING, "Can't resolve address \"%s\": %s!", inet_ntoa( Addr->sin_addr ), Resolv_Error( h_errno ));
+#else
+               Log_Resolver( LOG_WARNING, "Can't resolve address \"%s\"!", inet_ntoa( Addr->sin_addr ));
+#endif 
                strcpy( hostname, inet_ntoa( Addr->sin_addr ));
        }
 
@@ -1184,7 +1196,11 @@ LOCAL VOID Do_ResolveName( CHAR *Host, INT w_fd )
        }
        else
        {
+#ifdef h_errno
                Log_Resolver( LOG_WARNING, "Can't resolve \"%s\": %s!", Host, Resolv_Error( h_errno ));
+#else
+               Log_Resolver( LOG_WARNING, "Can't resolve \"%s\"!", Host );
+#endif
                strcpy( ip, "" );
        }
 
@@ -1259,6 +1275,9 @@ LOCAL VOID Read_Resolver_Result( INT r_fd )
 } /* Read_Resolver_Result */
 
 
+
+#ifdef h_errno
+
 LOCAL CHAR *Resolv_Error( INT H_Error )
 {
        /* Fehlerbeschreibung fuer H_Error liefern */
@@ -1278,5 +1297,7 @@ LOCAL CHAR *Resolv_Error( INT H_Error )
        }
 } /* Resolv_Error */
 
+#endif
+
 
 /* -eof- */