Committer : decampos
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-09-12 22:52:11 UTC
Modified files:
ChangeLog ircd/ircd.c
Log message:
Author: Alex Badea <[EMAIL PROTECTED]>
Log message:
Fixed autoreconnect not working with certain combinations of
FEAT_CONNECTFREQUENCY and Class connectfreq. This may require
further testing.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.695 ircu2.10/ChangeLog:1.696
--- ircu2.10/ChangeLog:1.695 Mon Sep 12 14:22:44 2005
+++ ircu2.10/ChangeLog Mon Sep 12 15:52:01 2005
@@ -1,5 +1,10 @@
2005-09-13 Alex Badea <[EMAIL PROTECTED]>
+ * ircd/ircd.c (try_connections): modify autoreconnect logic to
+ allow FEAT_CONNECTFREQUENCY to be smaller than Class connectfreq
+
+2005-09-13 Alex Badea <[EMAIL PROTECTED]>
+
* ircd/s_conf.c (close_mappings): NULL out GlobalServiceMapList,
otherwise the linked list has an invalid ending sentinel on rehash
Index: ircu2.10/ircd/ircd.c
diff -u ircu2.10/ircd/ircd.c:1.90 ircu2.10/ircd/ircd.c:1.91
--- ircu2.10/ircd/ircd.c:1.90 Wed Aug 24 18:39:15 2005
+++ ircu2.10/ircd/ircd.c Mon Sep 12 15:52:01 2005
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Entry point and other initialization functions for the daemon.
- * @version $Id: ircd.c,v 1.90 2005/08/25 01:39:15 entrope Exp $
+ * @version $Id: ircd.c,v 1.91 2005/09/12 22:52:01 decampos Exp $
*/
#include "config.h"
@@ -269,14 +269,14 @@
|| ((ajupe = jupe_find(aconf->name)) && JupeIsActive(ajupe)))
continue;
+ /* Do we need to postpone this connection further? */
+ hold = aconf->hold > CurrentTime;
+
/* Update next possible connection check time. */
- if (next > aconf->hold || next == 0)
+ if (hold && (next > aconf->hold || next == 0))
next = aconf->hold;
- /* Update the next time we can consider this entry. */
cltmp = aconf->conn_class;
- hold = aconf->hold > CurrentTime; /* before we update aconf->hold */
- aconf->hold = ConFreq(cltmp) ? CurrentTime + ConFreq(cltmp) : 0;
/* Do not try to connect if its use is still on hold until future,
* too many links in its connection class, it is already linked,
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
