Author: Brian Cline <clineb@cs.winthrop.edu> By way of Ghostwolf <foxxe@wtfs.net>

Log message:
To avoid problems with infinite event loops, don't try connecting
to servers whose connect frequency is 0.

pullup from u2_10_11 branch

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@721 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index ce60e52a77c8bc24074cce39042075b27942fc71..7ce62ac9337c295f610ae40914727931f402cc3c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-09  Brian Cline  <clineb@cs.winthrop.edu>
+
+        * ircd/ircd.c (try_connections): To avoid problems with infinite event
+        loops, don't try connecting to servers whose connect frequency is 0.
+       
 2002-04-10  Alex Badea  <vampire@p16.pub.ro>
 
        * ircd/ircd_parser.y: fixed a "features" block parse bug

diff --git a/ircd/ircd.c b/ircd/ircd.c
index 74ee561ad3f3b698855adc12963b11d43e0692da..a76ec8d0a40c63fc2095f55431d919bb10f60f5a 100644 (file)
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -238,7 +238,7 @@ static void try_connections(struct Event* ev) {
   Debug((DEBUG_NOTICE, "Connection check at   : %s", myctime(CurrentTime)));
   for (aconf = GlobalConfList; aconf; aconf = aconf->next) {
     /* Also when already connecting! (update holdtimes) --SRB */
-    if (!(aconf->status & CONF_SERVER) || aconf->port == 0)
+    if (!(aconf->status & CONF_SERVER) || aconf->port == 0 || aconf->hold == 0)
       continue;
 
     /* Also skip juped servers */