Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-03-23 03:16:48 UTC
Modified files:
ChangeLog ircd/channel.c ircd/ircd_res.c
Log message:
Fix previous DNS fix; make BURST lines shorter again.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.574 ircu2.10/ChangeLog:1.575
--- ircu2.10/ChangeLog:1.574 Tue Mar 22 16:33:28 2005
+++ ircu2.10/ChangeLog Tue Mar 22 19:16:36 2005
@@ -1,4 +1,9 @@
2005-03-22 Michael Poole <[EMAIL PROTECTED]>
+
+ * ircd/channel.c (send_channel_modes): Fix test for when to send
+ membership mode suffix, to avoid sending it more than once.
+
+2005-03-22 Michael Poole <[EMAIL PROTECTED]>
(Many thanks to nex and Reed for helping hunt this down and
doing the testing of various patches.)
@@ -7,6 +12,8 @@
* ircd/ircd_res.c (check_resolver_timeout): Simplify the test for
whether to use timer_chg() or timer_add().
+ On second thought, use timer_add() unconditionally; the server
+ connection loop does.
(timeout_resolver): Do not try to re-schedule the DNS timeout
unless it is the expiration event.
(do_query_number): Properly initialize request->state.
Index: ircu2.10/ircd/channel.c
diff -u ircu2.10/ircd/channel.c:1.122 ircu2.10/ircd/channel.c:1.123
--- ircu2.10/ircd/channel.c:1.122 Sun Mar 20 08:06:17 2005
+++ ircu2.10/ircd/channel.c Tue Mar 22 19:16:37 2005
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Channel management and maintenance
- * @version $Id: channel.c,v 1.122 2005/03/20 16:06:17 entrope Exp $
+ * @version $Id: channel.c,v 1.123 2005/03/23 03:16:37 entrope Exp $
*/
#include "config.h"
@@ -939,7 +939,7 @@
* Do we have a nick with a new mode ?
* Or are we starting a new BURST line?
*/
- if (new_mode || !feat_oplevels)
+ if (new_mode)
{
/*
* This means we are at the _first_ member that has only
@@ -967,7 +967,7 @@
msgq_append(&me, mb, tbuf);
new_mode = 0;
}
- else if (flag_cnt > 1 && last_oplevel != member->oplevel)
+ else if (feat_oplevels && flag_cnt > 1 && last_oplevel !=
member->oplevel)
{
/*
* This can't be the first member of a (continued) BURST
Index: ircu2.10/ircd/ircd_res.c
diff -u ircu2.10/ircd/ircd_res.c:1.18 ircu2.10/ircd/ircd_res.c:1.19
--- ircu2.10/ircd/ircd_res.c:1.18 Tue Mar 22 16:30:56 2005
+++ ircu2.10/ircd/ircd_res.c Tue Mar 22 19:16:38 2005
@@ -18,7 +18,7 @@
*/
/** @file
* @brief IRC resolver functions.
- * @version $Id: ircd_res.c,v 1.18 2005/03/23 00:30:56 entrope Exp $
+ * @version $Id: ircd_res.c,v 1.19 2005/03/23 03:16:38 entrope Exp $
*/
#include "client.h"
@@ -278,10 +278,7 @@
{
if (when > CurrentTime + AR_TTL)
when = CurrentTime + AR_TTL;
- if (t_onqueue(&res_timeout))
- timer_chg(&res_timeout, TT_ABSOLUTE, when);
- else
- timer_add(&res_timeout, timeout_resolver, NULL, TT_ABSOLUTE, when);
+ timer_add(&res_timeout, timeout_resolver, NULL, TT_ABSOLUTE, when);
}
/** Drop pending DNS lookups which have timed out.
----------------------- End of diff -----------------------
