ngIRCd GIT Updates

ngircd-commits@lists.barton.de

2442 Diskussionen

Florian Westphal : Fix signalpipe file descriptor leak on RESTART
by fw＠arthur.barton.de 14 Sep '10

14 Sep '10

Module: ngircd.git Branch: master Commit: 3beb2880396722f79becaf3da9c6b034fb57e1c3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3beb2880… Author: Florian Westphal <fw(a)strlen.de> Date: Tue Sep 14 23:36:33 2010 +0200 Fix signalpipe file descriptor leak on RESTART Signals_Init() must only be called once. This does not affect any ngircd release version. --- src/ngircd/ngircd.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index d4d4d5f..0d0a757 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -255,7 +255,17 @@ main( int argc, const char *argv[] ) Show_Version( ); puts( "" ); exit( Conf_Test( )); } - + + if (!io_library_init(CONNECTION_POOL)) { + Log(LOG_ALERT, "Fatal: Cannot initialize IO routines: %s", strerror(errno)); + exit(1); + } + + if (!Signals_Init()) { + Log(LOG_ALERT, "Fatal: Could not set up signal handlers: %s", strerror(errno)); + exit(1); + } + while( ! NGIRCd_SignalQuit ) { /* Initialize global variables */ @@ -290,15 +300,6 @@ main( int argc, const char *argv[] ) * 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); - } - - if (!Signals_Init()) { - Log(LOG_ALERT, "Fatal: Could not set up signal handlers: %s", strerror(errno)); - exit(1); - } /* * create protocol and server identification.

1 0

Alexander Barton : sighandlers.{c|h}: Code cleanup
by alex＠arthur.barton.de 14 Sep '10

14 Sep '10

Module: ngircd.git Branch: master Commit: b3cfbc3d28de9098be7cffc22ea9c5b98c36443f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b3cfbc3d… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 14 00:30:45 2010 +0200 sighandlers.{c|h}: Code cleanup - declare signals_catch[] array not between the function implementations. - rename now local function NGIRCd_Rehash() to Rehash(). - remove empty and therefore not used "catch SIGHUP; break;". --- src/ngircd/sighandlers.c | 15 ++++++++------- src/ngircd/sighandlers.h | 2 ++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c index d472b7f..aaff1ea 100644 --- a/src/ngircd/sighandlers.c +++ b/src/ngircd/sighandlers.c @@ -36,6 +36,10 @@ static int signalpipe[2]; +static const int signals_catch[] = { + SIGINT, SIGQUIT, SIGTERM, SIGHUP, SIGCHLD, SIGUSR1, SIGUSR2 +}; + #ifdef DEBUG @@ -86,11 +90,12 @@ Signal_Unblock(int sig) #endif } + /** * Reload the server configuration file. */ static void -NGIRCd_Rehash( void ) +Rehash(void) { char old_name[CLIENT_ID_LEN]; unsigned old_nicklen; @@ -132,8 +137,7 @@ NGIRCd_Rehash( void ) Conn_SyncServerStruct( ); Log( LOG_NOTICE|LOG_snotice, "Re-reading of configuration done." ); -} /* NGIRCd_Rehash */ - +} /* Rehash */ /** @@ -154,8 +158,6 @@ Signal_Handler(int Signal) /* shut down sever */ NGIRCd_SignalQuit = true; return; - case SIGHUP: - break; case SIGCHLD: /* child-process exited, avoid zombies */ while (waitpid( -1, NULL, WNOHANG) > 0) @@ -212,7 +214,7 @@ Signal_Handler_BH(int Signal) switch (Signal) { case SIGHUP: /* re-read configuration */ - NGIRCd_Rehash(); + Rehash(); break; #ifdef DEBUG case SIGUSR2: @@ -252,7 +254,6 @@ Signal_Callback(int fd, short UNUSED what) } -static const int signals_catch[] = { SIGINT, SIGQUIT, SIGTERM, SIGHUP, SIGCHLD, SIGUSR1, SIGUSR2 }; /** * Initialize the signal handlers, catch * those signals we are interested in and sets SIGPIPE to be ignored. diff --git a/src/ngircd/sighandlers.h b/src/ngircd/sighandlers.h index 1c0edbb..98f91e8 100644 --- a/src/ngircd/sighandlers.h +++ b/src/ngircd/sighandlers.h @@ -1,4 +1,6 @@ /* + * ngIRCd -- The Next Generation IRC Daemon + * * 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 * the Free Software Foundation; either version 2 of the License, or

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

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 : 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 : 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 : 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 : Updated ChangeLog to include signal handler changes
by alex＠arthur.barton.de 14 Sep '10

14 Sep '10

Module: ngircd.git Branch: master Commit: 212311efc5ab9a0196d163e40f01d56cf1a6d237 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=212311ef… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 14 00:18:20 2010 +0200 Updated ChangeLog to include signal handler changes --- ChangeLog | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73c98d9..73c8473 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,10 @@ ngIRCd Release 17 - 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. + - Signal handler: added new 'delayed' signal handlers, including fallback + to deprecated sysv API. And removed global NGIRCd_SignalRehash variable. + - IO: add io_cloexec() to set close-on-exec flag. + - ng_ipaddr.h: include required assert.h header. - 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

1 0

Alexander Barton : Make sighandlers.{c|h} compatible with ansi2knr
by alex＠arthur.barton.de 14 Sep '10

14 Sep '10

Module: ngircd.git Branch: master Commit: 74578890b71dc16aadaf299af875b45fc7fbe081 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=74578890… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 14 00:29:34 2010 +0200 Make sighandlers.{c|h} compatible with ansi2knr --- src/ngircd/sighandlers.c | 27 +++++++++++++++++---------- src/ngircd/sighandlers.h | 5 ++--- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c index 57bf80f..d472b7f 100644 --- a/src/ngircd/sighandlers.c +++ b/src/ngircd/sighandlers.c @@ -54,7 +54,8 @@ Dump_State(void) #endif -static void Signal_Block(int sig) +static void +Signal_Block(int sig) { #ifdef HAVE_SIGPROCMASK sigset_t set; @@ -69,7 +70,8 @@ static void Signal_Block(int sig) } -static void Signal_Unblock(int sig) +static void +Signal_Unblock(int sig) { #ifdef HAVE_SIGPROCMASK sigset_t set; @@ -142,7 +144,8 @@ NGIRCd_Rehash( void ) * It blocks the signal and queues it for later execution by Signal_Handler_BH. * @param Signal Number of the signal to handle. */ -static void Signal_Handler(int Signal) +static void +Signal_Handler(int Signal) { switch (Signal) { case SIGTERM: @@ -203,7 +206,8 @@ static void Signal_Handler(int Signal) * thus its not necessary to only use functions that are signal safe. * @param Signal Number of the signal that was queued. */ -static void Signal_Handler_BH(int Signal) +static void +Signal_Handler_BH(int Signal) { switch (Signal) { case SIGHUP: @@ -222,7 +226,9 @@ static void Signal_Handler_BH(int Signal) Signal_Unblock(Signal); } -static void Sig_callback(int fd, short UNUSED what) + +static void +Signal_Callback(int fd, short UNUSED what) { int sig, ret; (void) what; @@ -252,7 +258,8 @@ static const int signals_catch[] = { SIGINT, SIGQUIT, SIGTERM, SIGHUP, SIGCHLD, * those signals we are interested in and sets SIGPIPE to be ignored. * @return true if initialization was sucessful. */ -bool Signals_Init(void) +bool +Signals_Init(void) { size_t i; #ifdef HAVE_SIGACTION @@ -290,9 +297,8 @@ bool Signals_Init(void) signal(SIGPIPE, SIG_IGN); #endif - return io_event_create(signalpipe[0], IO_WANTREAD, - Sig_callback); -} /* Initialize_Signal_Handler */ + return io_event_create(signalpipe[0], IO_WANTREAD, Signal_Callback); +} /* Signals_Init */ /** @@ -302,7 +308,8 @@ bool Signals_Init(void) * child prodcess, especially when we are about to call * 3rd party code (e.g. PAM). */ -void Signals_Exit(void) +void +Signals_Exit(void) { size_t i; #ifdef HAVE_SIGACTION diff --git a/src/ngircd/sighandlers.h b/src/ngircd/sighandlers.h index 5df8f22..1c0edbb 100644 --- a/src/ngircd/sighandlers.h +++ b/src/ngircd/sighandlers.h @@ -11,8 +11,7 @@ #include "portab.h" -bool Signals_Init(void); -void Signals_Exit(void); - +bool Signals_Init PARAMS((void)); +void Signals_Exit PARAMS((void)); #endif

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

Springe zur Seite:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates