- ngIRCd GIT Updates - lists.barton.de

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

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 : 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 : 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 : 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

Alexander Barton : Conn_SyncServerStruct(): test all connections; and work case insensitive
by alex＠arthur.barton.de 08 Sep '10

08 Sep '10

Module: ngircd.git Branch: master Commit: 6349ec8bb33d74aa73f0ffa17c29d54119ab9d77 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6349ec8b… Author: Alexander Barton <alex(a)barton.de> Date: Wed Sep 8 02:02:01 2010 +0200 Conn_SyncServerStruct(): test all connections; and work case insensitive Fix synchronization of established connections and configured server structures after a configuration update: - Not only test servers that already have a connection, but also check and update configured servers to which a new connection is beeing established (SERVER_WAIT state). - And do the server name comparision case-insensitive. --- src/ngircd/conn.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index a8e93a2..78a20b0 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1139,32 +1139,32 @@ Conn_CountAccepted(void) } /* Conn_CountAccepted */ +/** + * Synchronize established connections and configured server structures + * after a configuration update and store the correct connection IDs, if any. + */ GLOBAL void -Conn_SyncServerStruct( void ) +Conn_SyncServerStruct(void) { - /* Synchronize server structures (connection IDs): - * connections <-> configuration */ - CLIENT *client; CONN_ID i; int c; - for( i = 0; i < Pool_Size; i++ ) { - /* Established connection? */ - if (My_Connections[i].sock < 0) + for (i = 0; i < Pool_Size; i++) { + if (My_Connections[i].sock == NONE) continue; - /* Server connection? */ - client = Conn_GetClient( i ); - if(( ! client ) || ( Client_Type( client ) != CLIENT_SERVER )) continue; + /* Server link? */ + client = Conn_GetClient(i); + if (!client || Client_Type(client) != CLIENT_SERVER) + continue; - for( c = 0; c < MAX_SERVERS; c++ ) - { + for (c = 0; c < MAX_SERVERS; c++) { /* Configured server? */ - if( ! Conf_Server[c].host[0] ) continue; + if (!Conf_Server[c].host[0]) + continue; - /* Duplicate? */ - if( strcmp( Conf_Server[c].name, Client_ID( client )) == 0 ) + if (strcasecmp(Conf_Server[c].name, Client_ID(client)) == 0) Conf_Server[c].conn_id = i; } }

1 0

Alexander Barton : Check_Servers(): skip servers already beeing connected
by alex＠arthur.barton.de 08 Sep '10

08 Sep '10

Module: ngircd.git Branch: master Commit: 8d68fe3f867732cbec094cdf7240a46e631c2838 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8d68fe3f… Author: Alexander Barton <alex(a)barton.de> Date: Wed Sep 8 00:45:23 2010 +0200 Check_Servers(): skip servers already beeing connected Let CheckServers() not only skip servers that already have a connection, but also skip servers to which a new connection is already beeing established (SERVER_WAIT state). --- src/ngircd/conn.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index acd50bc..a8e93a2 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1758,8 +1758,8 @@ Check_Servers(void) /* Check all configured servers */ for (i = 0; i < MAX_SERVERS; i++) { - if (Conf_Server[i].conn_id > NONE) - continue; /* Already connected */ + if (Conf_Server[i].conn_id != NONE) + continue; /* Already establishing or connected */ if (!Conf_Server[i].host[0] || !Conf_Server[i].port > 0) continue; /* No host and/or port configured */ if (Conf_Server[i].flags & CONF_SFLAG_DISABLED)

1 0

Alexander Barton : Check_Servers(): Code cleanup
by alex＠arthur.barton.de 08 Sep '10

08 Sep '10

Module: ngircd.git Branch: master Commit: 4f6c19712eace7f981902ddc90d9b8393b676ae5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4f6c1971… Author: Alexander Barton <alex(a)barton.de> Date: Wed Sep 8 00:42:57 2010 +0200 Check_Servers(): Code cleanup --- src/ngircd/conn.c | 50 +++++++++++++++++++++++++++++--------------------- 1 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index d0548c9..acd50bc 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1686,11 +1686,14 @@ Handle_Buffer(CONN_ID Idx) } /* Handle_Buffer */ +/** + * Check whether established connections are still alive or not. + * If not, play PING-PONG first; and if that doesn't help either, + * disconnect the respective peer. + */ static void Check_Connections(void) { - /* check if connections are alive. if not, play PING-PONG first. - * if this doesn't help either, disconnect client. */ CLIENT *c; CONN_ID i; char msg[64]; @@ -1742,42 +1745,47 @@ Check_Connections(void) } /* Check_Connections */ +/** + * Check if further server links should be established. + */ static void -Check_Servers( void ) +Check_Servers(void) { - /* Check if we can establish further server links */ - int i, n; time_t time_now; + time_now = time(NULL); + /* Check all configured servers */ - for( i = 0; i < MAX_SERVERS; i++ ) { - /* Valid outgoing server which isn't already connected or disabled? */ - if(( ! Conf_Server[i].host[0] ) || ( ! Conf_Server[i].port > 0 ) || - ( Conf_Server[i].conn_id > NONE ) || ( Conf_Server[i].flags & CONF_SFLAG_DISABLED )) - continue; + for (i = 0; i < MAX_SERVERS; i++) { + if (Conf_Server[i].conn_id > NONE) + continue; /* Already connected */ + if (!Conf_Server[i].host[0] || !Conf_Server[i].port > 0) + continue; /* No host and/or port configured */ + if (Conf_Server[i].flags & CONF_SFLAG_DISABLED) + continue; /* Disabled configuration entry */ + if (Conf_Server[i].lasttry > (time_now - Conf_ConnectRetry)) + continue; /* We have to wait a little bit ... */ /* Is there already a connection in this group? */ - if( Conf_Server[i].group > NONE ) { + if (Conf_Server[i].group > NONE) { for (n = 0; n < MAX_SERVERS; n++) { - if (n == i) continue; + if (n == i) + continue; if ((Conf_Server[n].conn_id != NONE) && - (Conf_Server[n].group == Conf_Server[i].group)) - break; + (Conf_Server[n].group == Conf_Server[i].group)) + break; } - if (n < MAX_SERVERS) continue; + if (n < MAX_SERVERS) + continue; } - /* Check last connect attempt? */ - time_now = time(NULL); - if( Conf_Server[i].lasttry > (time_now - Conf_ConnectRetry)) - continue; - /* Okay, try to connect now */ Conf_Server[i].lasttry = time_now; Conf_Server[i].conn_id = SERVER_WAIT; assert(Proc_GetPipeFd(&Conf_Server[i].res_stat) < 0); - Resolve_Name(&Conf_Server[i].res_stat, Conf_Server[i].host, cb_Connect_to_Server); + Resolve_Name(&Conf_Server[i].res_stat, Conf_Server[i].host, + cb_Connect_to_Server); } } /* Check_Servers */

1 0