X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=a96646cfb4744d3925b692d9484302125f9cb343;hb=ffcf5ab9991536a88c6d05ff80aaaf084d817b8c;hp=3dcd625d4eb888d0065a4b01c7243a68048c0c2e;hpb=85aad8690616c3e45db18304d72ea181d207de45;p=ngircd-alex.git diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 3dcd625d..a96646cf 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.41 2002/03/31 13:20:42 alex Exp $ + * $Id: ngircd.c,v 1.54 2002/09/07 17:57:17 alex Exp $ * * ngircd.c: Hier beginnt alles ;-) */ @@ -21,41 +21,48 @@ #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 "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_Signal_Handler PARAMS(( VOID )); +LOCAL VOID Signal_Handler PARAMS(( INT Signal )); -LOCAL VOID Initialize_Listen_Ports( VOID ); +LOCAL VOID Initialize_Listen_Ports PARAMS(( VOID )); -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, configtest = FALSE; INT32 pid, n; INT i; + umask( 0077 ); + NGIRCd_Restart = FALSE; NGIRCd_Quit = FALSE; NGIRCd_NoDaemon = FALSE; @@ -176,8 +183,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 +192,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 +204,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? */ @@ -225,7 +236,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 +253,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 +275,39 @@ 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( )); + Log( LOG_INFO, "Running as user %ld, group %ld, with PID %ld.", (INT32)getuid( ), (INT32)getgid( ), (INT32)getpid( )); Log_InitErrorfile( ); /* Signal-Handler initialisieren */ Initialize_Signal_Handler( ); + /* 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 ); + + /* Vordefinierte Channels anlegen */ + Channel_InitPredefined( ); + /* Listen-Ports initialisieren */ Initialize_Listen_Ports( ); /* Hauptschleife */ - while( TRUE ) - { - if( NGIRCd_Quit || NGIRCd_Restart ) break; - Conn_Handler( 5 ); - } + Conn_Handler( ); /* Alles abmelden */ Conn_Exit( ); Client_Exit( ); Channel_Exit( ); - Conf_Exit( ); + Lists_Exit( ); Log_Exit( ); } @@ -291,16 +315,18 @@ 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( )); + sprintf( version, "%s %s-%s", PACKAGE, VERSION, NGIRCd_VersionAddition( )); return version; } /* NGIRCd_Version */ -GLOBAL CHAR *NGIRCd_VersionAddition( VOID ) +GLOBAL CHAR * +NGIRCd_VersionAddition( VOID ) { STATIC CHAR txt[64]; @@ -310,10 +336,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 +344,28 @@ 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 ) +LOCAL VOID +Initialize_Signal_Handler( VOID ) { /* Signal-Handler initialisieren: einige Signale * werden ignoriert, andere speziell behandelt. */ @@ -376,7 +411,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 @@ -409,7 +445,8 @@ LOCAL VOID Signal_Handler( INT Signal ) } /* Signal_Handler */ -LOCAL VOID Initialize_Listen_Ports( VOID ) +LOCAL VOID +Initialize_Listen_Ports( VOID ) { /* Ports, auf denen der Server Verbindungen entgegennehmen * soll, initialisieren */ @@ -426,22 +463,25 @@ LOCAL VOID Initialize_Listen_Ports( VOID ) if( created < 1 ) { Log( LOG_ALERT, "Server isn't listening on a single port!" ); - Log( LOG_ALERT, PACKAGE" exiting due to fatal errors!" ); + Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE ); 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 ) { #ifdef DEBUG puts( " -d, --debug log extra debug messages" );