Author: Ghostwolf <foxxe@wtfs.net>

Log message:
Last update broke autoconnects. Fixed it another way.

pull-up from u2_10_11 branch

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

diff --git a/ChangeLog b/ChangeLog
index 7ce62ac9337c295f610ae40914727931f402cc3c..2a9dda7c9e748644f66d6274a2c0e526dc42718a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-10 Joseph Bongaarts <foxxe@wtfs.net>
+
+       * ircd/ircd.c: The last fix broke autoconnects completely.
+       Fixed it another way.
+       
 2002-04-09  Brian Cline  <clineb@cs.winthrop.edu>
 
         * ircd/ircd.c (try_connections): To avoid problems with infinite event

diff --git a/ircd/ircd.c b/ircd/ircd.c
index a76ec8d0a40c63fc2095f55431d919bb10f60f5a..e05d426d9adeaa75c2527c3b95a831c3213df27b 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 || aconf->hold == 0)
+    if (!(aconf->status & CONF_SERVER) || aconf->port == 0)
       continue;
 
     /* Also skip juped servers */
@@ -257,7 +257,10 @@ static void try_connections(struct Event* ev) {
 
     cltmp = aconf->conn_class;
     confrq = get_con_freq(cltmp);
-    aconf->hold = CurrentTime + confrq;
+    if(confrq == 0)
+      aconf->hold = next = 0;
+    else
+      aconf->hold = CurrentTime + confrq;
 
     /* Found a CONNECT config with port specified, scan clients and see if
      * this server is already connected?