X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=8ced6e3f8903c8698e2aa505c8c558a15798b539;hp=a32b4ca73a8d2505e72064b83adfa0e2a7536860;hb=7281b8dd4d917f8b7f7c36460b78b686427ce973;hpb=6f955d2a343784a8b93b4857d5547a725b5ed1c8 diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index a32b4ca7..8ced6e3f 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -1,161 +1,84 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2004 by Alexander Barton (alex@barton.de) * - * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen - * der GNU General Public License (GPL), wie von der Free Software Foundation - * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 - * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. - * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste - * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: ngircd.c,v 1.26 2002/02/23 19:06:47 alex Exp $ - * - * ngircd.c: Hier beginnt alles ;-) - * - * $Log: ngircd.c,v $ - * 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. - * - * Revision 1.17 2002/01/02 02:51:16 alex - * - Signal-Handler fuer SIGCHLD: so sollten Zombies nicht mehr vorkommen. - * - * 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. + * Main program -- main() */ -#define PORTAB_CHECK_TYPES /* Prueffunktion einbinden, s.u. */ - +#include "portab.h" -#include -#include "global.h" - -#include +static char UNUSED id[] = "$Id: ngircd.c,v 1.84 2004/05/07 11:19:21 alex Exp $"; +#include "imp.h" #include #include #include +#include #include #include #include +#include #include +#include #include -#include +#include +#include -#include "channel.h" +#include "resolve.h" +#include "conn.h" #include "client.h" +#include "channel.h" #include "conf.h" -#include "conn.h" -#include "irc.h" +#include "cvs-version.h" +#include "defines.h" +#include "lists.h" #include "log.h" #include "parse.h" +#include "irc.h" -#include -#include "ngircd.h" +#ifdef RENDEZVOUS +#include "rendezvous.h" +#endif +#include "exp.h" +#include "ngircd.h" -LOCAL VOID Initialize_Signal_Handler( VOID ); -LOCAL VOID Signal_Handler( INT Signal ); -LOCAL VOID Initialize_Listen_Ports( VOID ); +LOCAL VOID Initialize_Signal_Handler PARAMS(( VOID )); +LOCAL VOID Signal_Handler PARAMS(( INT Signal )); -LOCAL VOID Show_Version( VOID ); -LOCAL VOID Show_Help( VOID ); +LOCAL VOID Show_Version PARAMS(( VOID )); +LOCAL VOID Show_Help PARAMS(( VOID )); -GLOBAL INT main( INT argc, CONST CHAR *argv[] ) +GLOBAL int +main( int argc, const char *argv[] ) { - BOOLEAN ok; - INT pid, i, n; + struct passwd *pwd; + struct group *grp; + BOOLEAN ok, configtest = FALSE; + LONG pid, n; + INT i; - /* Datentypen der portab-Library ueberpruefen */ - portab_check_types( ); + umask( 0077 ); - NGIRCd_Restart = FALSE; - NGIRCd_Quit = FALSE; - NGIRCd_NoDaemon = FALSE; - NGIRCd_Passive = FALSE; + NGIRCd_SignalQuit = NGIRCd_SignalRestart = NGIRCd_SignalRehash = FALSE; + NGIRCd_NoDaemon = NGIRCd_Passive = FALSE; #ifdef DEBUG NGIRCd_Debug = FALSE; #endif #ifdef SNIFFER NGIRCd_Sniffer = FALSE; #endif + strlcpy( NGIRCd_ConfFile, SYSCONFDIR, sizeof( NGIRCd_ConfFile )); + strlcat( NGIRCd_ConfFile, CONFIG_FILE, sizeof( NGIRCd_ConfFile )); /* Kommandozeile parsen */ for( i = 1; i < argc; i++ ) @@ -165,6 +88,22 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) { /* Lange Option */ + if( strcmp( argv[i], "--config" ) == 0 ) + { + if( i + 1 < argc ) + { + /* Ok, there's an parameter left */ + strlcpy( NGIRCd_ConfFile, argv[i + 1], sizeof( NGIRCd_ConfFile )); + + /* next parameter */ + i++; ok = TRUE; + } + } + if( strcmp( argv[i], "--configtest" ) == 0 ) + { + configtest = TRUE; + ok = TRUE; + } #ifdef DEBUG if( strcmp( argv[i], "--debug" ) == 0 ) { @@ -174,8 +113,8 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) #endif if( strcmp( argv[i], "--help" ) == 0 ) { - Show_Version( ); puts( "" ); - Show_Help( ); puts( "" ); + Show_Version( ); + puts( "" ); Show_Help( ); puts( "" ); exit( 1 ); } if( strcmp( argv[i], "--nodaemon" ) == 0 ) @@ -205,7 +144,7 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) { /* Kurze Option */ - for( n = 1; n < strlen( argv[i] ); n++ ) + for( n = 1; n < (LONG)strlen( argv[i] ); n++ ) { ok = FALSE; #ifdef DEBUG @@ -215,6 +154,18 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) ok = TRUE; } #endif + if( argv[i][n] == 'f' ) + { + if(( ! argv[i][n + 1] ) && ( i + 1 < argc )) + { + /* Ok, next character is a blank */ + strlcpy( NGIRCd_ConfFile, argv[i + 1], sizeof( NGIRCd_ConfFile )); + + /* go to the following parameter */ + i++; n = (LONG)strlen( argv[i] ); + ok = TRUE; + } + } if( argv[i][n] == 'n' ) { NGIRCd_NoDaemon = TRUE; @@ -232,11 +183,16 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) ok = TRUE; } #endif + if( argv[i][n] == 't' ) + { + configtest = TRUE; + ok = TRUE; + } if( ! ok ) { - printf( PACKAGE": invalid option \"-%c\"!\n", argv[i][n] ); - puts( "Try \""PACKAGE" --help\" for more information." ); + printf( "%s: invalid option \"-%c\"!\n", PACKAGE_NAME, argv[i][n] ); + printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME ); exit( 1 ); } } @@ -244,8 +200,8 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) } if( ! ok ) { - printf( PACKAGE": invalid option \"%s\"!\n", argv[i] ); - puts( "Try \""PACKAGE" --help\" for more information." ); + printf( "%s: invalid option \"%s\"!\n", PACKAGE_NAME, argv[i] ); + printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME ); exit( 1 ); } } @@ -256,11 +212,54 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) if( NGIRCd_Debug ) strcpy( NGIRCd_DebugLevel, "1" ); #endif #ifdef SNIFFER - if( NGIRCd_Sniffer ) strcpy( NGIRCd_DebugLevel, "2" ); + if( NGIRCd_Sniffer ) + { + NGIRCd_Debug = TRUE; + strcpy( NGIRCd_DebugLevel, "2" ); + } #endif + + /* Soll nur die Konfigurations ueberprueft und ausgegeben werden? */ + if( configtest ) + { + Show_Version( ); puts( "" ); + exit( Conf_Test( )); + } - while( ! NGIRCd_Quit ) + while( ! NGIRCd_SignalQuit ) { + /* Initialize global variables */ + NGIRCd_Start = time( NULL ); + (VOID)strftime( NGIRCd_StartStr, 64, "%a %b %d %Y at %H:%M:%S (%Z)", localtime( &NGIRCd_Start )); + + NGIRCd_SignalRehash = FALSE; + NGIRCd_SignalRestart = FALSE; + NGIRCd_SignalQuit = FALSE; + + /* Initialize modules, part I */ + Log_Init( ); + Conf_Init( ); + + if( Conf_Chroot[0] ) + { + /* Chroot */ + if( chdir( Conf_Chroot ) != 0 ) Log( LOG_ERR, "Can't chdir() in ChrootDir (%s): %s", Conf_Chroot, strerror( errno )); + + if( chroot( Conf_Chroot ) != 0 ) Log( LOG_ERR, "Can't change root directory to \"%s\": %s", Conf_Chroot, strerror( errno )); + else Log( LOG_INFO, "Changed root and working directory to \"%s\".", Conf_Chroot ); + } + + if( Conf_GID != 0 ) + { + /* Set new group ID */ + if( setgid( Conf_GID ) != 0 ) Log( LOG_ERR, "Can't change group ID to %u: %s", Conf_GID, strerror( errno )); + } + if( Conf_UID != 0 ) + { + /* Set new user ID */ + if( setuid( Conf_UID ) != 0 ) Log( LOG_ERR, "Can't change user ID to %u: %s", Conf_UID, strerror( errno )); + } + /* 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) @@ -268,7 +267,7 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) if( ! NGIRCd_NoDaemon ) { /* Daemon im Hintergrund erzeugen */ - pid = fork( ); + pid = (LONG)fork( ); if( pid > 0 ) { /* "alter" Prozess */ @@ -277,76 +276,126 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) if( pid < 0 ) { /* Fehler */ - printf( PACKAGE": Can't fork: %s!\nFatal error, exiting now ...", strerror( errno )); + printf( "%s: Can't fork: %s!\nFatal error, exiting now ...\n", PACKAGE_NAME, strerror( errno )); exit( 1 ); } - setsid( ); + + /* Child-Prozess initialisieren */ + (VOID)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 )); - NGIRCd_Restart = FALSE; - NGIRCd_Quit = FALSE; - /* Module initialisieren */ - Log_Init( ); - Conf_Init( ); - Parse_Init( ); - IRC_Init( ); + /* Initialize modules, part II: these functions are eventually + * called with already dropped privileges ... */ + Resolve_Init( ); + Lists_Init( ); Channel_Init( ); Client_Init( ); +#ifdef RENDEZVOUS + Rendezvous_Init( ); +#endif Conn_Init( ); + /* Show user, group, and PID of the running daemon */ + pwd = getpwuid( getuid( )); grp = getgrgid( getgid( )); + Log( LOG_INFO, "Running as user %s(%ld), group %s(%ld), with PID %ld.", pwd ? pwd->pw_name : "unknown", (LONG)getuid( ), grp ? grp->gr_name : "unknown", (LONG)getgid( ), (LONG)getpid( )); + + /* Redirect stderr handle to "error file" for debugging. + * But don't try to write in the chroot jail, since it's more + * secure to have a chroot dir not writable by the daemon. + */ + if( ! Conf_Chroot[0] ) Log_InitErrorfile( ); + /* Signal-Handler initialisieren */ Initialize_Signal_Handler( ); - /* Listen-Ports initialisieren */ - Initialize_Listen_Ports( ); + /* Protokoll- und Server-Identifikation erzeugen. Die vom ngIRCd + * beim PASS-Befehl verwendete Syntax sowie die erweiterten Flags + * sind in doc/Protocol.txt beschrieben. */ +#ifdef IRCPLUS + sprintf( NGIRCd_ProtoID, "%s%s %s|%s:%s", PROTOVER, PROTOIRCPLUS, PACKAGE_NAME, PACKAGE_VERSION, IRCPLUSFLAGS ); +#ifdef ZLIB + strcat( NGIRCd_ProtoID, "Z" ); +#endif + if( Conf_OperCanMode ) strcat( NGIRCd_ProtoID, "o" ); +#else + sprintf( NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, PACKAGE_NAME, PACKAGE_VERSION ); +#endif + strcat( NGIRCd_ProtoID, " P" ); +#ifdef ZLIB + strcat( NGIRCd_ProtoID, "Z" ); +#endif + Log( LOG_DEBUG, "Protocol and server ID is \"%s\".", NGIRCd_ProtoID ); - /* Hauptschleife */ - while( TRUE ) + /* Vordefinierte Channels anlegen */ + Channel_InitPredefined( ); + + /* Listen-Ports initialisieren */ + if( Conn_InitListeners( ) < 1 ) { - if( NGIRCd_Quit || NGIRCd_Restart ) break; - Conn_Handler( 5 ); + Log( LOG_ALERT, "Server isn't listening on a single port!" ); + Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME ); + exit( 1 ); } + + /* Hauptschleife */ + Conn_Handler( ); /* Alles abmelden */ Conn_Exit( ); +#ifdef RENDEZVOUS + Rendezvous_Exit( ); +#endif Client_Exit( ); Channel_Exit( ); - IRC_Exit( ); - Parse_Exit( ); - Conf_Exit( ); + Lists_Exit( ); Log_Exit( ); } + return 0; } /* main */ -GLOBAL CHAR *NGIRCd_Version( VOID ) +GLOBAL CHAR * +NGIRCd_Version( VOID ) { STATIC CHAR version[126]; - - sprintf( version, PACKAGE" version "VERSION"-%s", NGIRCd_VersionAddition( )); + +#ifdef CVSDATE + sprintf( version, "%s %s(%s)-%s", PACKAGE_NAME, PACKAGE_VERSION, CVSDATE, NGIRCd_VersionAddition( )); +#else + sprintf( version, "%s %s-%s", PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition( )); +#endif return version; } /* NGIRCd_Version */ -GLOBAL CHAR *NGIRCd_VersionAddition( VOID ) +GLOBAL CHAR * +NGIRCd_VersionAddition( VOID ) { - STATIC CHAR txt[64]; + STATIC CHAR txt[200]; strcpy( txt, "" ); -#ifdef USE_SYSLOG +#ifdef SYSLOG if( txt[0] ) strcat( txt, "+" ); strcat( txt, "SYSLOG" ); #endif -#ifdef STRICT_RFC +#ifdef ZLIB if( txt[0] ) strcat( txt, "+" ); - strcat( txt, "RFC" ); + strcat( txt, "ZLIB" ); +#endif +#ifdef TCPWRAP + if( txt[0] ) strcat( txt, "+" ); + strcat( txt, "TCPWRAP" ); +#endif +#ifdef RENDEZVOUS + if( txt[0] ) strcat( txt, "+" ); + strcat( txt, "RENDEZVOUS" ); +#endif +#ifdef IDENTAUTH + if( txt[0] ) strcat( txt, "+" ); + strcat( txt, "IDENT" ); #endif #ifdef DEBUG if( txt[0] ) strcat( txt, "+" ); @@ -356,19 +405,72 @@ GLOBAL CHAR *NGIRCd_VersionAddition( VOID ) if( txt[0] ) strcat( txt, "+" ); strcat( txt, "SNIFFER" ); #endif - - if( txt[0] ) strcat( txt, "-" ); - strcat( txt, P_OSNAME"/"P_ARCHNAME ); +#ifdef STRICT_RFC + if( txt[0] ) strcat( txt, "+" ); + strcat( txt, "RFC" ); +#endif +#ifdef IRCPLUS + if( txt[0] ) strcat( txt, "+" ); + strcat( txt, "IRCPLUS" ); +#endif + + if( txt[0] ) strlcat( txt, "-", sizeof( txt )); + strlcat( txt, TARGET_CPU, sizeof( txt )); + strlcat( txt, "/", sizeof( txt )); + strlcat( txt, TARGET_VENDOR, sizeof( txt )); + strlcat( txt, "/", sizeof( txt )); + strlcat( txt, TARGET_OS, sizeof( txt )); return txt; } /* NGIRCd_VersionAddition */ -LOCAL VOID Initialize_Signal_Handler( VOID ) +GLOBAL VOID +NGIRCd_Rehash( VOID ) +{ + CHAR old_name[CLIENT_ID_LEN]; + + Log( LOG_NOTICE|LOG_snotice, "Re-reading configuration NOW!" ); + NGIRCd_SignalRehash = FALSE; + + /* Close down all listening sockets */ + Conn_ExitListeners( ); + + /* Remember old server name */ + strcpy( old_name, Conf_ServerName ); + + /* Re-read configuration ... */ + Conf_Rehash( ); + + /* Recover old server name: it can't be changed during run-time */ + if( strcmp( old_name, Conf_ServerName ) != 0 ) + { + strcpy( Conf_ServerName, old_name ); + Log( LOG_ERR, "Can't change \"ServerName\" on runtime! Ignored new name." ); + } + + /* Create new pre-defined channels */ + Channel_InitPredefined( ); + + /* Start listening on sockets */ + Conn_InitListeners( ); + + /* Sync configuration with established connections */ + Conn_SyncServerStruct( ); + + Log( LOG_NOTICE|LOG_snotice, "Re-reading of configuration done." ); +} /* NGIRCd_Rehash */ + + +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 */ @@ -391,10 +493,24 @@ LOCAL VOID Initialize_Signal_Handler( VOID ) /* 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 */ -LOCAL VOID Signal_Handler( INT Signal ) +LOCAL VOID +Signal_Handler( INT Signal ) { /* Signal-Handler. Dieser wird aufgerufen, wenn eines der Signale eintrifft, * fuer das wir uns registriert haben (vgl. Initialize_Signal_Handler). Die @@ -406,71 +522,51 @@ LOCAL VOID 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 ..." ); - NGIRCd_Quit = TRUE; + NGIRCd_SignalQuit = TRUE; break; case SIGHUP: - /* neu starten */ - Log( LOG_WARNING, "Got HUP signal, restarting now ..." ); - NGIRCd_Restart = TRUE; + /* Konfiguration neu einlesen: */ + NGIRCd_SignalRehash = TRUE; break; case SIGCHLD: /* Child-Prozess wurde beendet. Zombies vermeiden: */ while( waitpid( -1, NULL, WNOHANG ) > 0); break; +#ifdef DEBUG default: /* unbekanntes bzw. unbehandeltes Signal */ - Log( LOG_NOTICE, "Got signal %d! Ignored.", Signal ); + Log( LOG_DEBUG, "Got signal %d! Ignored.", Signal ); +#endif } } /* 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 %d!", Conf_ListenPorts[i] ); - } - - if( created < 1 ) - { - Log( LOG_ALERT, "Server isn't listening on a single port!" ); - Log( LOG_ALERT, PACKAGE" exiting due to fatal errors!" ); - exit( 1 ); - } -} /* Initialize_Listen_Ports */ - - -LOCAL VOID Show_Version( VOID ) +LOCAL VOID +Show_Version( VOID ) { puts( NGIRCd_Version( )); - puts( "Copyright (c)2001,2002 by Alexander Barton (alex@barton.de).\n" ); + puts( "Copyright (c)2001-2004 by Alexander Barton ()." ); + puts( "Homepage: \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 ) +LOCAL VOID +Show_Help( VOID ) { #ifdef DEBUG - puts( " -d, --debug log extra debug messages" ); + 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" ); + puts( " -f, --config use file as configuration file" ); + puts( " -n, --nodaemon don't fork and don't detach 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" ); + 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" ); + puts( " -t, --configtest read, validate and display configuration; then exit" ); + puts( " --version output version information and exit" ); + puts( " --help display this help and exit" ); } /* Show_Help */