]> arthur.barton.de Git - ngircd-alex.git/blobdiff - src/ngircd/ngircd.c
- wenn ein System sigaction() nicht kennt, so wird nun signal() verwendet.
[ngircd-alex.git] / src / ngircd / ngircd.c
index 71b5fc48e7eab16d897a05a271dc01b9e0db06fc..f28af0b56c0acb5029c1820fb87a34386fc94223 100644 (file)
@@ -9,11 +9,39 @@
  * 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.18 2002/01/11 14:45:18 alex Exp $
+ * $Id: ngircd.c,v 1.27 2002/02/25 11:42:47 alex Exp $
  *
  * ngircd.c: Hier beginnt alles ;-)
  *
  * $Log: ngircd.c,v $
+ * Revision 1.27  2002/02/25 11:42:47  alex
+ * - wenn ein System sigaction() nicht kennt, so wird nun signal() verwendet.
+ *
+ * Revision 1.26  2002/02/23 19:06:47  alex
+ * - fuer SIGCHLD wird nun auch SA_NOCLDWAIT gesetzt, wenn vorhanden.
+ *
+ * Revision 1.25  2002/02/19 20:30:47  alex
+ * - SA_RESTART wird fuer Signale nur noch gesetzt, wenn es definiert ist.
+ *
+ * Revision 1.24  2002/02/19 20:08:24  alex
+ * - "Passive-Mode" implementiert: kein Auto-Conect zu anderen Servern.
+ * - NGIRCd_DebugLevel wird (fuer VERSION-Befehl) ermittelt.
+ *
+ * Revision 1.23  2002/02/17 23:40:21  alex
+ * - neue Funktion NGIRCd_VersionAddition(). NGIRCd_Version() aufgespaltet.
+ *
+ * Revision 1.22  2002/01/22 17:15:39  alex
+ * - die Fehlermeldung "interrupted system call" sollte nicht mehr auftreten.
+ *
+ * Revision 1.21  2002/01/21 00:02:11  alex
+ * - Hilfetexte korrigiert und ergaenzt (Sniffer).
+ *
+ * Revision 1.20  2002/01/18 11:12:11  alex
+ * - der Sniffer wird nun nur noch aktiviert, wenn auf Kommandozeile angegeben.
+ *
+ * Revision 1.19  2002/01/12 00:17:28  alex
+ * - ngIRCd wandelt sich nun selber in einen Daemon (Hintergrundprozess) um.
+ *
  * Revision 1.18  2002/01/11 14:45:18  alex
  * - Kommandozeilen-Parser implementiert: Debug- und No-Daemon-Modus, Hilfe.
  *
 #include <imp.h>
 
 #include <assert.h>
