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=b884bd99b3de55260bd40629592c36b9ed479018;hb=cf2d47943713a3d88550561ce02472848584934a;hpb=5b27e491d41e4ca2ba3fdfded0da7af49bcd5f8e diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index b884bd99..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.42 2002/04/01 17:05:48 alex Exp $ + * $Id: ngircd.c,v 1.61 2002/11/22 23:31:23 alex Exp $ * * ngircd.c: Hier beginnt alles ;-) */ @@ -21,41 +21,51 @@ #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[] ) { + struct passwd *pwd; + struct group *grp; BOOLEAN ok, configtest = FALSE; - INT32 pid, n; + LONG pid, n; INT i; + umask( 0077 ); + NGIRCd_Restart = FALSE; NGIRCd_Quit = FALSE; NGIRCd_NoDaemon = FALSE; @@ -133,7 +143,7 @@ GLOBAL int main( int argc, const char *argv[] ) { /* Kurze Option */ - for( n = 1; n < (INT32)strlen( argv[i] ); n++ ) + for( n = 1; n < (LONG)strlen( argv[i] ); n++ ) { ok = FALSE; #ifdef DEBUG @@ -152,7 +162,7 @@ GLOBAL int main( int argc, const char *argv[] ) NGIRCd_ConfFile[FNAME_LEN - 1] = '\0'; /* zum uebernaechsten Parameter */ - i++; n = strlen( argv[i] ); + i++; n = (LONG)strlen( argv[i] ); ok = TRUE; } } @@ -176,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 ); } } @@ -185,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 ); } } @@ -197,7 +207,11 @@ 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? */ @@ -216,7 +230,7 @@ GLOBAL int main( int argc, const char *argv[] ) if( ! NGIRCd_NoDaemon ) { /* Daemon im Hintergrund erzeugen */ - pid = (INT32)fork( ); + pid = (LONG)fork( ); if( pid > 0 ) { /* "alter" Prozess */ @@ -225,7 +239,7 @@ 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 ); } @@ -242,7 +256,9 @@ GLOBAL int main( int argc, const char *argv[] ) /* Module initialisieren */ Log_Init( ); + Resolve_Init( ); Conf_Init( ); + Lists_Init( ); Channel_Init( ); Client_Init( ); Conn_Init( ); @@ -262,28 +278,48 @@ GLOBAL int main( int argc, const char *argv[] ) if( setuid( Conf_UID ) != 0 ) Log( LOG_ERR, "Can't change User-ID to %u: %s", Conf_UID, strerror( errno )); } } - Log( LOG_INFO, "Running as user %ld, group %ld.", (INT32)getuid( ), (INT32)getgid( )); + + /* 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( ); } @@ -291,16 +327,22 @@ GLOBAL int main( int argc, const char *argv[] ) } /* 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]; @@ -310,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" ); @@ -322,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. */ @@ -376,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 @@ -388,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: */ @@ -409,30 +493,8 @@ LOCAL VOID Signal_Handler( INT Signal ) } /* Signal_Handler */ -LOCAL VOID Initialize_Listen_Ports( VOID ) -{ - /* Ports, auf denen der Server Verbindungen entgegennehmen - * soll, initialisieren */ - - UINT 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 %u!", 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 ()." ); @@ -442,13 +504,14 @@ LOCAL VOID Show_Version( VOID ) } /* Show_Version */ -LOCAL VOID Show_Help( VOID ) +LOCAL VOID +Show_Help( VOID ) { #ifdef DEBUG puts( " -d, --debug log extra debug messages" ); #endif puts( " -f, --config use file as configuration file" ); - puts( " -n, --nodaemon don't fork and don't detatch from controlling terminal" ); + 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" );