X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=57f4d4608124910ce7e50ec60395ba8bce8d2975;hb=fcb47ae64b8915efdb8ed6f589d04bbc48bf9485;hp=71b5fc48e7eab16d897a05a271dc01b9e0db06fc;hpb=52424b49cb0554b8deee5ea60d86106180046563;p=ngircd-alex.git diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 71b5fc48..57f4d460 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -9,11 +9,26 @@ * 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.23 2002/02/17 23:40:21 alex Exp $ * * ngircd.c: Hier beginnt alles ;-) * * $Log: ngircd.c,v $ + * 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. * @@ -83,9 +98,11 @@ #include #include +#include #include #include #include +#include #include #include #include @@ -114,7 +131,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( ); @@ -125,6 +142,9 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) #ifdef DEBUG NGIRCd_Debug = FALSE; #endif +#ifdef SNIFFER + NGIRCd_Sniffer = FALSE; +#endif /* Kommandozeile parsen */ for( i = 1; i < argc; i++ ) @@ -151,6 +171,13 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) NGIRCd_Debug = TRUE; ok = TRUE; } +#endif +#ifdef SNIFFER + if( strcmp( argv[i], "--sniffer" ) == 0 ) + { + NGIRCd_Sniffer = TRUE; + ok = TRUE; + } #endif if( strcmp( argv[i], "--nodaemon" ) == 0 ) { @@ -171,6 +198,13 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) NGIRCd_Debug = TRUE; ok = TRUE; } +#endif +#ifdef SNIFFER + if( argv[i][n] == 's' ) + { + NGIRCd_Sniffer = TRUE; + ok = TRUE; + } #endif if( argv[i][n] == 'n' ) { @@ -197,6 +231,29 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) 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 +298,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 ) @@ -280,12 +343,14 @@ LOCAL VOID Initialize_Signal_Handler( VOID ) /* Signal-Struktur initialisieren */ memset( &saction, 0, sizeof( saction )); + saction.sa_handler = Signal_Handler; + saction.sa_flags = SA_RESTART; /* 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 */ @@ -306,9 +371,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 +430,11 @@ 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" ); +#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 */