+#include <errno.h>
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <time.h>
@@ -114,7 +144,7 @@ LOCAL VOID Show_Help( VOID );
 GLOBAL INT main( INT argc, CONST CHAR *argv[] )
 {
        BOOLEAN ok;
-       INT i, n;
+       INT pid, i, n;
 
        /* Datentypen der portab-Library ueberpruefen */
        portab_check_types( );
@@ -122,9 +152,13 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
        NGIRCd_Restart = FALSE;
        NGIRCd_Quit = FALSE;
        NGIRCd_NoDaemon = FALSE;
+       NGIRCd_Passive = FALSE;
 #ifdef DEBUG
        NGIRCd_Debug = FALSE;
 #endif
+#ifdef SNIFFER
+       NGIRCd_Sniffer = FALSE;
+#endif
 
        /* Kommandozeile parsen */
        for( i = 1; i < argc; i++ )
@@ -134,29 +168,41 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
                {
                        /* Lange Option */
 
+#ifdef DEBUG
+                       if( strcmp( argv[i], "--debug" ) == 0 )
+                       {
+                               NGIRCd_Debug = TRUE;
+                               ok = TRUE;
+                       }
+#endif
                        if( strcmp( argv[i], "--help" ) == 0 )
                        {
                                Show_Version( ); puts( "" );
                                Show_Help( ); puts( "" );
                                exit( 1 );
                        }
-                       if( strcmp( argv[i], "--version" ) == 0 )
+                       if( strcmp( argv[i], "--nodaemon" ) == 0 )
                        {
-                               Show_Version( );
-                               exit( 1 );
+                               NGIRCd_NoDaemon = TRUE;
+                               ok = TRUE;
                        }
-#ifdef DEBUG
-                       if( strcmp( argv[i], "--debug" ) == 0 )
+                       if( strcmp( argv[i], "--passive" ) == 0 )
                        {
-                               NGIRCd_Debug = TRUE;
+                               NGIRCd_Passive = TRUE;
                                ok = TRUE;
                        }
-#endif
-                       if( strcmp( argv[i], "--nodaemon" ) == 0 )
+#ifdef SNIFFER
+                       if( strcmp( argv[i], "--sniffer" ) == 0 )
                        {
-                               NGIRCd_NoDaemon = TRUE;
+                               NGIRCd_Sniffer = TRUE;
                                ok = TRUE;
                        }
+#endif
+                       if( strcmp( argv[i], "--version" ) == 0 )
+                       {
+                               Show_Version( );
+                               exit( 1 );
+                       }
                }
                else if(( argv[i][0] == '-' ) && ( argv[i][1] != '-' ))
                {
@@ -177,6 +223,18 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
                                        NGIRCd_NoDaemon = TRUE;
                                        ok = TRUE;
                                }
+                               if( argv[i][n] == 'p' )
+                               {
+                                       NGIRCd_Passive = TRUE;
+                                       ok = TRUE;
+                               }
+#ifdef SNIFFER
+                               if( argv[i][n] == 's' )
+                               {
+                                       NGIRCd_Sniffer = TRUE;
+                                       ok = TRUE;
+                               }
+#endif
 
                                if( ! ok )
                                {
@@ -195,8 +253,40 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
                }
        }
 
+       /* Debug-Level (fuer IRC-Befehl "VERSION") ermitteln */
+       strcpy( NGIRCd_DebugLevel, "" );
+#ifdef DEBUG
+       if( NGIRCd_Debug ) strcpy( NGIRCd_DebugLevel, "1" );
+#endif
+#ifdef SNIFFER
+       if( NGIRCd_Sniffer ) strcpy( NGIRCd_DebugLevel, "2" );
+#endif
+       
        while( ! NGIRCd_Quit )
        {
+               /* In der Regel wird ein Sub-Prozess ge-fork()'t, der
+                * nicht mehr mit dem Terminal verbunden ist. Mit der
+                * Option "--nodaemon" kann dies (z.B. zum Debuggen)
+                * verhindert werden. */
+               if( ! NGIRCd_NoDaemon )
+               {
+                       /* Daemon im Hintergrund erzeugen */
+                       pid = fork( );
+                       if( pid > 0 )
+                       {
+                               /* "alter" Prozess */
+                               exit( 0 );
+                       }
+                       if( pid < 0 )
+                       {
+                               /* Fehler */
+                               printf( PACKAGE": Can't fork: %s!\nFatal error, exiting now ...", strerror( errno ));
+                               exit( 1 );
+                       }
+                       setsid( );
+                       chdir( "/" );
+               }
+       
                /* Globale Variablen initialisieren */
                NGIRCd_Start = time( NULL );
                strftime( NGIRCd_StartStr, 64, "%a %b %d %Y at %H:%M:%S (%Z)", localtime( &NGIRCd_Start ));
@@ -241,34 +331,40 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
 GLOBAL CHAR *NGIRCd_Version( VOID )
 {
        STATIC CHAR version[126];
-       CHAR txt[64];
+
+       sprintf( version, PACKAGE" version "VERSION"-%s", NGIRCd_VersionAddition( ));
+       return version;
+} /* NGIRCd_Version */
+
+
+GLOBAL CHAR *NGIRCd_VersionAddition( VOID )
+{
+       STATIC CHAR txt[64];
 
        strcpy( txt, "" );
 
 #ifdef USE_SYSLOG
        if( txt[0] ) strcat( txt, "+" );
-       else strcat( txt, "-" );
        strcat( txt, "SYSLOG" );
 #endif
 #ifdef STRICT_RFC
        if( txt[0] ) strcat( txt, "+" );
-       else strcat( txt, "-" );
        strcat( txt, "RFC" );
 #endif
 #ifdef DEBUG
        if( txt[0] ) strcat( txt, "+" );
-       else strcat( txt, "-" );
        strcat( txt, "DEBUG" );
 #endif
 #ifdef SNIFFER
        if( txt[0] ) strcat( txt, "+" );
-       else strcat( txt, "-" );
        strcat( txt, "SNIFFER" );
 #endif
 
-       sprintf( version, PACKAGE" version "VERSION"%s-"P_OSNAME"/"P_ARCHNAME, txt );
-       return version;
-} /* NGIRCd_Version */
+       if( txt[0] ) strcat( txt, "-" );
+       strcat( txt, P_OSNAME"/"P_ARCHNAME );
+
+       return txt;
+} /* NGIRCd_VersionAddition */
 
 
 LOCAL VOID Initialize_Signal_Handler( VOID )
