Author: Kev <klmitch@mit.edu>

Log message:

Inhibit JUPE/GLINE processing resynch sends during netburst

Status: Tested
Testing needed: QA

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

diff --git a/ChangeLog b/ChangeLog
index b19e336b8ab4a76e925fefbf85e94684d2685c19..7a8efe41ef068de94bf577429b463528365c38f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2000-06-02  Kevin L. Mitchell  <klmitch@mit.edu>
 
+       * ircd/m_gline.c (ms_gline): inhibit GLINE processing resends
+       during netburst
+
+       * ircd/m_jupe.c (ms_jupe): inhibit JUPE processing resends during
+       netburst
+
        * ircd/channel.c (joinbuf_join): really remove user from local
        channels
 
@@ -1159,7 +1165,7 @@
 #
 # ChangeLog for ircu2.10.11
 #
-# $Id: ChangeLog,v 1.139 2000-06-02 14:49:29 kev Exp $
+# $Id: ChangeLog,v 1.140 2000-06-02 22:57:33 kev Exp $
 #
 # Insert new changes at beginning of the change list.
 #

diff --git a/ircd/m_gline.c b/ircd/m_gline.c
index cc5915acc2fc0fdd2fe2c57c4f3ccd6577e47af1..4c1ebf6e97e976a9e18df8f4b43b5fe16f593da7 100644 (file)
--- a/ircd/m_gline.c
+++ b/ircd/m_gline.c
@@ -186,6 +186,8 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
        return gline_deactivate(cptr, sptr, agline, lastmod, flags);
     } else if (GlineLastMod(agline) == lastmod)
       return 0;
+    else if (IsBurstOrBurstAck(cptr)) /* it's in the burst, so don't resynch */
+      return 0;
     else
       return gline_resend(cptr, agline); /* other server desynched WRT gline */
   } else if (parc < 5)

diff --git a/ircd/m_jupe.c b/ircd/m_jupe.c
index 2541875370fa0ea12b92246980a5761cb8b515fa..46479523408e248d6c0a2afb9f512dda49dd6a22 100644 (file)
--- a/ircd/m_jupe.c
+++ b/ircd/m_jupe.c
@@ -167,6 +167,8 @@ int ms_jupe(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
        return jupe_deactivate(cptr, sptr, ajupe, lastmod, flags);
     } else if (JupeLastMod(ajupe) == lastmod) /* no changes */
       return 0;
+    else if (IsBurstOrBurstAck(cptr)) /* it's in the burst, so don't resynch */
+      return 0;
     else
       return jupe_resend(cptr, ajupe); /* other server desynched WRT jupes */
   }