summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes2
-rw-r--r--include/depricated.h127
-rw-r--r--include/extern.h2
-rw-r--r--src/bahamut.c6
-rw-r--r--src/channels.c16
-rw-r--r--src/dreamforge.c6
-rw-r--r--src/hybrid.c5
-rw-r--r--src/modules/module.h1
-rw-r--r--src/ptlink.c6
-rw-r--r--src/rageircd.c8
-rw-r--r--src/send.c20
-rw-r--r--src/ultimate2.c6
-rw-r--r--src/ultimate3.c6
-rw-r--r--src/unreal31.c7
-rw-r--r--src/unreal32.c7
-rw-r--r--src/viagra.c6
-rw-r--r--version.log7
17 files changed, 233 insertions, 5 deletions
diff --git a/Changes b/Changes
index a65865396..db9743abf 100644
--- a/Changes
+++ b/Changes
@@ -21,6 +21,8 @@ Provided by Anope Dev. <dev@anope.org> - 2004
08/24 F Compile error with gcc2. [ #00]
Provided by Trystan <trystan@nomadirc.net> - 2004
+10/23 A Added depricated.h, this will allow old mods to work for now [ #00]
+10/23 A Add hook for SJOIN for Unreal future +I support [ #00]
10/06 A Bahamut's channel mode +j (join throttle) [ #00]
10/05 A Globalized CS/NS STATUS messages [ #00]
10/02 A Added NewsCount as new feature in services.conf [ #00]
diff --git a/include/depricated.h b/include/depricated.h
new file mode 100644
index 000000000..0966a073e
--- /dev/null
+++ b/include/depricated.h
@@ -0,0 +1,127 @@
+/* depricated.h
+ *
+ * (C) 2003 Anope Team
+ * Contact us at info@anope.org
+ *
+ * Please read COPYING and README for furhter details.
+ *
+ * Based on the original code of Epona by Lara.
+ * Based on the original code of Services by Andy Church.
+ *
+ *
+ */
+
+/*
+ All of these functions were replaced in 1.7.6, you should move your modules
+ to use the new functions
+*/
+
+#define change_user_mode(u, modes, arg) common_svsmode(u, modes, arg)
+#define GetIdent(x) common_get_vident(x)
+#define GetHost(x) common_get_vhost(x)
+
+#define NEWNICK(nick,user,host,real,modes,qline) \
+ anope_cmd_bot_nick(nick,user,host,real,modes)
+
+#define s_akill(user, host, who, when, expires, reason) \
+ anope_cmd_akill(user, host, who, when, expires, reason)
+
+#define set_umode(user, ac, av) anope_set_umode(user, ac, av)
+
+#define s_svsnoop(server, set) anope_cmd_svsnoop(server, set)
+
+#define s_sqline(mask, reason) anope_cmd_sqline(mask, reason)
+
+#define s_sgline(mask, reason) anope_cmd_sgline(mask, reason)
+#define s_szline(mask, reason) anope_cmd_szline(mask, reason)
+#define s_unsgline(mask) anope_cmd_unsgline(mask)
+#define s_unsqline(mask) anope_cmd_unsqline(mask)
+#define s_unszline(mask) anope_cmd_unszline(mask)
+
+#define s_rakill(user, host) anope_cmd_remove_akill(user, host)
+
+
+# define NICKSERV_MODE ircd->nickservmode
+# define CHANSERV_MODE ircd->chanservmode
+# define HOSTSERV_MODE ircd->hostservmode
+# define MEMOSERV_MODE ircd->memoservmode
+# define BOTSERV_MODE ircd->botservmode
+# define HELPSERV_MODE ircd->helpservmode
+# define OPERSERV_MODE ircd->oprservmode
+# define DEVNULL_MODE ircd->devnullmode
+# define GLOBAL_MODE ircd->globalmode
+# define NICKSERV_ALIAS_MODE ircd->nickservaliasmode
+# define CHANSERV_ALIAS_MODE ircd->chanservaliasmode
+# define MEMOSERV_ALIAS_MODE ircd->memoservaliasmode
+# define BOTSERV_ALIAS_MODE ircd->botservaliasmode
+# define HELPSERV_ALIAS_MODE ircd->helpservaliasmode
+# define OPERSERV_ALIAS_MODE ircd->operservaliasmode
+# define DEVNULL_ALIAS_MODE ircd->devnullaliasmode
+# define GLOBAL_ALIAS_MODE ircd->globalaliasmode
+# define HOSTSERV_ALIAS_MODE ircd->hostservaliasmode
+# define BOTSERV_BOTS_MODE ircd->botserv_bot_mode
+#define CHAN_MAX_SYMBOL ircd->max_symbols
+#define MODESTOREMOVE ircd->modestoremove
+
+#ifdef IRC_HYBRID
+# define HAS_HALFOP
+# define HAS_EXCEPT
+#endif
+
+#ifdef IRC_VIAGRA
+# define HAS_HALFOP
+# define HAS_VHOST
+# define HAS_VIDENT
+# define HAS_EXCEPT
+#endif
+
+#ifdef IRC_BAHAMUT
+# define HAS_NICKIP
+# define HAS_EXCEPT
+# define HAS_SVSHOLD
+#endif
+
+#ifdef IRC_RAGE2
+# define HAS_HALFOP
+# define HAS_EXCEPT
+# define HAS_VHOST
+# define HAS_NICKVHOST
+#endif
+
+#ifdef IRC_PTLINK
+# define HAS_NICKVHOST
+# define HAS_VHOST
+# define HAS_FMODE
+# define HAS_EXCEPT
+#endif
+
+#ifdef IRC_ULTIMATE2
+# define IRC_ULTIMATE /* gotta do this for old mods */
+# define HAS_FMODE
+# define HAS_HALFOP
+# define HAS_LMODE
+# define HAS_VHOST
+# define HAS_VIDENT
+# define HAS_EXCEPT
+#endif
+
+#if defined(IRC_UNREAL31) || defined(IRC_UNREAL32)
+# define IRC_UNREAL /* gotta do this for old mods */
+# define HAS_FMODE
+# define HAS_HALFOP
+# define HAS_LMODE
+# define HAS_NICKVHOST
+# define HAS_VHOST
+# define HAS_VIDENT
+# define HAS_EXCEPT
+#endif
+
+#ifdef IRC_ULTIMATE3
+# define HAS_HALFOP
+# define HAS_VHOST
+# define HAS_NICKVHOST
+# define HAS_VIDENT
+# define HAS_EXCEPT
+#endif
+
+
diff --git a/include/extern.h b/include/extern.h
index 440708c40..748a9b18a 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -1091,6 +1091,8 @@ extern int anope_flood_mode_check(char *value);
extern void anope_cmd_jupe(char *jserver, char *who, char *reason);
+extern void anope_cmd_global_legacy(char *source, char *fmt);
+extern void wallops(char *source, const char *fmt, ...);
extern char *common_get_vident(User *u);
extern char *common_get_vhost(User *u);
diff --git a/src/bahamut.c b/src/bahamut.c
index f9680410c..a1f91922e 100644
--- a/src/bahamut.c
+++ b/src/bahamut.c
@@ -1603,5 +1603,11 @@ void anope_cmd_jupe(char *jserver, char *who, char *reason)
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
+/* GLOBOPS - to handle old WALLOPS */
+void anope_cmd_global_legacy(char *source, char *fmt)
+{
+ send_cmd(source ? source : ServerName, "GLOBOPS :%s", fmt);
+}
+
#endif
diff --git a/src/channels.c b/src/channels.c
index d2ed718ec..cf5f0b12e 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -638,13 +638,13 @@ void do_part(const char *source, int ac, char **av)
Unreal SJOIN
- On Connect there is
- SJOIN !11LkOb #ircops +nt :@Trystan
+ On Services connect there is
+ SJOIN !11LkOb #ircops +nt :@Trystan &*!*@*.aol.com "*@*.home.com
av[0] = time stamp (base64)
av[1] = channel
av[2] = modes
- av[3] = users + bans
+ av[3] = users + bans + exceptions
On Channel Creation or a User joins an existing
Luna.NomadIrc.Net SJOIN !11LkW9 #akill :@Trystan
@@ -714,6 +714,16 @@ void do_sjoin(const char *source, int ac, char **av)
}
}
+ /* Unreal plans to add +I - for now add the hook to allow
+ 1.7.6 to work with it and not cause problems - TSL */
+ if (*s == '\'') {
+ add_invite(c, myStrGetToken(s, '\'', 1));
+ if (!end)
+ break;
+ s = end + 1;
+ continue;
+ }
+
while (csmodes[(int) *s] != 0)
*end2++ = csmodes[(int) *s++];
*end2 = 0;
diff --git a/src/dreamforge.c b/src/dreamforge.c
index 4318e0760..47f48ae1d 100644
--- a/src/dreamforge.c
+++ b/src/dreamforge.c
@@ -1354,4 +1354,10 @@ void anope_cmd_jupe(char *jserver, char *who, char *reason)
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
+/* GLOBOPS - to handle old WALLOPS */
+void anope_cmd_global_legacy(char *source, char *fmt)
+{
+ send_cmd(source ? source : ServerName, "GLOBOPS :%s", fmt);
+}
+
#endif
diff --git a/src/hybrid.c b/src/hybrid.c
index d309ff621..554bb97e7 100644
--- a/src/hybrid.c
+++ b/src/hybrid.c
@@ -530,6 +530,11 @@ void anope_cmd_global(char *source, const char *fmt, ...)
send_cmd(source ? source : ServerName, "OPERWALL :%s", buf);
}
+/* GLOBOPS - to handle old WALLOPS */
+void anope_cmd_global_legacy(char *source, char *fmt)
+{
+ send_cmd(source ? source : ServerName, "OPERWALL :%s", fmt);
+}
int anope_event_sjoin(char *source, int ac, char **av)
{
diff --git a/src/modules/module.h b/src/modules/module.h
index e62ddf89b..3f341c0aa 100644
--- a/src/modules/module.h
+++ b/src/modules/module.h
@@ -2,6 +2,7 @@
#include "commands.h"
#include "language.h"
#include "modules.h"
+#include "depricated.h"
#define MOD_UNIQUE 0
#define MOD_HEAD 1
diff --git a/src/ptlink.c b/src/ptlink.c
index b13a99b6e..3bde24c9e 100644
--- a/src/ptlink.c
+++ b/src/ptlink.c
@@ -1659,4 +1659,10 @@ void anope_cmd_jupe(char *jserver, char *who, char *reason)
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
+/* GLOBOPS - to handle old WALLOPS */
+void anope_cmd_global_legacy(char *source, char *fmt)
+{
+ send_cmd(source ? source : ServerName, "GLOBOPS :%s", fmt);
+}
+
#endif
diff --git a/src/rageircd.c b/src/rageircd.c
index 9afb8a94f..9bc5d3e0b 100644
--- a/src/rageircd.c
+++ b/src/rageircd.c
@@ -630,7 +630,7 @@ void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit, when, topic);
}
-void anope_cmd_vhost_off(char *nick)
+void anope_cmd_vhost_off(User * u)
{
send_cmd(s_HostServ, "SVSMODE %s -x", u->nick);
notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick);
@@ -1596,4 +1596,10 @@ void anope_cmd_jupe(char *jserver, char *who, char *reason)
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
+/* GLOBOPS - to handle old WALLOPS */
+void anope_cmd_global_legacy(char *source, char *fmt)
+{
+ send_cmd(source ? source : ServerName, "GLOBOPS :%s", fmt);
+}
+
#endif
diff --git a/src/send.c b/src/send.c
index 754b45888..c5961d5d3 100644
--- a/src/send.c
+++ b/src/send.c
@@ -242,3 +242,23 @@ void privmsg(char *source, char *dest, const char *fmt, ...)
}
anope_cmd_privmsg2(source, dest, buf);
}
+
+/* cause #defines just bitched to much, its back and hooks to
+ a legacy in the ircd protocol files - TSL */
+void wallops(char *source, const char *fmt, ...)
+{
+ va_list args;
+ char buf[BUFSIZE];
+ *buf = '\0';
+
+ if (fmt) {
+ va_start(args, fmt);
+ vsnprintf(buf, BUFSIZE - 1, fmt, args);
+ va_end(args);
+ }
+ if (!buf) {
+ return;
+ }
+
+ anope_cmd_global_legacy(source, buf);
+}
diff --git a/src/ultimate2.c b/src/ultimate2.c
index 11ba07ab3..1eced99d4 100644
--- a/src/ultimate2.c
+++ b/src/ultimate2.c
@@ -1700,4 +1700,10 @@ void anope_cmd_jupe(char *jserver, char *who, char *reason)
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
+/* GLOBOPS - to handle old WALLOPS */
+void anope_cmd_global_legacy(char *source, char *fmt)
+{
+ send_cmd(source ? source : ServerName, "GLOBOPS :%s", fmt);
+}
+
#endif
diff --git a/src/ultimate3.c b/src/ultimate3.c
index be3af6849..2f3dea307 100644
--- a/src/ultimate3.c
+++ b/src/ultimate3.c
@@ -1763,4 +1763,10 @@ void anope_cmd_jupe(char *jserver, char *who, char *reason)
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
+/* GLOBOPS - to handle old WALLOPS */
+void anope_cmd_global_legacy(char *source, char *fmt)
+{
+ send_cmd(source ? source : ServerName, "GLOBOPS :%s", fmt);
+}
+
#endif
diff --git a/src/unreal31.c b/src/unreal31.c
index 8d6ed1a3d..263ec5039 100644
--- a/src/unreal31.c
+++ b/src/unreal31.c
@@ -1552,4 +1552,11 @@ void anope_cmd_jupe(char *jserver, char *who, char *reason)
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
+/* GLOBOPS - to handle old WALLOPS */
+void anope_cmd_global_legacy(char *source, char *fmt)
+{
+ send_cmd(source ? source : ServerName, "%s :%s",
+ send_token("GLOBOPS", "]"), fmt);
+}
+
#endif
diff --git a/src/unreal32.c b/src/unreal32.c
index 8766df588..43cb2bb14 100644
--- a/src/unreal32.c
+++ b/src/unreal32.c
@@ -1362,6 +1362,13 @@ void anope_cmd_global(char *source, const char *fmt, ...)
send_token("GLOBOPS", "]"), buf);
}
+/* GLOBOPS - to handle old WALLOPS */
+void anope_cmd_global_legacy(char *source, char *fmt)
+{
+ send_cmd(source ? source : ServerName, "%s :%s",
+ send_token("GLOBOPS", "]"), fmt);
+}
+
/* SQLINE */
/*
** parv[0] = sender
diff --git a/src/viagra.c b/src/viagra.c
index f95ef91f6..92cd0f073 100644
--- a/src/viagra.c
+++ b/src/viagra.c
@@ -1671,4 +1671,10 @@ void anope_cmd_jupe(char *jserver, char *who, char *reason)
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
+/* GLOBOPS - to handle old WALLOPS */
+void anope_cmd_global_legacy(char *source, char *fmt)
+{
+ send_cmd(source ? source : ServerName, "GLOBOPS :%s", fmt);
+}
+
#endif
diff --git a/version.log b/version.log
index 532436afa..e4f6c0b05 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,15 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="5"
-VERSION_BUILD="415"
+VERSION_BUILD="418"
# $Log$
#
+# BUILD : 1.7.5 (418)
+# BUGS : N/A
+# NOTES : 1. Fixed Rage IRCD compiler error, 2. Added hook for Unreal SJOIN +I support, 3. wallops() is back, 4.
+# depricated.h added to help older modules work with the new commands
+#
# BUILD : 1.7.5 (415)
# BUGS : N/A
# NOTES : Fixes Unreal NICKIP and SVSMODE, Updated Base64 lib to fix NICKIP, Updated Spanish language file