Author: Isomer <perry@coders.net>

[ircu2.10.12-pk.git] / ircd / m_endburst.c

diff --git a/ircd/m_endburst.c b/ircd/m_endburst.c
index 605a45c3baddfdaf4d8c2e14859eabd6bad16ca5..c987428cbbfac02b77b7379d3c55ceb2e64f3bba 100644 (file)
--- a/ircd/m_endburst.c
+++ b/ircd/m_endburst.c
@@ -87,6 +87,7 @@
  */
 #include "handlers.h"
 #endif /* 0 */
+#include "channel.h"
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
@@ -107,22 +108,41 @@
  * This the last message in a net.burst.
  * It clears a flag for the server sending the burst.
  *
+ * As of 10.11, to fix a bug in the way BURST is processed, it also
+ * makes sure empty channels are deleted
+ *
  * parv[0] - sender prefix
  */
 int ms_end_of_burst(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 {
+  struct Channel *chan, *next_chan;
+
   assert(0 != cptr);
   assert(0 != sptr);
-  if (!IsServer(sptr))
-    return 0;
 
-  sendto_opmask_butone(0, SNO_NETWORK, "Completed net.burst from %C.", sptr);
+  sendto_opmask_butone(0, SNO_NETWORK, "Completed net.burst from %C.", 
+       sptr);
   sendcmdto_serv_butone(sptr, CMD_END_OF_BURST, cptr, "");
   ClearBurst(sptr);
   SetBurstAck(sptr);
   if (MyConnect(sptr))
     sendcmdto_one(&me, CMD_END_OF_BURST_ACK, sptr, "");
 
+  /* Count through channels... */
+  for (chan = GlobalChannelList; chan; chan = next_chan) {
+    next_chan = chan->next;
+
+    if (!chan->members) { /* empty channel */
+      if (!(chan->mode.mode & MODE_BURSTADDED))
+       sendto_opmask_butone(0, SNO_OLDSNO, "Empty channel %H not added by "
+                            "BURST!", chan);
+
+      sub1_from_channel(chan); /* ok, nuke channel now */
+    }
+
+    chan->mode.mode &= ~MODE_BURSTADDED;
+  }
+
   return 0;
 }