Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_12_branch
Commit time: 2006-01-03 01:26:00 UTC
Modified files:
Tag: u2_10_12_branch
ChangeLog include/ircd_features.h ircd/channel.c
ircd/ircd_features.c ircd/m_destruct.c
Log message:
Do not try to destroy a channel's nonexistent destruct event.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.710.2.55 ircu2.10/ChangeLog:1.710.2.56
--- ircu2.10/ChangeLog:1.710.2.55 Sat Dec 31 20:39:06 2005
+++ ircu2.10/ChangeLog Mon Jan 2 17:25:49 2006
@@ -1,3 +1,16 @@
+2006-01-02 Michael Poole <[EMAIL PROTECTED]>
+
+ * include/ircd_features.h (FEAT_ZANNELS): Remove.
+
+ * ircd/channel.c (sub1_from_channel): Remove reference to
+ FEAT_ZANNELS.
+
+ * ircd/ircd_features.c (FEAT_ZANNELS): Remove.
+
+ * ircd/m_destruct.c (ms_destruct): Do not try to remove a destruct
+ event for channels that do not have them (created by BURSTing a
+ zannel but not yet destroyed by EOB).
+
2005-12-31 Michael Poole <[EMAIL PROTECTED]>
* ircd/m_whowas.c (m_whowas): Mention that IP is untracked in WHOWAS.
Index: ircu2.10/include/ircd_features.h
diff -u ircu2.10/include/ircd_features.h:1.38.2.2
ircu2.10/include/ircd_features.h:1.38.2.3
--- ircu2.10/include/ircd_features.h:1.38.2.2 Thu Nov 17 18:27:49 2005
+++ ircu2.10/include/ircd_features.h Mon Jan 2 17:25:50 2006
@@ -20,7 +20,7 @@
*/
/** @file
* @brief Public interfaces and declarations for dealing with configurable
features.
- * @version $Id: ircd_features.h,v 1.38.2.2 2005/11/18 02:27:49 entrope Exp $
+ * @version $Id: ircd_features.h,v 1.38.2.3 2006/01/03 01:25:50 entrope Exp $
*/
struct Client;
@@ -56,7 +56,6 @@
FEAT_HIDDEN_IP,
FEAT_CONNEXIT_NOTICES,
FEAT_OPLEVELS,
- FEAT_ZANNELS,
FEAT_LOCAL_CHANNELS,
FEAT_TOPIC_BURST,
Index: ircu2.10/ircd/channel.c
diff -u ircu2.10/ircd/channel.c:1.155.2.9 ircu2.10/ircd/channel.c:1.155.2.10
--- ircu2.10/ircd/channel.c:1.155.2.9 Thu Nov 17 18:27:49 2005
+++ ircu2.10/ircd/channel.c Mon Jan 2 17:25:50 2006
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Channel management and maintenance
- * @version $Id: channel.c,v 1.155.2.9 2005/11/18 02:27:49 entrope Exp $
+ * @version $Id: channel.c,v 1.155.2.10 2006/01/03 01:25:50 entrope Exp $
*/
#include "config.h"
@@ -287,22 +287,13 @@
free_ban(link);
}
chptr->banlist = NULL;
-
-#if 1 /* Temporary code */
- /* Immediately destruct empty -A channels if ZANNELS is FALSE.
- When OPLEVELS is true, ZANNELS should be TRUE too. Test for
- that error. This is done to avoid the DESTRUCT message to
- occur, which is necessary on a network with mixed versions
- of 2.10.12.x, with x < 04 *and* 2.10.11 servers. Because
- servers prior to 2.10.12.04 can cause a BURST message outside
- the normal net.burst as a result of a DESTRUCT message, and
- 2.10.11 SQUIT servers when they do that. */
- if (!(feature_bool(FEAT_ZANNELS) || feature_bool(FEAT_OPLEVELS)))
+
+ /* Immediately destruct empty -A channels if not using apass. */
+ if (!feature_bool(FEAT_OPLEVELS))
{
destruct_channel(chptr);
return 0;
}
-#endif
}
if (TStime() - chptr->creationtime < 172800) /* Channel younger than 48
hours? */
schedule_destruct_event_1m(chptr); /* Get rid of it in
approximately 4-5 minutes */
Index: ircu2.10/ircd/ircd_features.c
diff -u ircu2.10/ircd/ircd_features.c:1.50.2.2
ircu2.10/ircd/ircd_features.c:1.50.2.3
--- ircu2.10/ircd/ircd_features.c:1.50.2.2 Thu Nov 17 18:27:49 2005
+++ ircu2.10/ircd/ircd_features.c Mon Jan 2 17:25:50 2006
@@ -18,7 +18,7 @@
*/
/** @file
* @brief Implementation of configurable feature support.
- * @version $Id: ircd_features.c,v 1.50.2.2 2005/11/18 02:27:49 entrope Exp $
+ * @version $Id: ircd_features.c,v 1.50.2.3 2006/01/03 01:25:50 entrope Exp $
*/
#include "config.h"
@@ -309,7 +309,6 @@
F_S(HIDDEN_IP, 0, "127.0.0.1", 0),
F_B(CONNEXIT_NOTICES, 0, 0, 0),
F_B(OPLEVELS, 0, 1, 0),
- F_B(ZANNELS, 0, 1, 0),
F_B(LOCAL_CHANNELS, 0, 1, 0),
F_B(TOPIC_BURST, 0, 0, 0),
Index: ircu2.10/ircd/m_destruct.c
diff -u ircu2.10/ircd/m_destruct.c:1.9.2.2 ircu2.10/ircd/m_destruct.c:1.9.2.3
--- ircu2.10/ircd/m_destruct.c:1.9.2.2 Wed Nov 16 18:23:27 2005
+++ ircu2.10/ircd/m_destruct.c Mon Jan 2 17:25:50 2006
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: m_destruct.c,v 1.9.2.2 2005/11/17 02:23:27 entrope Exp $
+ * $Id: m_destruct.c,v 1.9.2.3 2006/01/03 01:25:50 entrope Exp $
*/
#include "config.h"
@@ -190,7 +190,8 @@
sendcmdto_serv_butone(&me, CMD_DESTRUCT, 0, "%s %Tu", parv[1], chanTS);
/* Remove the empty channel. */
- remove_destruct_event(chptr);
+ if (chptr->destruct_event)
+ remove_destruct_event(chptr);
destruct_channel(chptr);
return 0;
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
