[IRC-Dev CVS] [CVS] Module ircd-ircdev: Change committed
Brought to you by:
zolty
Menu
▾
▴
[IRC-Dev CVS] [CVS] Module ircd-ircdev: Change committed
|
From: Toni G. <zo...@us...> - 2008-01-19 19:26:18
|
Committer : zolty
CVSROOT : /cvsroot/irc-dev
Module : ircd-ircdev
Commit time: 2008-01-19 19:26:17 UTC
Modified files:
ChangeLog ChangeLog.es config.h.in include/channel.h
include/ircd_features.h include/patchlevel.h ircd/channel.c
ircd/ircd_features.c ircd/m_clearmode.c ircd/m_mode.c
ircd/m_opmode.c ircd/m_wallusers.c ircd/m_wallvoices.c
Log message:
Author: zoltan <zo...@ir...>
Log message:
2008-01-19 Toni Garc�a <zo...@ir...> 1.0.beta12
* Transicion con IRC-Hispano
* Soporte de XMODE JCEA
---------------------- diff included ----------------------
Index: ircd-ircdev/ChangeLog
diff -u ircd-ircdev/ChangeLog:1.60 ircd-ircdev/ChangeLog:1.61
--- ircd-ircdev/ChangeLog:1.60 Sun Jan 6 16:14:01 2008
+++ ircd-ircdev/ChangeLog Sat Jan 19 11:25:55 2008
@@ -1,10 +1,14 @@
#
# ChangeLog for ircd-ircdev
#
-# $Id: ChangeLog,v 1.60 2008/01/07 00:14:01 zolty Exp $
+# $Id: ChangeLog,v 1.61 2008/01/19 19:25:55 zolty Exp $
#
# Insert new changes at beginning of the change list.
#
+2008-01-19 Toni Garc�a <zo...@ir...> 1.0.beta12
+ * IRC-Hispano Transition
+ * JCEA XMODE Support
+
2008-01-07 Toni Garcïa <zo...@ir...> 1.0.beta11
* Channel mode +C
* Channel mode +c
Index: ircd-ircdev/ChangeLog.es
diff -u ircd-ircdev/ChangeLog.es:1.60 ircd-ircdev/ChangeLog.es:1.61
--- ircd-ircdev/ChangeLog.es:1.60 Sun Jan 6 16:14:02 2008
+++ ircd-ircdev/ChangeLog.es Sat Jan 19 11:25:56 2008
@@ -1,10 +1,14 @@
#
# Log de Cambios para ircd-ircdev
#
-# $Id: ChangeLog.es,v 1.60 2008/01/07 00:14:02 zolty Exp $
+# $Id: ChangeLog.es,v 1.61 2008/01/19 19:25:56 zolty Exp $
#
# Insertar los nuevos cambios al principio de esta lista de cambios.
#
+2008-01-19 Toni Garc�a <zo...@ir...> 1.0.beta12
+ * Transicion con IRC-Hispano
+ * Soporte de XMODE JCEA
+
2008-01-07 Toni Garc�a <zo...@ir...> 1.0.beta11
* Modo de canal +C
* Modo de canal +c
Index: ircd-ircdev/config.h.in
diff -u ircd-ircdev/config.h.in:1.15 ircd-ircdev/config.h.in:1.16
--- ircd-ircdev/config.h.in:1.15 Tue Dec 11 15:38:21 2007
+++ ircd-ircdev/config.h.in Sat Jan 19 11:25:56 2008
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: config.h.in,v 1.15 2007/12/11 23:38:21 zolty Exp $
+ * $Id: config.h.in,v 1.16 2008/01/19 19:25:56 zolty Exp $
*
*/
#ifndef INCLUDED_config_h
Index: ircd-ircdev/include/channel.h
diff -u ircd-ircdev/include/channel.h:1.20 ircd-ircdev/include/channel.h:1.21
--- ircd-ircdev/include/channel.h:1.20 Sun Jan 6 16:14:02 2008
+++ ircd-ircdev/include/channel.h Sat Jan 19 11:25:57 2008
@@ -22,7 +22,7 @@
*/
/** @file
* @brief Channel management and maintenance.
- * @version $Id: channel.h,v 1.20 2008/01/07 00:14:02 zolty Exp $
+ * @version $Id: channel.h,v 1.21 2008/01/19 19:25:57 zolty Exp $
*/
#ifndef INCLUDED_channel_h
#define INCLUDED_channel_h
@@ -400,6 +400,9 @@
#if defined(DDB)
#define MODEBUF_DEST_BOTMODE 0x20000 /**< Mode send by Bot */
#endif
+#if 1 /* TRANSICION IRC-HISPANO */
+#define MODEBUF_DEST_XMODE_JCEA 0x40000
+#endif
#define MB_TYPE(mb, i) ((mb)->mb_modeargs[(i)].mbm_type)
#define MB_UINT(mb, i) ((mb)->mb_modeargs[(i)].mbm_arg.mbma_uint)
Index: ircd-ircdev/include/ircd_features.h
diff -u ircd-ircdev/include/ircd_features.h:1.22 ircd-ircdev/include/ircd_features.h:1.23
--- ircd-ircdev/include/ircd_features.h:1.22 Tue Dec 11 15:38:23 2007
+++ ircd-ircdev/include/ircd_features.h Sat Jan 19 11:25:57 2008
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Public interfaces and declarations for dealing with configurable features.
- * @version $Id: ircd_features.h,v 1.22 2007/12/11 23:38:23 zolty Exp $
+ * @version $Id: ircd_features.h,v 1.23 2008/01/19 19:25:57 zolty Exp $
*/
#ifndef INCLUDED_features_h
#define INCLUDED_features_h
@@ -203,6 +203,9 @@
FEAT_SPAM_JOINED_TIME,
FEAT_SPAM_FJP_COUNT,
+#if 1 /* TRANSICION IRC-HISPANO */
+ FEAT_TRANSICION_HISPANO,
+#endif
FEAT_LAST_F
};
Index: ircd-ircdev/include/patchlevel.h
diff -u ircd-ircdev/include/patchlevel.h:1.59 ircd-ircdev/include/patchlevel.h:1.60
--- ircd-ircdev/include/patchlevel.h:1.59 Sun Jan 6 16:14:05 2008
+++ ircd-ircdev/include/patchlevel.h Sat Jan 19 11:25:58 2008
@@ -17,10 +17,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: patchlevel.h,v 1.59 2008/01/07 00:14:05 zolty Exp $
+ * $Id: patchlevel.h,v 1.60 2008/01/19 19:25:58 zolty Exp $
*
*/
-#define PATCHLEVEL "11"
+#define PATCHLEVEL "12"
#define RELEASE "1.0.beta"
Index: ircd-ircdev/ircd/channel.c
diff -u ircd-ircdev/ircd/channel.c:1.36 ircd-ircdev/ircd/channel.c:1.37
--- ircd-ircdev/ircd/channel.c:1.36 Sat Jan 19 05:28:51 2008
+++ ircd-ircdev/ircd/channel.c Sat Jan 19 11:25:58 2008
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Channel management and maintanance
- * @version $Id: channel.c,v 1.36 2008/01/19 13:28:51 zolty Exp $
+ * @version $Id: channel.c,v 1.37 2008/01/19 19:25:58 zolty Exp $
*/
#include "config.h"
@@ -2001,6 +2001,16 @@
addbuf_i || addbuf_local_i ? "+" : "",
addbuf, addbuf_local,
remstr, addstr);
+#if 1 /* TRANSICION IRC-HISPANO */
+ else if (mbuf->mb_dest & MODEBUF_DEST_XMODE_JCEA)
+ sendcmdto_channel(app_source, CMD_MODE, mbuf->mb_channel, NULL, SKIP_SERVERS,
+ "%H x%s%s%s%s%s%s%s%s", mbuf->mb_channel,
+ rembuf_i || rembuf_local_i ? "-" : "",
+ rembuf, rembuf_local,
+ addbuf_i || addbuf_local_i ? "+" : "",
+ addbuf, addbuf_local,
+ remstr, addstr);
+#endif
else
#endif /* defined(DDB) */
sendcmdto_channel(app_source, CMD_MODE, mbuf->mb_channel, NULL, SKIP_SERVERS,
@@ -2110,6 +2120,14 @@
addbuf, remstr, addstr,
mbuf->mb_channel->creationtime);
#endif /* defined(DDB) */
+#if 1 /* TRANSICION IRC-HISPANO */
+ } else if (mbuf->mb_dest & MODEBUF_DEST_XMODE_JCEA) {
+ sendcmdto_serv(mbuf->mb_source, CMD_MODE, mbuf->mb_connect,
+ "%H x%s%s%s%s%s%s %Tu", mbuf->mb_channel,
+ rembuf_i ? "-" : "", rembuf, addbuf_i ? "+" : "",
+ addbuf, remstr, addstr,
+ mbuf->mb_channel->creationtime);
+#endif
} else {
/*
* We're propagating a normal (or HACK3 or HACK4) MODE command
Index: ircd-ircdev/ircd/ircd_features.c
diff -u ircd-ircdev/ircd/ircd_features.c:1.24 ircd-ircdev/ircd/ircd_features.c:1.25
--- ircd-ircdev/ircd/ircd_features.c:1.24 Sat Jan 19 05:28:51 2008
+++ ircd-ircdev/ircd/ircd_features.c Sat Jan 19 11:25:59 2008
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Implementation of configurable feature support.
- * @version $Id: ircd_features.c,v 1.24 2008/01/19 13:28:51 zolty Exp $
+ * @version $Id: ircd_features.c,v 1.25 2008/01/19 19:25:59 zolty Exp $
*/
#include "config.h"
@@ -532,6 +532,10 @@
F_I(SPAM_JOINED_TIME, 0, 60, 0),
F_I(SPAM_FJP_COUNT, 0, 5, 0),
+#if 1 /* TRANSICION IRC-HISPANO */
+ F_B(TRANSICION_HISPANO, 0, 1, 0),
+#endif
+
#undef F_S
#undef F_B
#undef F_I
Index: ircd-ircdev/ircd/m_clearmode.c
diff -u ircd-ircdev/ircd/m_clearmode.c:1.15 ircd-ircdev/ircd/m_clearmode.c:1.16
--- ircd-ircdev/ircd/m_clearmode.c:1.15 Sun Jan 6 16:14:06 2008
+++ ircd-ircdev/ircd/m_clearmode.c Sat Jan 19 11:26:03 2008
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Handlers for CLEARMODE command.
- * @version $Id: m_clearmode.c,v 1.15 2008/01/07 00:14:06 zolty Exp $
+ * @version $Id: m_clearmode.c,v 1.16 2008/01/19 19:26:03 zolty Exp $
*/
#include "config.h"
@@ -250,6 +250,14 @@
const char *chname, *qreason;
int force = 0;
+#if 1 /* TRANSICION IRC-HISPANO */
+ if (feature_bool(FEAT_TRANSICION_HISPANO))
+ {
+ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :Durante la transicion al nuevo ircd, el comando CLEARMODE esta deshabilitado", sptr);
+ return 0;
+ }
+#endif
+
if (!feature_bool(FEAT_CONFIG_OPERCMDS))
return send_reply(sptr, ERR_DISABLED, "CLEARMODE");
Index: ircd-ircdev/ircd/m_mode.c
diff -u ircd-ircdev/ircd/m_mode.c:1.17 ircd-ircdev/ircd/m_mode.c:1.18
--- ircd-ircdev/ircd/m_mode.c:1.17 Sat Jan 19 05:28:53 2008
+++ ircd-ircdev/ircd/m_mode.c Sat Jan 19 11:26:03 2008
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Handlers for MODE command.
- * @version $Id: m_mode.c,v 1.17 2008/01/19 13:28:53 zolty Exp $
+ * @version $Id: m_mode.c,v 1.18 2008/01/19 19:26:03 zolty Exp $
*/
#include "config.h"
@@ -115,6 +115,23 @@
MODE_PARSE_FORCE), /* Force it to take */
member);
return modebuf_flush(&mbuf);
+
+#if 1 /* TRANSICION IRC-HISPANO */
+ } else if (feature_bool(FEAT_TRANSICION_HISPANO) && IsOper(sptr) && strchr(parv[2], 'x')) {
+ modebuf_init(&mbuf, sptr, cptr, chptr,
+ (MODEBUF_DEST_CHANNEL | /* Send MODE to channel */
+ MODEBUF_DEST_SERVER | /* And to server */
+ MODEBUF_DEST_XMODE_JCEA | /* Use XMODE */
+ MODEBUF_DEST_HACK4)); /* Generate a HACK(4) notice */
+
+ mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2,
+ (MODE_PARSE_SET | /* Set the modes on the channel */
+ MODE_PARSE_STRICT | /* Be strict about it */
+ MODE_PARSE_FORCE), /* And force them to be accepted */
+ NULL);
+
+ modebuf_flush(&mbuf); /* flush the modes */
+#endif
} else
mode_parse(0, cptr, sptr, chptr, parc - 2, parv + 2,
(member ? MODE_PARSE_NOTOPER : MODE_PARSE_NOTMEMBER), member);
@@ -194,7 +211,7 @@
(MODEBUF_DEST_CHANNEL | /* Send mode to clients */
MODEBUF_DEST_SERVER)); /* Send mode to servers */
#else
- else
+ else
modebuf_init(&mbuf, sptr, cptr, chptr,
(MODEBUF_DEST_CHANNEL | /* Send mode to clients */
MODEBUF_DEST_SERVER | /* Send mode to servers */
@@ -217,6 +234,21 @@
MODE_PARSE_STRICT | /* Interpret it strictly */
MODE_PARSE_FORCE), /* And force it to be accepted */
NULL);
+#if 1 /* TRANSICION IRC-HISPANO */
+ } else if (IsOper(sptr) && strchr(parv[2], 'x')) {
+ modebuf_init(&mbuf, sptr, cptr, chptr,
+ (MODEBUF_DEST_CHANNEL | /* Send MODE to channel */
+ MODEBUF_DEST_SERVER | /* And to server */
+ MODEBUF_DEST_XMODE_JCEA | /* Use XMODE */
+ MODEBUF_DEST_HACK4)); /* Generate a HACK(4) notice */
+
+ mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2,
+ (MODE_PARSE_SET | /* Set the modes on the channel */
+ MODE_PARSE_FORCE), /* And force them to be accepted */
+ NULL);
+
+ modebuf_flush(&mbuf); /* flush the modes */
+#endif
} else if (!(member = find_member_link(chptr, sptr)) || !(IsChanOwner(member)
|| IsChanOp(member))) {
#else
Index: ircd-ircdev/ircd/m_opmode.c
diff -u ircd-ircdev/ircd/m_opmode.c:1.8 ircd-ircdev/ircd/m_opmode.c:1.9
--- ircd-ircdev/ircd/m_opmode.c:1.8 Thu Apr 19 15:53:49 2007
+++ ircd-ircdev/ircd/m_opmode.c Sat Jan 19 11:26:03 2008
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Handlers for OPERMODE command.
- * @version $Id: m_opmode.c,v 1.8 2007/04/19 22:53:49 zolty Exp $
+ * @version $Id: m_opmode.c,v 1.9 2008/01/19 19:26:03 zolty Exp $
*/
#include "config.h"
@@ -101,6 +101,14 @@
const char *qreason;
int force = 0;
+#if 1 /* TRANSICION IRC-HISPANO */
+ if (feature_bool(FEAT_TRANSICION_HISPANO))
+ {
+ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :Durante la transicion al nuevo ircd, el comando OPMODE esta deshabilitado", sptr);
+ return 0;
+ }
+#endif
+
if (!feature_bool(FEAT_CONFIG_OPERCMDS))
return send_reply(sptr, ERR_DISABLED, "OPMODE");
Index: ircd-ircdev/ircd/m_wallusers.c
diff -u ircd-ircdev/ircd/m_wallusers.c:1.6 ircd-ircdev/ircd/m_wallusers.c:1.7
--- ircd-ircdev/ircd/m_wallusers.c:1.6 Sat Apr 21 14:17:23 2007
+++ ircd-ircdev/ircd/m_wallusers.c Sat Jan 19 11:26:03 2008
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Handlers for WALLUSERS command.
- * @version $Id: m_wallusers.c,v 1.6 2007/04/21 21:17:23 zolty Exp $
+ * @version $Id: m_wallusers.c,v 1.7 2008/01/19 19:26:03 zolty Exp $
*/
#include "config.h"
@@ -32,6 +32,8 @@
#include "msg.h"
#include "numeric.h"
#include "send.h"
+#include "ircd_features.h" /* TRANSICION IRC-HISPANO */
+#include "ircd.h" /* TRANSICION IRC-HISPANO */
/* #include <assert.h> -- Now using assert in ircd_log.h */
@@ -77,6 +79,14 @@
{
char *message;
+#if 1 /* TRANSICION IRC-HISPANO */
+ if (feature_bool(FEAT_TRANSICION_HISPANO))
+ {
+ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :Durante la transicion al nuevo ircd, el comando WALLUSERS esta deshabilitado", sptr);
+ return 0;
+ }
+#endif
+
message = parc > 1 ? parv[parc - 1] : 0;
if (EmptyString(message))
Index: ircd-ircdev/ircd/m_wallvoices.c
diff -u ircd-ircdev/ircd/m_wallvoices.c:1.12 ircd-ircdev/ircd/m_wallvoices.c:1.13
--- ircd-ircdev/ircd/m_wallvoices.c:1.12 Sun Jan 6 16:14:06 2008
+++ ircd-ircdev/ircd/m_wallvoices.c Sat Jan 19 11:26:07 2008
@@ -21,7 +21,7 @@
*/
/** @file
* @brief Handlers for WALLVOICES command.
- * @version $Id: m_wallvoices.c,v 1.12 2008/01/07 00:14:06 zolty Exp $
+ * @version $Id: m_wallvoices.c,v 1.13 2008/01/19 19:26:07 zolty Exp $
*/
#include "config.h"
@@ -37,6 +37,9 @@
#include "numnicks.h"
#include "s_user.h"
#include "send.h"
+#include "ircd_features.h" /* TRANSICION IRC-HISPANO */
+#include "ircd.h" /* TRANSICION IRC-HISPANO */
+
/* #include <assert.h> -- Now using assert in ircd_log.h */
@@ -60,6 +63,14 @@
assert(0 != cptr);
assert(cptr == sptr);
+#if 1 /* TRANSICION IRC-HISPANO */
+ if (feature_bool(FEAT_TRANSICION_HISPANO))
+ {
+ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :Durante la transicion al nuevo ircd, el comando WALLVOICES esta deshabilitado", sptr);
+ return 0;
+ }
+#endif
+
if (parc < 2 || EmptyString(parv[1]))
return send_reply(sptr, ERR_NORECIPIENT, "WALLVOICES");
----------------------- End of diff -----------------------
|
