September 2010 - ngIRCd GIT Updates

Alexander Barton : Bump version number to "17-dev"
by alex＠arthur.barton.de 14 Sep '10

14 Sep '10

Module: ngircd.git Branch: master Commit: fe5c7cb22d1dad4840872c79933f4a9ddbdff15b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fe5c7cb2… Author: Alexander Barton <alex(a)barton.de> Date: Sat Sep 11 00:02:37 2010 +0200 Bump version number to "17-dev" --- configure.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index b7e0ea1..897d424 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ # -- Initialisation -- AC_PREREQ(2.50) -AC_INIT(ngircd, 16) +AC_INIT(ngircd, 17-dev) AC_CONFIG_SRCDIR(src/ngircd/ngircd.c) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6)

1 0

Alexander Barton : Update ChangeLog and NEWS: include SIGUSR1/ SIGUSR2 changes
by alex＠arthur.barton.de 14 Sep '10

14 Sep '10

Module: ngircd.git Branch: master Commit: cdae82413d20c802bbde11f994b8736df38e978b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cdae8241… Author: Alexander Barton <alex(a)barton.de> Date: Fri Sep 10 21:22:08 2010 +0200 Update ChangeLog and NEWS: include SIGUSR1/SIGUSR2 changes --- ChangeLog | 7 +++++++ NEWS | 6 ++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2fca3a4..73c98d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,13 @@ ngIRCd Release 17 + - Dump the "internal server state" (configured servers, established + connections and known clients) to the console or syslog when receiving + the SIGUSR2 signal and debug mode is enabled. + - Enable the daemon to disable and enable "debug mode" on runtime using + signal SIGUSR1, when debug code is compiled in, not only on startup + using the command line parameters. + - Conn_SyncServerStruct(): test all connections; and work case insensitive - configure script: correctly indent IPv6 yes/no summary output. - Don't reset My_Connections[Idx].lastping when reading data, so the client lag debug-output is working again. diff --git a/NEWS b/NEWS index a4c1a11..d3a600c 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,12 @@ ngIRCd Release 17 + - Dump the "internal server state" (configured servers, established + connections and known clients) to the console or syslog when receiving + the SIGUSR2 signal and debug mode is enabled. + - Enable the daemon to disable and enable "debug mode" on runtime using + signal SIGUSR1, when debug code is compiled in, not only on startup + using the command line parameters. - Implement user mode "x": hostname cloaking (closes: #102). - Change MOTD file handling: ngIRCd now caches the contens of the MOTD file, so the daemon now requires a HUP signal or REHASH command to

1 0

Alexander Barton : Output connection status when dumping the internal server state
by alex＠arthur.barton.de 14 Sep '10

14 Sep '10

Module: ngircd.git Branch: master Commit: 3600dc60fc54e4317b04ca5896515cf9913910c0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3600dc60… Author: Alexander Barton <alex(a)barton.de> Date: Fri Sep 10 21:11:25 2010 +0200 Output connection status when dumping the internal server state --- src/ngircd/conn.c | 24 ++++++++++++++++++++++++ src/ngircd/conn.h | 4 ++++ src/ngircd/sighandlers.c | 1 + 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index e4851a9..d74f251 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -2184,4 +2184,28 @@ Conn_UsesSSL(CONN_ID Idx) #endif +#ifdef DEBUG + +GLOBAL void +Conn_DebugDump(void) +{ + int i; + + Log(LOG_DEBUG, "Connection status:"); + for (i = 0; i < Pool_Size; i++) { + if (My_Connections[i].sock == NONE) + continue; + Log(LOG_DEBUG, + " - %d: host=%s, lastdata=%ld, lastping=%ld, delaytime=%ld, flag=%d, options=%d, bps=%d, client=%s", + My_Connections[i].sock, My_Connections[i].host, + My_Connections[i].lastdata, My_Connections[i].lastping, + My_Connections[i].delaytime, My_Connections[i].flag, + My_Connections[i].options, My_Connections[i].bps, + My_Connections[i].client ? Client_ID(My_Connections[i].client) : "-"); + } +} /* Conn_DumpClients */ + +#endif + + /* -eof- */ diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index a0bddaa..1e938ad 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -129,6 +129,10 @@ GLOBAL long Conn_Count PARAMS((void)); GLOBAL long Conn_CountMax PARAMS((void)); GLOBAL long Conn_CountAccepted PARAMS((void)); +#ifdef DEBUG +GLOBAL void Conn_DebugDump PARAMS((void)); +#endif + #endif diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c index cb12a84..57bf80f 100644 --- a/src/ngircd/sighandlers.c +++ b/src/ngircd/sighandlers.c @@ -46,6 +46,7 @@ Dump_State(void) Client_ID(Client_ThisServer())); Log(LOG_DEBUG, "time()=%ld", time(NULL)); Conf_DebugDump(); + Conn_DebugDump(); Client_DebugDump(); Log(LOG_DEBUG, "--- End of state dump ---"); } /* Dump_State */

