X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=6c544164e7bc2afe9de515cfb13fadee01583284;hp=10aa1a064996752d941026b05f729a2f3b03c52b;hb=7049b60af48382ce5f4623d32c5fca6d0c9f4fc5;hpb=03d971d99481244e7039bc960cfb962795fbe905 diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 10aa1a06..6c544164 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -9,79 +9,21 @@ * 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.16 2002/01/02 02:44:37 alex Exp $ + * $Id: ngircd.c,v 1.33 2002/03/12 15:19:12 alex Exp $ * * ngircd.c: Hier beginnt alles ;-) - * - * $Log: ngircd.c,v $ - * Revision 1.16 2002/01/02 02:44:37 alex - * - neue Defines fuer max. Anzahl Server und Operatoren. - * - * Revision 1.15 2001/12/31 02:18:51 alex - * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART), - * - neuen Header "defines.h" mit (fast) allen Konstanten. - * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes. - * - * Revision 1.14 2001/12/30 19:26:12 alex - * - Unterstuetzung fuer die Konfigurationsdatei eingebaut. - * - * Revision 1.13 2001/12/30 11:42:00 alex - * - der Server meldet nun eine ordentliche "Start-Zeit". - * - * Revision 1.12 2001/12/29 03:07:36 alex - * - einige Loglevel geaendert. - * - * Revision 1.11 2001/12/26 14:45:37 alex - * - "Code Cleanups". - * - * Revision 1.10 2001/12/24 01:34:38 alex - * - Signal-Handler aufgeraeumt; u.a. SIGPIPE wird nun korrekt ignoriert. - * - * Revision 1.9 2001/12/21 22:24:50 alex - * - neues Modul "parse" wird initialisiert und abgemeldet. - * - * Revision 1.8 2001/12/14 08:15:26 alex - * - neue Module (irc, client, channel) werden an- und abgemeldet. - * - zweiter Listen-Socket wird zu Testzwecken konfiguriert. - * - * Revision 1.7 2001/12/13 01:31:46 alex - * - Conn_Handler() wird nun mit einem Timeout aufgerufen. - * - * Revision 1.6 2001/12/12 23:30:42 alex - * - Log-Meldungen an syslog angepasst. - * - NGIRCd_Quit ist nun das Flag zum Beenden des ngircd. - * - * Revision 1.5 2001/12/12 17:21:21 alex - * - mehr Unterfunktionen eingebaut, Modul besser strukturiert & dokumentiert. - * - Anpassungen an neue Module. - * - * Revision 1.4 2001/12/12 01:58:53 alex - * - Test auf socklen_t verbessert. - * - * Revision 1.3 2001/12/12 01:40:39 alex - * - ein paar mehr Kommentare; Variablennamen verstaendlicher gemacht. - * - fehlenden Header ergaenz. - * - SIGINT und SIGQUIT werden nun ebenfalls behandelt. - * - * Revision 1.2 2001/12/11 22:04:21 alex - * - Test auf stdint.h (HAVE_STDINT_H) hinzugefuegt. - * - * Revision 1.1.1.1 2001/12/11 21:53:04 alex - * - Imported sources to CVS. */ -#define PORTAB_CHECK_TYPES /* Prueffunktion einbinden, s.u. */ - - -#include -#include "global.h" - -#include +#include "portab.h" +#include "imp.h" #include +#include #include #include +#include +#include #include #include #include @@ -90,11 +32,12 @@ #include "client.h" #include "conf.h" #include "conn.h" +#include "defines.h" #include "irc.h" #include "log.h" #include "parse.h" -#include +#include "exp.h" #include "ngircd.h" @@ -103,14 +46,155 @@ LOCAL VOID Signal_Handler( INT Signal ); LOCAL VOID Initialize_Listen_Ports( VOID ); +LOCAL VOID Show_Version( VOID ); +LOCAL VOID Show_Help( VOID ); + GLOBAL INT main( INT argc, CONST CHAR *argv[] ) { - /* Datentypen der portab-Library ueberpruefen */ - portab_check_types( ); + BOOLEAN ok; + INT pid, i, n; + + 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++ ) + { + ok = FALSE; + if(( argv[i][0] == '-' ) && ( argv[i][1] == '-' )) + { + /* 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], "--nodaemon" ) == 0 ) + { + NGIRCd_NoDaemon = TRUE; + ok = TRUE; + } + if( strcmp( argv[i], "--passive" ) == 0 ) + { + NGIRCd_Passive = TRUE; + ok = TRUE; + } +#ifdef SNIFFER + if( strcmp( argv[i], "--sniffer" ) == 0 ) + { + NGIRCd_Sniffer = TRUE; + ok = TRUE; + } +#endif + if( strcmp( argv[i], "--version" ) == 0 ) + { + Show_Version( ); + exit( 1 ); + } + } + else if(( argv[i][0] == '-' ) && ( argv[i][1] != '-' )) + { + /* Kurze Option */ + + for( n = 1; n < strlen( argv[i] ); n++ ) + { + ok = FALSE; +#ifdef DEBUG + if( argv[i][n] == 'd' ) + { + NGIRCd_Debug = TRUE; + ok = TRUE; + } +#endif + if( argv[i][n] == 'n' ) + { + 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 ) + { + printf( PACKAGE": invalid option \"-%c\"!\n", argv[i][n] ); + puts( "Try \""PACKAGE" --help\" for more information." ); + exit( 1 ); + } + } + + } + if( ! ok ) + { + printf( PACKAGE": invalid option \"%s\"!\n", argv[i] ); + puts( "Try \""PACKAGE" --help\" for more information." ); + exit( 1 ); + } + } + /* 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 ); + } + + /* Child-Prozess initialisieren */ + 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 )); @@ -120,8 +204,6 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) /* Module initialisieren */ Log_Init( ); Conf_Init( ); - Parse_Init( ); - IRC_Init( ); Channel_Init( ); Client_Init( ); Conn_Init( ); @@ -143,35 +225,101 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) Conn_Exit( ); Client_Exit( ); Channel_Exit( ); - IRC_Exit( ); - Parse_Exit( ); Conf_Exit( ); Log_Exit( ); } + +#ifndef DEBUG + /* aufraeumen */ + if( unlink( ERROR_FILE ) != 0 ) Log( LOG_ERR, "Can't delete \""ERROR_FILE"\": %s", strerror( errno )); +#endif + return 0; } /* main */ +GLOBAL CHAR *NGIRCd_Version( VOID ) +{ + STATIC CHAR version[126]; + + 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, "+" ); + strcat( txt, "SYSLOG" ); +#endif +#ifdef STRICT_RFC + if( txt[0] ) strcat( txt, "+" ); + strcat( txt, "RFC" ); +#endif +#ifdef DEBUG + if( txt[0] ) strcat( txt, "+" ); + strcat( txt, "DEBUG" ); +#endif +#ifdef SNIFFER + if( txt[0] ) strcat( txt, "+" ); + strcat( txt, "SNIFFER" ); +#endif + + if( txt[0] ) strcat( txt, "-" ); + strcat( txt, TARGET_OS"/"TARGET_CPU ); + + return txt; +} /* NGIRCd_VersionAddition */ + + 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 */ @@ -187,9 +335,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); @@ -223,4 +378,34 @@ LOCAL VOID Initialize_Listen_Ports( VOID ) } } /* Initialize_Listen_Ports */ + +LOCAL VOID Show_Version( VOID ) +{ + puts( NGIRCd_Version( )); + puts( "Copyright (c)2001,2002 by Alexander Barton (alex@barton.de).\n" ); + puts( "This is free software; see the source for copying conditions. There is NO" ); + puts( "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ); +} /* Show_Version */ + + +LOCAL VOID Show_Help( VOID ) +{ + puts( "Compile-time defaults:\n" ); + puts( " - configuration: "CONFIG_FILE ); + puts( " - MOTD file: "MOTD_FILE ); + puts( " - server error log: "ERROR_FILE"\n" ); + puts( "Run-time options:\n" ); +#ifdef DEBUG + puts( " -d, --debug log extra debug messages" ); +#endif + puts( " -n, --nodaemon don't fork and don't detatch from controlling terminal" ); + 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 */ + + /* -eof- */