X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=63fc64bf2ef2ac6a34ff847bb9f59ad7d1b036d8;hp=4d329d2ade1c89724bf975c98cb758f12fa310b0;hb=6d11fb149707194e986b0d64af3d44f21e158fcc;hpb=a02bc9cc6f821a604f6ae4a865b0da8eec4da5a4;ds=sidebyside diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 4d329d2a..63fc64bf 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton (alex@barton.de). + * Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors. * * 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 @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -46,6 +45,8 @@ #include "lists.h" #include "log.h" #include "parse.h" +#include "sighandlers.h" +#include "io.h" #include "irc.h" #ifdef ZEROCONF @@ -56,9 +57,6 @@ #include "ngircd.h" -static void Initialize_Signal_Handler PARAMS(( void )); -static void Signal_Handler PARAMS(( int Signal )); - static void Show_Version PARAMS(( void )); static void Show_Help PARAMS(( void )); @@ -71,6 +69,7 @@ static void Setup_FDStreams PARAMS(( int fd )); static bool NGIRCd_Init PARAMS(( bool )); + /** * The main() function of ngIRCd. * Here all starts: this function is called by the operating system loader, @@ -95,7 +94,7 @@ main( int argc, const char *argv[] ) umask( 0077 ); - NGIRCd_SignalQuit = NGIRCd_SignalRestart = NGIRCd_SignalRehash = false; + NGIRCd_SignalQuit = NGIRCd_SignalRestart = false; NGIRCd_Passive = false; #ifdef DEBUG NGIRCd_Debug = false; @@ -263,7 +262,6 @@ main( int argc, const char *argv[] ) 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; @@ -287,13 +285,15 @@ main( int argc, const char *argv[] ) #endif Conn_Init( ); -#ifdef DEBUG - /* Redirect stderr handle to "error file" for debugging - * when not running in "no daemon" mode: */ - if( ! NGIRCd_NoDaemon ) Log_InitErrorfile( ); -#endif + if (!io_library_init(CONNECTION_POOL)) { + Log(LOG_ALERT, "Fatal: Cannot initialize IO routines: %s", strerror(errno)); + exit(1); + } - Initialize_Signal_Handler( ); + if (!Signals_Init()) { + Log(LOG_ALERT, "Fatal: Could not set up signal handlers: %s", strerror(errno)); + exit(1); + } /* * create protocol and server identification. @@ -425,130 +425,6 @@ Fill_Version( void ) } /* Fill_Version */ -/** - * Reload the server configuration file. - */ -GLOBAL void -NGIRCd_Rehash( void ) -{ - char old_name[CLIENT_ID_LEN]; - unsigned old_nicklen; - - Log( LOG_NOTICE|LOG_snotice, "Re-reading configuration NOW!" ); - NGIRCd_SignalRehash = false; - - /* Remember old server name and nick name length */ - strlcpy( old_name, Conf_ServerName, sizeof old_name ); - old_nicklen = Conf_MaxNickLength; - - /* Re-read configuration ... */ - if (!Conf_Rehash( )) - return; - - /* Close down all listening sockets */ - Conn_ExitListeners( ); - - /* Recover old server name and nick name length: these values can't - * be changed during run-time */ - if (strcmp(old_name, Conf_ServerName) != 0 ) { - strlcpy(Conf_ServerName, old_name, sizeof Conf_ServerName); - Log(LOG_ERR, "Can't change \"ServerName\" on runtime! Ignored new name."); - } - if (old_nicklen != Conf_MaxNickLength) { - Conf_MaxNickLength = old_nicklen; - Log(LOG_ERR, "Can't change \"MaxNickLength\" on runtime! Ignored new value."); - } - - /* 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( ); - - /* Sync configuration with established connections */ - Conn_SyncServerStruct( ); - - Log( LOG_NOTICE|LOG_snotice, "Re-reading of configuration done." ); -} /* NGIRCd_Rehash */ - - -/** - * Initialize the signal handler. - */ -static void -Initialize_Signal_Handler( void ) -{ -#ifdef HAVE_SIGACTION - struct sigaction saction; - - memset( &saction, 0, sizeof( saction )); - saction.sa_handler = Signal_Handler; -#ifdef SA_RESTART - saction.sa_flags |= SA_RESTART; -#endif -#ifdef SA_NOCLDWAIT - saction.sa_flags |= SA_NOCLDWAIT; -#endif - - sigaction(SIGINT, &saction, NULL); - sigaction(SIGQUIT, &saction, NULL); - sigaction(SIGTERM, &saction, NULL); - sigaction(SIGHUP, &saction, NULL); - sigaction(SIGCHLD, &saction, NULL); - - /* we handle write errors properly; ignore SIGPIPE */ - saction.sa_handler = SIG_IGN; - sigaction(SIGPIPE, &saction, NULL); -#else - signal(SIGINT, Signal_Handler); - signal(SIGQUIT, Signal_Handler); - signal(SIGTERM, Signal_Handler); - signal(SIGHUP, Signal_Handler); - signal(SIGCHLD, Signal_Handler); - - signal(SIGPIPE, SIG_IGN); -#endif -} /* Initialize_Signal_Handler */ - - -/** - * Signal handler of ngIRCd. - * This function is called whenever ngIRCd catches a signal sent by the - * user and/or the system to it. For example SIGTERM and SIGHUP. - * @param Signal Number of the signal to handle. - */ -static void -Signal_Handler( int Signal ) -{ - switch( Signal ) - { - case SIGTERM: - case SIGINT: - case SIGQUIT: - /* shut down sever */ - NGIRCd_SignalQuit = true; - break; - case SIGHUP: - /* re-read configuration */ - NGIRCd_SignalRehash = true; - break; - case SIGCHLD: - /* child-process exited, avoid zombies */ - while (waitpid( -1, NULL, WNOHANG) > 0) - ; - break; -#ifdef DEBUG - default: - /* unbekanntes bzw. unbehandeltes Signal */ - Log( LOG_DEBUG, "Got signal %d! Ignored.", Signal ); -#endif - } -} /* Signal_Handler */ - - /** * Display copyright and version information of ngIRCd on the console. */ @@ -556,7 +432,7 @@ static void Show_Version( void ) { puts( NGIRCd_Version ); - puts( "Copyright (c)2001-2010 Alexander Barton () and Contributors." ); + puts( "Copyright (c)2001-2011 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." ); @@ -843,4 +719,5 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) return false; } + /* -eof- */