1 0

Alexander Barton : Reformat "server state" debug messages a little bit
by alex＠arthur.barton.de 14 Sep '10

14 Sep '10

Module: ngircd.git Branch: master Commit: cd954ee7e902743cd679b418edf1630225c512c4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cd954ee7… Author: Alexander Barton <alex(a)barton.de> Date: Fri Sep 10 21:10:17 2010 +0200 Reformat "server state" debug messages a little bit --- src/ngircd/client.c | 2 +- src/ngircd/sighandlers.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index d53dc96..0334783 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -1285,7 +1285,7 @@ Client_DebugDump(void) c = My_Clients; while (c) { Log(LOG_DEBUG, - " - %s, type=%d, host=%s, user=%s, conn=%d, start=%ld, flags=%s", + " - %s: type=%d, host=%s, user=%s, conn=%d, start=%ld, flags=%s", Client_ID(c), Client_Type(c), Client_Hostname(c), Client_User(c), Client_Conn(c), Client_StartTime(c), Client_Flags(c)); diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c index 688a8f0..cb12a84 100644 --- a/src/ngircd/sighandlers.c +++ b/src/ngircd/sighandlers.c @@ -42,7 +42,8 @@ static int signalpipe[2]; static void Dump_State(void) { - Log(LOG_DEBUG, "--- Internal server state: ---"); + Log(LOG_DEBUG, "--- Internal server state: %s ---", + Client_ID(Client_ThisServer())); Log(LOG_DEBUG, "time()=%ld", time(NULL)); Conf_DebugDump(); Client_DebugDump();

1 0

Alexander Barton : Enable the daemon to dump its internal state in debug-mode.
by alex＠arthur.barton.de 14 Sep '10

14 Sep '10

Module: ngircd.git Branch: master Commit: 355828e64f6fa07eb96bc6b27eef964b529d8778 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=355828e6… Author: Alexander Barton <alex(a)barton.de> Date: Wed Apr 9 19:03:24 2008 +0200 Enable the daemon to dump its internal state in debug-mode. This patch allows ngIRCd to dump its internal state (connected clients, actual configuration) when compiled with --enable-debug. The daemon catches two more signals: - SIGUSR1: toggle debug mode (on/off), - SIGUSR2: dump internal state to console/syslog. --- src/ngircd/client.c | 22 ++++++++++++++++++++++ src/ngircd/client.h | 6 ++++++ src/ngircd/conf.c | 23 +++++++++++++++++++++++ src/ngircd/conf.h | 4 ++++ src/ngircd/ngircd.c | 2 ++ src/ngircd/sighandlers.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 101 insertions(+), 0 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index f73a2d1..d53dc96 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -1274,4 +1274,26 @@ Destroy_UserOrService(CLIENT *Client, const char *Txt, const char *FwdMsg, bool } /* Destroy_UserOrService */ +#ifdef DEBUG + +GLOBAL void +Client_DebugDump(void) +{ + CLIENT *c; + + Log(LOG_DEBUG, "Client status:"); + c = My_Clients; + while (c) { + Log(LOG_DEBUG, + " - %s, type=%d, host=%s, user=%s, conn=%d, start=%ld, flags=%s", + Client_ID(c), Client_Type(c), Client_Hostname(c), + Client_User(c), Client_Conn(c), Client_StartTime(c), + Client_Flags(c)); + c = (CLIENT *)c->next; + } +} /* Client_DumpClients */ + +#endif + + /* -eof- */ diff --git a/src/ngircd/client.h b/src/ngircd/client.h index 98a0d1a..42036c4 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -157,6 +157,12 @@ GLOBAL void Client_RegisterWhowas PARAMS(( CLIENT *Client )); GLOBAL const char *Client_TypeText PARAMS((CLIENT *Client)); +#ifdef DEBUG +GLOBAL void Client_DebugDump PARAMS((void)); #endif + +#endif + + /* -eof- */ diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index a70973e..5619a6c 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1524,6 +1524,29 @@ va_dcl } /* Config_Error */ +#ifdef DEBUG + +GLOBAL void +Conf_DebugDump(void) +{ + int i; + + Log(LOG_DEBUG, "Configured servers:"); + for (i = 0; i < MAX_SERVERS; i++) { + if (! Conf_Server[i].name[0]) + continue; + Log(LOG_DEBUG, + " - %s: %s:%d, last=%ld, group=%d, flags=%d, conn=%d", + Conf_Server[i].name, Conf_Server[i].host, + Conf_Server[i].port, Conf_Server[i].lasttry, + Conf_Server[i].group, Conf_Server[i].flags, + Conf_Server[i].conn_id); + } +} /* Conf_DebugDump */ + +#endif + + static void Init_Server_Struct( CONF_SERVER *Server ) { diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index e7b84d2..5cf5f6b 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -191,6 +191,10 @@ GLOBAL bool Conf_IsService PARAMS((int ConfServer, const char *Nick)); /* Password required by WEBIRC command */ GLOBAL char Conf_WebircPwd[CLIENT_PASS_LEN]; +#ifdef DEBUG +GLOBAL void Conf_DebugDump PARAMS((void)); +#endif + #endif diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 2fd60ef..d4d4d5f 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -69,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, @@ -723,4 +724,5 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) return false; } + /* -eof- */ diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c index 7d65510..688a8f0 100644 --- a/src/ngircd/sighandlers.c +++ b/src/ngircd/sighandlers.c @@ -36,6 +36,22 @@ static int signalpipe[2]; + +#ifdef DEBUG + +static void +Dump_State(void) +{ + Log(LOG_DEBUG, "--- Internal server state: ---"); + Log(LOG_DEBUG, "time()=%ld", time(NULL)); + Conf_DebugDump(); + Client_DebugDump(); + Log(LOG_DEBUG, "--- End of state dump ---"); +} /* Dump_State */ + +#endif + + static void Signal_Block(int sig) { #ifdef HAVE_SIGPROCMASK @@ -140,6 +156,30 @@ static void Signal_Handler(int Signal) while (waitpid( -1, NULL, WNOHANG) > 0) ; return; +#ifdef DEBUG + case SIGUSR1: + if (! NGIRCd_Debug) { + Log(LOG_INFO|LOG_snotice, + "Got SIGUSR1, debug mode activated."); +#ifdef SNIFFER + strcpy(NGIRCd_DebugLevel, "2"); + NGIRCd_Debug = true; + NGIRCd_Sniffer = true; +#else + strcpy(NGIRCd_DebugLevel, "1"); + NGIRCd_Debug = true; +#endif /* SNIFFER */ + } else { + Log(LOG_INFO|LOG_snotice, + "Got SIGUSR1, debug mode deactivated."); + strcpy(NGIRCd_DebugLevel, ""); + NGIRCd_Debug = false; +#ifdef SNIFFER + NGIRCd_Sniffer = false; +#endif /* SNIFFER */ + } + return; +#endif } /* @@ -169,6 +209,10 @@ static void Signal_Handler_BH(int Signal) NGIRCd_Rehash(); break; #ifdef DEBUG + case SIGUSR2: + if (NGIRCd_Debug) + Dump_State(); + break; default: Log(LOG_DEBUG, "Got signal %d! Ignored.", Signal); #endif

1 0

Florian Westphal : signalhandlers: add fallback to deprecated sysv API
by fw＠arthur.barton.de 13 Sep '10

13 Sep '10

Module: ngircd.git Branch: master Commit: 755f54b1501334d827b5c30c03b4551ebb5cbe0d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=755f54b1… Author: Florian Westphal <fw(a)strlen.de> Date: Sat Sep 11 11:33:27 2010 +0200 signalhandlers: add fallback to deprecated sysv API --- src/ngircd/sighandlers.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c index d03692a..7d65510 100644 --- a/src/ngircd/sighandlers.c +++ b/src/ngircd/sighandlers.c @@ -45,6 +45,8 @@ static void Signal_Block(int sig) sigaddset(&set, sig); sigprocmask(SIG_BLOCK, &set, NULL); +#else + sigblock(sig); #endif } @@ -58,6 +60,9 @@ static void Signal_Unblock(int sig) sigaddset(&set, sig); sigprocmask(SIG_UNBLOCK, &set, NULL); +#else + int old = sigblock(0) & ~sig; + sigsetmask(old); #endif }

1 0

Florian Westphal : remove NGIRCd_SignalRehash
by fw＠arthur.barton.de 13 Sep '10

13 Sep '10

Module: ngircd.git Branch: master Commit: ef3dbf96eb977c5296e092c6a48f8a3ca51598e2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ef3dbf96… Author: Florian Westphal <fw(a)strlen.de> Date: Sat Sep 11 00:27:21 2010 +0200 remove NGIRCd_SignalRehash now that the main signal handling is done from the dispatcher loop we can call NGIRCD_Rehash() directly. the /REHASH handler can queue the Rehash() function for execution by sending a SIGHUP. It will be run when we return back to the dispatch loop. --- src/ngircd/conn.c | 4 --- src/ngircd/irc-oper.c | 5 ++- src/ngircd/ngircd.c | 53 +--------------------------------------- src/ngircd/ngircd.h | 4 --- src/ngircd/sighandlers.c | 61 +++++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 62 insertions(+), 65 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 03e2905..e4851a9 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -710,10 +710,6 @@ Conn_Handler(void) Rendezvous_Handler(); #endif - /* Should the configuration be reloaded? */ - if (NGIRCd_SignalRehash) - NGIRCd_Rehash(); - /* Check configured servers and established links */ Check_Servers(); Check_Connections(); diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index a927b19..048c4f8 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -19,6 +19,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <signal.h> #include "ngircd.h" #include "conn-func.h" @@ -146,8 +147,8 @@ IRC_REHASH( CLIENT *Client, REQUEST *Req ) if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); Log( LOG_NOTICE|LOG_snotice, "Got REHASH command from \"%s\" ...", Client_Mask( Client )); - NGIRCd_SignalRehash = true; - + raise(SIGHUP); + return CONNECTED; } /* IRC_REHASH */ diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index de0b490..2fd60ef 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -93,7 +93,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; @@ -261,7 +261,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; @@ -431,56 +430,6 @@ Fill_Version( void ) /** - * 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 */ - - -/** * Display copyright and version information of ngIRCd on the console. */ static void diff --git a/src/ngircd/ngircd.h b/src/ngircd/ngircd.h index bd0aed0..bd699e5 100644 --- a/src/ngircd/ngircd.h +++ b/src/ngircd/ngircd.h @@ -41,7 +41,6 @@ GLOBAL bool NGIRCd_Passive; /* nicht zu anderen Servern connecten */ GLOBAL bool NGIRCd_SignalQuit; /* true: quit server*/ GLOBAL bool NGIRCd_SignalRestart; /* true: restart server */ -GLOBAL bool NGIRCd_SignalRehash; /* true: reload configuration */ GLOBAL char NGIRCd_DebugLevel[2]; /* Debug-Level fuer IRC_VERSION() */ @@ -50,9 +49,6 @@ GLOBAL char NGIRCd_ConfFile[FNAME_LEN]; /* Konfigurationsdatei */ GLOBAL char NGIRCd_ProtoID[COMMAND_LEN];/* Protokoll- und Server-Identifikation */ -GLOBAL void NGIRCd_Rehash PARAMS(( void )); - - #endif diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c index f3ce24f..d03692a 100644 --- a/src/ngircd/sighandlers.c +++ b/src/ngircd/sighandlers.c @@ -25,6 +25,10 @@ #include <sys/wait.h> #include "imp.h" +#include "conn.h" +#include "conf-ssl.h" +#include "channel.h" +#include "conf.h" #include "io.h" #include "log.h" #include "ngircd.h" @@ -57,6 +61,55 @@ static void Signal_Unblock(int sig) #endif } +/** + * Reload the server configuration file. + */ +static void +NGIRCd_Rehash( void ) +{ + char old_name[CLIENT_ID_LEN]; + unsigned old_nicklen; + + Log( LOG_NOTICE|LOG_snotice, "Re-reading configuration NOW!" ); + + /* 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 */ + + /** * Signal handler of ngIRCd. @@ -76,9 +129,7 @@ static void Signal_Handler(int Signal) NGIRCd_SignalQuit = true; return; case SIGHUP: - /* re-read configuration */ - NGIRCd_SignalRehash = true; - return; + break; case SIGCHLD: /* child-process exited, avoid zombies */ while (waitpid( -1, NULL, WNOHANG) > 0) @@ -108,6 +159,10 @@ static void Signal_Handler(int Signal) static void Signal_Handler_BH(int Signal) { switch (Signal) { + case SIGHUP: + /* re-read configuration */ + NGIRCd_Rehash(); + break; #ifdef DEBUG default: Log(LOG_DEBUG, "Got signal %d! Ignored.", Signal);

1 0

Florian Westphal : Add new 'delayed' signal handlers.
by fw＠arthur.barton.de 13 Sep '10

13 Sep '10

Module: ngircd.git Branch: master Commit: 1fe17e246cba4ee2f4349196c544296790ab5d55 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1fe17e24… Author: Florian Westphal <fw(a)strlen.de> Date: Sat Sep 11 00:19:01 2010 +0200 Add new 'delayed' signal handlers. Allows to defer/queue signal processing for execution on the next event dispatch call, i.e. we can perform any signal action in normal, non-signal context. Example uses: - Reload everything on HUP without writing a global "SIGHUP_received" variable - Dump status of internal Lists on SIGUSR1, etc. --- configure.in | 2 +- src/ngircd/Makefile.am | 2 +- src/ngircd/conn.c | 5 - src/ngircd/ngircd.c | 89 ++----------------- src/ngircd/ngircd.h | 2 + src/ngircd/parse.c | 4 +- src/ngircd/proc.c | 2 + src/ngircd/sighandlers.c | 220 ++++++++++++++++++++++++++++++++++++++++++++++ src/ngircd/sighandlers.h | 18 ++++ 9 files changed, 255 insertions(+), 89 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=1fe1…

1 0

Florian Westphal : io: add io_cloexec to set close-on-exec flag.
by fw＠arthur.barton.de 13 Sep '10

13 Sep '10

Module: ngircd.git Branch: master Commit: c135d0dded909e2e5780697c4066ad44a3f488c8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c135d0dd… Author: Florian Westphal <fw(a)strlen.de> Date: Fri Sep 10 23:41:29 2010 +0200 io: add io_cloexec to set close-on-exec flag. --- src/ngircd/io.c | 10 ++++++++++ src/ngircd/io.h | 3 +++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/ngircd/io.c b/src/ngircd/io.c index cb2b55a..6843899 100644 --- a/src/ngircd/io.c +++ b/src/ngircd/io.c @@ -785,6 +785,16 @@ io_setnonblock(int fd) return fcntl(fd, F_SETFL, flags) == 0; } +bool +io_setcloexec(int fd) +{ + int flags = fcntl(fd, F_GETFD); + if (flags == -1) + return false; + flags |= FD_CLOEXEC; + + return fcntl(fd, F_SETFD, flags) == 0; +} bool io_close(int fd) diff --git a/src/ngircd/io.h b/src/ngircd/io.h index a2285de..2f4c964 100644 --- a/src/ngircd/io.h +++ b/src/ngircd/io.h @@ -45,6 +45,9 @@ bool io_close PARAMS((int fd)); /* set O_NONBLOCK */ bool io_setnonblock PARAMS((int fd)); +/* set O_CLOEXEC */ +bool io_setcloexec PARAMS((int fd)); + /* watch fds for activity */ int io_dispatch PARAMS((struct timeval *tv));

1 0

Florian Westphal : ng_ipaddr.h: include assert.h
by fw＠arthur.barton.de 11 Sep '10

11 Sep '10

Module: ngircd.git Branch: master Commit: 1e281a8baa5dc0499ad8f0b75d5f366b498511f6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1e281a8b… Author: Florian Westphal <fw(a)strlen.de> Date: Sat Sep 11 00:25:23 2010 +0200 ng_ipaddr.h: include assert.h We use assert() in this header, so we should include assert.h. --- src/ipaddr/ng_ipaddr.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/ipaddr/ng_ipaddr.h b/src/ipaddr/ng_ipaddr.h index 32b1ec0..4582e2a 100644 --- a/src/ipaddr/ng_ipaddr.h +++ b/src/ipaddr/ng_ipaddr.h @@ -8,6 +8,7 @@ #define NG_IPADDR_HDR #include "portab.h" +#include <assert.h> #include <sys/socket.h> #include <netinet/in.h>

1 0