Fix previous DNS fix; make BURST lines shorter again.

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

diff --git a/ChangeLog b/ChangeLog
index bfe8d2005c6afe7a52da87fd31703238f8dcaffe..0a609ff919b94c7ef6e21f46e827bd397f155401 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-22  Michael Poole <mdpoole@troilus.org>
+
+       * 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 <mdpoole@troilus.org>
        (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.

diff --git a/ircd/channel.c b/ircd/channel.c
index 0d39101b98ef2de10d7a2cd91e7cb746f74bb58f..3b9818be90bbc494bb35ca5c47b8eba7ce7747e9 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -939,7 +939,7 @@ void send_channel_modes(struct Client *cptr, struct Channel *chptr)
           * 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 @@ void send_channel_modes(struct Client *cptr, struct Channel *chptr)
            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

diff --git a/ircd/ircd_res.c b/ircd/ircd_res.c
index 8e9f33ca3b038942f3f83143cb4293927e45218b..e0a9d51514d730d03ee49c679af982cef1dbf339 100644 (file)
--- a/ircd/ircd_res.c
+++ b/ircd/ircd_res.c
@@ -278,10 +278,7 @@ check_resolver_timeout(time_t when)
 {
   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.