@@ -276,21 +372,44 @@ LOCAL VOID Initialize_Signal_Handler( VOID )
        /* Signal-Handler initialisieren: einige Signale
         * werden ignoriert, andere speziell behandelt. */
 
+#ifdef HAVE_SIGACTION
+       /* sigaction() ist vorhanden */
+
        struct sigaction saction;
 
        /* Signal-Struktur initialisieren */
        memset( &saction, 0, sizeof( saction ));
+       saction.sa_handler = Signal_Handler;
+#ifdef SA_RESTART
+       saction.sa_flags |= SA_RESTART;
+#endif
+#ifdef SA_NOCLDWAIT
+       saction.sa_flags |= SA_NOCLDWAIT;
+#endif
 
        /* Signal-Handler einhaengen */
-       saction.sa_handler = Signal_Handler;
        sigaction( SIGINT, &saction, NULL );
        sigaction( SIGQUIT, &saction, NULL );
        sigaction( SIGTERM, &saction, NULL);
+       sigaction( SIGHUP, &saction, NULL);
        sigaction( SIGCHLD, &saction, NULL);
 
        /* einige Signale ignorieren */
        saction.sa_handler = SIG_IGN;
        sigaction( SIGPIPE, &saction, NULL );
+#else
+       /* kein sigaction() vorhanden */
+
+       /* Signal-Handler einhaengen */
+       signal( SIGINT, Signal_Handler );
+       signal( SIGQUIT, Signal_Handler );
+       signal( SIGTERM, Signal_Handler );
+       signal( SIGHUP, Signal_Handler );
+       signal( SIGCHLD, Signal_Handler );
+
+       /* einige Signale ignorieren */
+       signal( SIGPIPE, SIG_IGN );
+#endif
 } /* Initialize_Signal_Handler */
 
 
@@ -306,9 +425,16 @@ LOCAL VOID Signal_Handler( INT Signal )
                case SIGINT:
                case SIGQUIT:
                        /* wir soll(t)en uns wohl beenden ... */
-                       Log( LOG_WARNING, "Got signal %d, terminating now ...", Signal );
+                       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 ..." );
                        NGIRCd_Quit = TRUE;
                        break;
+               case SIGHUP:
+                       /* neu starten */
+                       Log( LOG_WARNING, "Got HUP signal, restarting now ..." );
+                       NGIRCd_Restart = TRUE;
+                       break;
                case SIGCHLD:
                        /* Child-Prozess wurde beendet. Zombies vermeiden: */
                        while( waitpid( -1, NULL, WNOHANG ) > 0);
@@ -358,8 +484,12 @@ LOCAL VOID Show_Help( VOID )
        puts( "  -d, --debug       log extra debug messages" );
 #endif
         puts( "  -n, --nodaemon    don't fork and don't detatch from controlling terminal" );
-       puts( "      --version     display this help and exit" );
-       puts( "      --help        output version information and exit" );
+        puts( "  -p, --passive     disable automatic connections to other servers" );
+#ifdef SNIFFER
+       puts( "  -s, --sniffer     enable network sniffer and display all IRC traffic" );
+#endif
+       puts( "      --version     output version information and exit" );
+       puts( "      --help        display this help and exit" );
 } /* Show_Help */