- select() in Try_Write() hat falschen (keinen!) Timeout verwendet;

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

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 818be9d66e6a3531a06f583537728012e732af93..d54c382c17a69309621e37a1319344f277e5d2f3 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.92 2002/11/22 16:35:19 alex Exp $
+ * $Id: conn.c,v 1.94 2002/11/23 16:09:57 alex Exp $
  *
  * connect.h: Verwaltung aller Netz-Verbindungen ("connections")
  */
@@ -187,6 +187,43 @@ Conn_Exit( VOID )
 } /* Conn_Exit */
 
 
+GLOBAL INT
+Conn_InitListeners( VOID )
+{
+       /* Ports, auf denen der Server Verbindungen entgegennehmen
+       * soll, initialisieren */
+
+       INT created, i;
+
+       created = 0;
+       for( i = 0; i < Conf_ListenPorts_Count; i++ )
+       {
+               if( Conn_NewListener( Conf_ListenPorts[i] )) created++;
+               else Log( LOG_ERR, "Can't listen on port %u!", Conf_ListenPorts[i] );
+       }
+       return created;
+} /* Conn_InitListeners */
+
+
+GLOBAL VOID
+Conn_ExitListeners( VOID )
+{
+       /* Alle "Listen-Sockets" schliessen */
+
+       INT i;
+
+       Log( LOG_INFO, "Shutting down all listening sockets ..." );
+       for( i = 0; i < Conn_MaxFD + 1; i++ )
+       {
+               if( FD_ISSET( i, &My_Sockets ) && FD_ISSET( i, &My_Listeners ))
+               {
+                       close( i );
+                       Log( LOG_DEBUG, "Listening socket %d closed.", i );
+               }
+       }
+} /* Conn_ExitListeners */
+
+
 GLOBAL BOOLEAN
 Conn_NewListener( CONST UINT Port )
 {
@@ -326,8 +363,7 @@ Conn_Handler( VOID )
                }
 
                /* Timeout initialisieren */
-               tv.tv_sec = 1;
-               tv.tv_usec = 0;
+               tv.tv_sec = TIME_RES; tv.tv_usec = 0;
                
                /* Auf Aktivitaet warten */
                i = select( Conn_MaxFD + 1, &read_sockets, &write_sockets, NULL, &tv );
@@ -679,14 +715,18 @@ Try_Write( CONN_ID Idx )
         * Socket zu schreiben. */
 
        fd_set write_socket;
+       struct timeval tv;
 
        assert( Idx > NONE );
        assert( My_Connections[Idx].sock > NONE );
        assert( My_Connections[Idx].wdatalen > 0 );
 
+       /* Timeout initialisieren: 0 Sekunden, also nicht blockieren */
+       tv.tv_sec = 0; tv.tv_usec = 0;
+
        FD_ZERO( &write_socket );
        FD_SET( My_Connections[Idx].sock, &write_socket );
-       if( select( My_Connections[Idx].sock + 1, NULL, &write_socket, NULL, 0 ) == -1 )
+       if( select( My_Connections[Idx].sock + 1, NULL, &write_socket, NULL, &tv ) == -1 )
        {
                /* Fehler! */
                if( errno != EINTR )