- Unterstuetzung fuer komprimierte Server-Server-Links implementiert.

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

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 851663eb56c20e16bd3996feeeaa75331351b4ff..3370b8a6e6fed6dd1686c362c725cdbb0612f72c 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.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: ngircd.c,v 1.59 2002/11/18 18:49:34 alex Exp $
+ * $Id: ngircd.c,v 1.62 2002/11/26 23:07:24 alex Exp $
  *
  * ngircd.c: Hier beginnt alles ;-)
  */
@@ -51,8 +51,6 @@
 LOCAL VOID Initialize_Signal_Handler PARAMS(( VOID ));
 LOCAL VOID Signal_Handler PARAMS(( INT Signal ));
 
-LOCAL VOID Initialize_Listen_Ports PARAMS(( VOID ));
-
 LOCAL VOID Show_Version PARAMS(( VOID ));
 LOCAL VOID Show_Help PARAMS(( VOID ));
 
@@ -296,19 +294,30 @@ main( int argc, const char *argv[] )
                 * sind in doc/Protocol.txt beschrieben. */
 #ifdef IRCPLUS
                sprintf( NGIRCd_ProtoID, "%s%s %s|%s:%s", PROTOVER, PROTOIRCPLUS, PACKAGE, VERSION, IRCPLUSFLAGS );
+#ifdef USE_ZLIB
+               strcat( NGIRCd_ProtoID, "Z" );
+#endif
                if( Conf_OperCanMode ) strcat( NGIRCd_ProtoID, "o" );
 #else
                sprintf( NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, PACKAGE, VERSION );
 #endif
                strcat( NGIRCd_ProtoID, " P" );
+#ifdef USE_ZLIB
+               strcat( NGIRCd_ProtoID, "Z" );
+#endif
                Log( LOG_DEBUG, "Protocol and server ID is \"%s\".", NGIRCd_ProtoID );
 
                /* Vordefinierte Channels anlegen */
                Channel_InitPredefined( );
 
                /* Listen-Ports initialisieren */
-               Initialize_Listen_Ports( );
-
+               if( Conn_InitListeners( ) < 1 )
+               {
+                       Log( LOG_ALERT, "Server isn't listening on a single port!" );
+                       Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+                       exit( 1 );
+               }
+               
                /* Hauptschleife */
                Conn_Handler( );
 
@@ -349,6 +358,10 @@ NGIRCd_VersionAddition( VOID )
        if( txt[0] ) strcat( txt, "+" );
        strcat( txt, "SYSLOG" );
 #endif
+#ifdef USE_ZLIB
+       if( txt[0] ) strcat( txt, "+" );
+       strcat( txt, "ZLIB" );
+#endif
 #ifdef DEBUG
        if( txt[0] ) strcat( txt, "+" );
        strcat( txt, "DEBUG" );
@@ -377,6 +390,38 @@ NGIRCd_VersionAddition( VOID )
 } /* NGIRCd_VersionAddition */
 
 
+GLOBAL VOID
+NGIRCd_Rehash( VOID )
+{
+       CHAR old_name[CLIENT_ID_LEN];
+       
+       /* Alle Listen-Sockets schliessen */
+       Conn_ExitListeners( );
+
+       /* Alten Server-Namen merken */
+       strcpy( old_name, Conf_ServerName );
+
+       /* Konfiguration neu lesen ... */
+       Conf_Init( );
+
+       /* Alten Server-Namen wiederherstellen: dieser
+        * kann nicht zur Laufzeit geaendert werden ... */
+       if( strcmp( old_name, Conf_ServerName ) != 0 )
+       {
+               strcpy( Conf_ServerName, old_name );
+               Log( LOG_ERR, "Can't change \"ServerName\" on runtime! Ignored new name." );
+       }
+
+       /* neue pre-defined Channel anlegen: */
+       Channel_InitPredefined( );
+       
+       /* Listen-Sockets neu anlegen: */
+       Conn_InitListeners( );
+
+       Log( LOG_INFO, "Re-reading of configuration done." );
+} /* NGIRCd_Rehash */
+
+
 LOCAL VOID
 Initialize_Signal_Handler( VOID )
 {
@@ -437,15 +482,15 @@ Signal_Handler( INT Signal )
                case SIGINT:
                case SIGQUIT:
                        /* wir soll(t)en uns wohl beenden ... */
-                       if( Signal == SIGTERM ) Log( LOG_WARNING, "Got TERM signal, terminating now ..." );
-                       else if( Signal == SIGINT ) Log( LOG_WARNING, "Got INT signal, terminating now ..." );
-                       else if( Signal == SIGQUIT ) Log( LOG_WARNING, "Got QUIT signal, terminating now ..." );
+                       if( Signal == SIGTERM ) Log( LOG_WARNING|LOG_snotice, "Got TERM signal, terminating now ..." );
+                       else if( Signal == SIGINT ) Log( LOG_WARNING|LOG_snotice, "Got INT signal, terminating now ..." );
+                       else if( Signal == SIGQUIT ) Log( LOG_WARNING|LOG_snotice, "Got QUIT signal, terminating now ..." );
                        NGIRCd_Quit = TRUE;
                        break;
                case SIGHUP:
-                       /* neu starten */
-                       Log( LOG_WARNING, "Got HUP signal, restarting now ..." );
-                       NGIRCd_Restart = TRUE;
+                       /* Konfiguration neu einlesen: */
+                       Log( LOG_WARNING|LOG_snotice, "Got HUP signal, re-reading configuration ..." );
+                       NGIRCd_Rehash( );
                        break;
                case SIGCHLD:
                        /* Child-Prozess wurde beendet. Zombies vermeiden: */
@@ -458,30 +503,6 @@ Signal_Handler( INT Signal )
 } /* Signal_Handler */
 
 
-LOCAL VOID
-Initialize_Listen_Ports( 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] );
-       }
-
-       if( created < 1 )
-       {
-               Log( LOG_ALERT, "Server isn't listening on a single port!" );
-               Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
-               exit( 1 );
-       }
-} /* Initialize_Listen_Ports */
-
-
 LOCAL VOID
 Show_Version( VOID )
 {