X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=5fc88c9c8c601293d5936df608c796c5423836ae;hb=ecad9f32c82f50312010ab41f7702d1329bc511e;hp=97e5733b512069cf943fb2efea36e7ded2202239;hpb=2c2c93e311c09faa68cbdb4939902c2bca2d5383;p=ngircd-alex.git diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 97e5733b..5fc88c9c 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex@barton.de). + * Copyright (c)2001-2009 Alexander Barton (alex@barton.de). * * 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 @@ -41,6 +41,7 @@ #include "defines.h" #include "resolve.h" #include "conn.h" +#include "conf-ssl.h" #include "client.h" #include "channel.h" #include "conf.h" @@ -109,14 +110,13 @@ main( int argc, const char *argv[] ) Fill_Version( ); - /* Kommandozeile parsen */ + /* parse conmmand line */ for( i = 1; i < argc; i++ ) { ok = false; if(( argv[i][0] == '-' ) && ( argv[i][1] == '-' )) { - /* Lange Option */ - + /* long option */ if( strcmp( argv[i], "--config" ) == 0 ) { if( i + 1 < argc ) @@ -171,7 +171,7 @@ main( int argc, const char *argv[] ) } else if(( argv[i][0] == '-' ) && ( argv[i][1] != '-' )) { - /* Kurze Option */ + /* short option */ for( n = 1; n < strlen( argv[i] ); n++ ) { ok = false; @@ -240,7 +240,7 @@ main( int argc, const char *argv[] ) } } - /* Debug-Level (fuer IRC-Befehl "VERSION") ermitteln */ + /* Debug-Level (for IRCs "VERSION" command) */ NGIRCd_DebugLevel[0] = '\0'; #ifdef DEBUG if( NGIRCd_Debug ) strcpy( NGIRCd_DebugLevel, "1" ); @@ -253,7 +253,6 @@ main( int argc, const char *argv[] ) } #endif - /* Soll nur die Konfigurations ueberprueft und ausgegeben werden? */ if( configtest ) { Show_Version( ); puts( "" ); @@ -296,12 +295,13 @@ main( int argc, const char *argv[] ) if( ! NGIRCd_NoDaemon ) Log_InitErrorfile( ); #endif - /* 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. */ + /* + * create protocol and server identification. + * The syntax used by ngIRCd in PASS commands and the extended flags + * are described in doc/Protocol.txt + */ #ifdef IRCPLUS snprintf( NGIRCd_ProtoID, sizeof NGIRCd_ProtoID, "%s%s %s|%s:%s", PROTOVER, PROTOIRCPLUS, PACKAGE_NAME, PACKAGE_VERSION, IRCPLUSFLAGS ); #ifdef ZLIB @@ -315,12 +315,10 @@ main( int argc, const char *argv[] ) #ifdef ZLIB strlcat( NGIRCd_ProtoID, "Z", sizeof NGIRCd_ProtoID ); #endif - Log( LOG_DEBUG, "Protocol and server ID is \"%s\".", NGIRCd_ProtoID ); + LogDebug("Protocol and server ID is \"%s\".", NGIRCd_ProtoID); - /* Vordefinierte Channels anlegen */ Channel_InitPredefined( ); - /* Listen-Ports initialisieren */ if( Conn_InitListeners( ) < 1 ) { Log( LOG_ALERT, "Server isn't listening on a single port!" ); @@ -367,6 +365,10 @@ Fill_Version( void ) strlcat( NGIRCd_VersionAddition, "ZLIB", sizeof NGIRCd_VersionAddition ); #endif +#ifdef SSL_SUPPORT + if ( NGIRCd_VersionAddition[0] ) strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition ); + strlcat( NGIRCd_VersionAddition, "SSL", sizeof NGIRCd_VersionAddition ); +#endif #ifdef TCPWRAP if( NGIRCd_VersionAddition[0] ) strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition ); @@ -465,7 +467,10 @@ NGIRCd_Rehash( void ) /* Create new pre-defined channels */ Channel_InitPredefined( ); - + + if (!ConnSSL_InitLibrary()) + Log(LOG_WARNING, "Re-Initializing SSL failed, using old keys"); + /* Start listening on sockets */ Conn_InitListeners( ); @@ -482,15 +487,9 @@ NGIRCd_Rehash( void ) static 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 @@ -500,27 +499,22 @@ Initialize_Signal_Handler( void ) saction.sa_flags |= SA_NOCLDWAIT; #endif - /* Signal-Handler einhaengen */ sigaction(SIGINT, &saction, NULL); sigaction(SIGQUIT, &saction, NULL); sigaction(SIGTERM, &saction, NULL); sigaction(SIGHUP, &saction, NULL); sigaction(SIGCHLD, &saction, NULL); - /* einige Signale ignorieren */ + /* we handle write errors properly; ignore SIGPIPE */ 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 */ @@ -540,16 +534,17 @@ Signal_Handler( int Signal ) case SIGTERM: case SIGINT: case SIGQUIT: - /* wir soll(t)en uns wohl beenden ... */ + /* shut down sever */ NGIRCd_SignalQuit = true; break; case SIGHUP: - /* Konfiguration neu einlesen: */ + /* re-read configuration */ NGIRCd_SignalRehash = true; break; case SIGCHLD: - /* Child-Prozess wurde beendet. Zombies vermeiden: */ - while( waitpid( -1, NULL, WNOHANG ) > 0); + /* child-process exited, avoid zombies */ + while (waitpid( -1, NULL, WNOHANG) > 0) + ; break; #ifdef DEBUG default: @@ -567,7 +562,7 @@ static void Show_Version( void ) { puts( NGIRCd_Version ); - puts( "Copyright (c)2001-2008 Alexander Barton () and Contributors." ); + puts( "Copyright (c)2001-2009 Alexander Barton () and Contributors." ); 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." ); @@ -726,6 +721,10 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) if (initialized) return true; + if (!ConnSSL_InitLibrary()) + Log(LOG_WARNING, + "Warning: Error during SSL initialization, continuing ..."); + if( Conf_Chroot[0] ) { if( chdir( Conf_Chroot ) != 0 ) { Log( LOG_ERR, "Can't chdir() in ChrootDir (%s): %s", Conf_Chroot, strerror( errno )); @@ -816,16 +815,16 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) pwd = getpwuid( Conf_UID ); grp = getgrgid( Conf_GID ); - Log( LOG_INFO, "Running as user %s(%ld), group %s(%ld), with PID %ld.", - pwd ? pwd->pw_name : "unknown", Conf_UID, - grp ? grp->gr_name : "unknown", Conf_GID, pid); + Log(LOG_INFO, "Running as user %s(%ld), group %s(%ld), with PID %ld.", + pwd ? pwd->pw_name : "unknown", (long)Conf_UID, + grp ? grp->gr_name : "unknown", (long)Conf_GID, (long)pid); - if ( chrooted ) { - Log( LOG_INFO, "Running chrooted, chrootdir \"%s\".", Conf_Chroot ); + if (chrooted) { + Log(LOG_INFO, "Running with root directory \"%s\".", + Conf_Chroot ); return true; - } else { - Log( LOG_INFO, "Not running chrooted." ); - } + } else + Log(LOG_INFO, "Not running with changed root directory."); /* Change working directory to home directory of the user * we are running as (only when running in daemon mode and not in chroot) */