X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=81d7545d764f11f468cf2a76cbe714ed67978214;hp=120589a8225a0aacb956b70760d4930e0b6cecc8;hb=cf2d47943713a3d88550561ce02472848584934a;hpb=882c91280e46c62274ad6b77677d02fba342efda diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 120589a8..81d7545d 100644 --- 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.34 2002/03/12 22:08:24 alex Exp $ + * $Id: ngircd.c,v 1.61 2002/11/22 23:31:23 alex Exp $ * * ngircd.c: Hier beginnt alles ;-) */ @@ -21,39 +21,50 @@ #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 "cvs-version.h" #include "defines.h" -#include "irc.h" +#include "lists.h" #include "log.h" #include "parse.h" +#include "irc.h" #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; + + umask( 0077 ); NGIRCd_Restart = FALSE; NGIRCd_Quit = FALSE; @@ -65,6 +76,7 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) #ifdef SNIFFER NGIRCd_Sniffer = FALSE; #endif + strcpy( NGIRCd_ConfFile, CONFIG_FILE ); /* Kommandozeile parsen */ for( i = 1; i < argc; i++ ) @@ -74,6 +86,23 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) { /* Lange Option */ + if( strcmp( argv[i], "--config" ) == 0 ) + { + if( i + 1 < argc ) + { + /* Ok, danach kommt noch ein Parameter */ + strncpy( NGIRCd_ConfFile, argv[i + 1], FNAME_LEN - 1 ); + NGIRCd_ConfFile[FNAME_LEN - 1] = '\0'; + + /* zum uebernaechsten Parameter */ + i++; ok = TRUE; + } + } + if( strcmp( argv[i], "--configtest" ) == 0 ) + { + configtest = TRUE; + ok = TRUE; + } #ifdef DEBUG if( strcmp( argv[i], "--debug" ) == 0 ) { @@ -83,8 +112,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 ) @@ -114,7 +143,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 @@ -124,6 +153,19 @@ 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, danach kommt ein Leerzeichen */ + strncpy( NGIRCd_ConfFile, argv[i + 1], FNAME_LEN - 1 ); + NGIRCd_ConfFile[FNAME_LEN - 1] = '\0'; + + /* zum uebernaechsten Parameter */ + i++; n = (LONG)strlen( argv[i] ); + ok = TRUE; + } + } if( argv[i][n] == 'n' ) { NGIRCd_NoDaemon = TRUE; @@ -144,8 +186,8 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) 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, argv[i][n] ); + printf( "Try \"%s --help\" for more information.\n", PACKAGE ); exit( 1 ); } } @@ -153,8 +195,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, argv[i] ); + printf( "Try \"%s --help\" for more information.\n", PACKAGE ); exit( 1 ); } } @@ -165,8 +207,19 @@ 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 ) { @@ -177,7 +230,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 */ @@ -186,68 +239,110 @@ 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, strerror( errno )); exit( 1 ); } /* Child-Prozess initialisieren */ - setsid( ); + (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 )); + (VOID)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( ); + Resolve_Init( ); Conf_Init( ); + Lists_Init( ); Channel_Init( ); Client_Init( ); Conn_Init( ); + /* Wenn als root ausgefuehrt und eine andere UID + * konfiguriert ist, jetzt zu dieser wechseln */ + if( getuid( ) == 0 ) + { + if( Conf_GID != 0 ) + { + /* Neue Group-ID setzen */ + if( setgid( Conf_GID ) != 0 ) Log( LOG_ERR, "Can't change Group-ID to %u: %s", Conf_GID, strerror( errno )); + } + if( Conf_UID != 0 ) + { + /* Neue User-ID setzen */ + if( setuid( Conf_UID ) != 0 ) Log( LOG_ERR, "Can't change User-ID to %u: %s", Conf_UID, strerror( errno )); + } + } + + /* User, Gruppe und Prozess-ID des Daemon ausgeben */ + 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( )); + + /* stderr in "Error-File" umlenken */ + 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, VERSION, IRCPLUSFLAGS ); + if( Conf_OperCanMode ) strcat( NGIRCd_ProtoID, "o" ); +#else + sprintf( NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, PACKAGE, VERSION ); +#endif + strcat( NGIRCd_ProtoID, " P" ); + 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 ); + exit( 1 ); } + + /* Hauptschleife */ + Conn_Handler( ); /* Alles abmelden */ Conn_Exit( ); Client_Exit( ); Channel_Exit( ); - Conf_Exit( ); + Lists_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 ) +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, VERSION, CVSDATE, NGIRCd_VersionAddition( )); +#else + sprintf( version, "%s %s-%s", PACKAGE, VERSION, NGIRCd_VersionAddition( )); +#endif return version; } /* NGIRCd_Version */ -GLOBAL CHAR *NGIRCd_VersionAddition( VOID ) +GLOBAL CHAR * +NGIRCd_VersionAddition( VOID ) { STATIC CHAR txt[64]; @@ -257,10 +352,6 @@ GLOBAL CHAR *NGIRCd_VersionAddition( VOID ) 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" ); @@ -269,15 +360,60 @@ GLOBAL CHAR *NGIRCd_VersionAddition( VOID ) if( txt[0] ) strcat( txt, "+" ); strcat( txt, "SNIFFER" ); #endif - +#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] ) strcat( txt, "-" ); - strcat( txt, TARGET_CPU"/"TARGET_VENDOR"/"TARGET_OS ); + strcat( txt, TARGET_CPU ); + strcat( txt, "/" ); + strcat( txt, TARGET_VENDOR ); + strcat( txt, "/" ); + strcat( txt, TARGET_OS ); return txt; } /* NGIRCd_VersionAddition */ -LOCAL VOID Initialize_Signal_Handler( VOID ) +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 ) { /* Signal-Handler initialisieren: einige Signale * werden ignoriert, andere speziell behandelt. */ @@ -323,7 +459,8 @@ LOCAL VOID Initialize_Signal_Handler( VOID ) } /* 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 @@ -335,15 +472,15 @@ 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 ..." ); + 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: */ @@ -356,55 +493,32 @@ LOCAL VOID 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 %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,2002 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 ) { - 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" ); + 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( " --configtest read, validate and display configuration; then exit" ); + puts( " --version output version information and exit" ); + puts( " --help display this help and exit" ); } /* Show_Help */