pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-06 13:33:13 +02:00
Code Activity

Added cmd_sqline() function to IRCDProtoNew class.

Browse Source 
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1243 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
Robin Burchell w00t@inspircd.org
2008-09-30 18:45:12 +00:00
parent f8aff52e25
commit b1b5df38eb
13 changed files with 30 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/extern.h
-1
View File
@@ -623,7 +623,6 @@ E void pmodule_cmd_318(void (*func) (const char *source, const char *who));
E void pmodule_cmd_242(void (*func) (const char *buf));
E void pmodule_cmd_243(void (*func) (const char *buf));
E void pmodule_cmd_211(void (*func) (const char *buf));
E void pmodule_cmd_sqline(void (*func) (const char *mask, const char *reason));
E void pmodule_cmd_squit(void (*func) (const char *servname, const char *message));
E void pmodule_cmd_svso(void (*func) (const char *source, const char *nick, const char *flag));
E void pmodule_cmd_chg_nick(void (*func) (const char *oldnick, const char *newnick));
include/services.h
+1 -1
View File
@@ -1073,7 +1073,6 @@ typedef struct ircd_proto_ {
void (*ircd_cmd_242)(const char *buf);
void (*ircd_cmd_243)(const char *buf);
void (*ircd_cmd_211)(const char *buf);
void (*ircd_cmd_sqline)(const char *mask, const char *reason);
void (*ircd_cmd_squit)(const char *servname, const char *message);
void (*ircd_cmd_svso)(const char *source, const char *nick, const char *flag);
void (*ircd_cmd_chg_nick)(const char *oldnick, const char *newnick);
@@ -1346,6 +1345,7 @@ class IRCDProtoNew {
if (!buf) return;
send_cmd(source ? source : ServerName, "GLOBOPS :%s", buf);
}
virtual void cmd_sqline(const char *, const char *) = 0;
};
/*************************************************************************/
src/ircd.c
+1 -7
View File
@@ -63,7 +63,6 @@ void initIrcdProto()
ircdproto.ircd_cmd_242 = NULL;
ircdproto.ircd_cmd_243 = NULL;
ircdproto.ircd_cmd_211 = NULL;
ircdproto.ircd_cmd_sqline = NULL;
ircdproto.ircd_cmd_squit = NULL;
ircdproto.ircd_cmd_svso = NULL;
ircdproto.ircd_cmd_chg_nick = NULL;
@@ -469,7 +468,7 @@ void anope_cmd_global(const char *source, const char *fmt, ...)
void anope_cmd_sqline(const char *mask, const char *reason)
{
ircdproto.ircd_cmd_sqline(mask, reason);
ircdprotonew->cmd_sqline(mask, reason);
}
void anope_cmd_squit(const char *servname, const char *message)
@@ -712,11 +711,6 @@ void pmodule_cmd_211(void (*func) (const char *buf))
ircdproto.ircd_cmd_211 = func;
}
void pmodule_cmd_sqline(void (*func) (const char *mask, const char *reason))
{
ircdproto.ircd_cmd_sqline = func;
}
void pmodule_cmd_squit(void (*func) (const char *servname, const char *message))
{
ircdproto.ircd_cmd_squit = func;
src/protocol/bahamut.c
+5 -9
View File
@@ -687,13 +687,10 @@ void moduleAddIRCDMsgs(void) {
/* *INDENT-ON* */
/* SQLINE */
void bahamut_cmd_sqline(const char *mask, const char *reason)
void BahamutIRCdProto::cmd_sqline(const char *mask, const char *reason)
{
if (!mask || !reason) {
return;
}
send_cmd(NULL, "SQLINE %s :%s", mask, reason);
if (!mask || !reason) return;
send_cmd(NULL, "SQLINE %s :%s", mask, reason);
}
/* UNSGLINE */
@@ -1135,7 +1132,7 @@ void BahamutIRCdProto::cmd_nick(const char *nick, const char *name, const char *
{
EnforceQlinedNick(nick, NULL);
send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, static_cast<long>(time(NULL)), modes, ServiceUser, ServiceHost, ServerName, name);
bahamut_cmd_sqline(nick, "Reserved for services");
cmd_sqline(nick, "Reserved for services");
}
void BahamutIRCdProto::cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
@@ -1195,7 +1192,7 @@ void BahamutIRCdProto::cmd_bot_nick(const char *nick, const char *user, const ch
{
EnforceQlinedNick(nick, s_BotServ);
send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, static_cast<long>(time(NULL)), modes, user, host, ServerName, real);
bahamut_cmd_sqline(nick, "Reserved for services");
cmd_sqline(nick, "Reserved for services");
}
/* SVSNICK */
@@ -1451,7 +1448,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(bahamut_cmd_242);
pmodule_cmd_243(bahamut_cmd_243);
pmodule_cmd_211(bahamut_cmd_211);
pmodule_cmd_sqline(bahamut_cmd_sqline);
pmodule_cmd_squit(bahamut_cmd_squit);
pmodule_cmd_svso(bahamut_cmd_svso);
pmodule_cmd_chg_nick(bahamut_cmd_chg_nick);
src/protocol/bahamut.h
+1 -1
View File
@@ -76,7 +76,6 @@ void bahamut_cmd_318(const char *source, const char *who);
void bahamut_cmd_242(const char *buf);
void bahamut_cmd_243(const char *buf);
void bahamut_cmd_211(const char *buf);
void bahamut_cmd_sqline(const char *mask, const char *reason);
void bahamut_cmd_squit(const char *servname, const char *message);
void bahamut_cmd_svso(const char *source, const char *nick, const char *flag);
void bahamut_cmd_chg_nick(const char *oldnick, const char *newnick);
@@ -118,4 +117,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
void cmd_bot_chan_mode(const char *, const char *);
void cmd_join(const char *, const char *, time_t);
void cmd_unsqline(const char *);
void cmd_sqline(const char *, const char *);
} ircd_proto;
src/protocol/charybdis.c
+5 -9
View File
@@ -746,13 +746,10 @@ void moduleAddIRCDMsgs(void)
/* *INDENT-ON* */
void charybdis_cmd_sqline(const char *mask, const char *reason)
void CharybdisProto::cmd_sqline(const char *mask, const char *reason)
{
Uid *ud;
ud = find_uid(s_OperServ);
send_cmd((UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ),
"RESV * %s :%s", mask, reason);
Uid *ud = find_uid(s_OperServ);
send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "RESV * %s :%s", mask, reason);
}
void charybdis_cmd_unsgline(const char *mask)
@@ -941,7 +938,7 @@ void CharybdisProto::cmd_bot_nick(const char *nick, const char *user, const char
new_uid(nick, uidbuf);
}
else send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick, static_cast<long>(time(NULL)), modes, user, host, ServerName, real);
charybdis_cmd_sqline(nick, "Reserved for services");
cmd_sqline(nick, "Reserved for services");
}
void CharybdisProto::cmd_part(const char *nick, const char *chan, const char *buf)
@@ -1299,7 +1296,7 @@ void CharybdisProto::cmd_nick(const char *nick, const char *name, const char *mo
new_uid(nick, uidbuf);
}
else send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick, static_cast<long>(time(NULL)), mode, ServiceUser, ServiceHost, ServerName, name);
charybdis_cmd_sqline(nick, "Reserved for services");
cmd_sqline(nick, "Reserved for services");
}
void CharybdisProto::cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
@@ -1715,7 +1712,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(charybdis_cmd_242);
pmodule_cmd_243(charybdis_cmd_243);
pmodule_cmd_211(charybdis_cmd_211);
pmodule_cmd_sqline(charybdis_cmd_sqline);
pmodule_cmd_squit(charybdis_cmd_squit);
pmodule_cmd_svso(charybdis_cmd_svso);
pmodule_cmd_chg_nick(charybdis_cmd_chg_nick);
src/protocol/charybdis.h
+1 -1
View File
@@ -64,7 +64,6 @@ void charybdis_cmd_318(const char *source, const char *who);
void charybdis_cmd_242(const char *buf);
void charybdis_cmd_243(const char *buf);
void charybdis_cmd_211(const char *buf);
void charybdis_cmd_sqline(const char *mask, const char *reason);
void charybdis_cmd_squit(const char *servname, const char *message);
void charybdis_cmd_svso(const char *source, const char *nick, const char *flag);
void charybdis_cmd_chg_nick(const char *oldnick, const char *newnick);
@@ -113,4 +112,5 @@ class CharybdisProto : public IRCDProtoNew {
void cmd_invite(const char *, const char *, const char *);
void cmd_part(const char *, const char *, const char *);
void cmd_global(const char *, const char *);
void cmd_sqline(const char *, const char *);
} ircd_proto;
src/protocol/inspircd11.c
+3 -8
View File
@@ -962,14 +962,10 @@ void inspircd_cmd_211(const char *buf)
}
/* SQLINE */
void inspircd_cmd_sqline(const char *mask, const char *reason)
void InspIRCdProto::cmd_sqline(const char *mask, const char *reason)
{
if (!mask || !reason) {
return;
}
send_cmd(ServerName, "ADDLINE Q %s %s %ld 0 :%s", mask, s_OperServ,
(long int) time(NULL), reason);
if (!mask || !reason) return;
send_cmd(ServerName, "ADDLINE Q %s %s %ld 0 :%s", mask, s_OperServ, static_cast<long>(time(NULL)), reason);
}
/* SQUIT */
@@ -1695,7 +1691,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(inspircd_cmd_242);
pmodule_cmd_243(inspircd_cmd_243);
pmodule_cmd_211(inspircd_cmd_211);
pmodule_cmd_sqline(inspircd_cmd_sqline);
pmodule_cmd_squit(inspircd_cmd_squit);
pmodule_cmd_svso(inspircd_cmd_svso);
pmodule_cmd_chg_nick(inspircd_cmd_chg_nick);
src/protocol/inspircd11.h
+1 -1
View File
@@ -69,7 +69,6 @@ void inspircd_cmd_318(const char *source, const char *who);
void inspircd_cmd_242(const char *buf);
void inspircd_cmd_243(const char *buf);
void inspircd_cmd_211(const char *buf);
void inspircd_cmd_sqline(const char *mask, const char *reason);
void inspircd_cmd_squit(const char *servname, const char *message);
void inspircd_cmd_svso(const char *source, const char *nick, const char *flag);
void inspircd_cmd_chg_nick(const char *oldnick, const char *newnick);
@@ -122,4 +121,5 @@ class InspIRCdProto : public IRCDProtoNew {
void cmd_bot_chan_mode(const char *, const char *);
void cmd_join(const char *, const char *, time_t);
void cmd_unsqline(const char *);
void cmd_sqline(const char *, const char *);
} ircd_proto;
src/protocol/ratbox.c
+5 -9
View File
@@ -693,13 +693,10 @@ void moduleAddIRCDMsgs(void)
/* *INDENT-ON* */
void ratbox_cmd_sqline(const char *mask, const char *reason)
void RatboxProto::cmd_sqline(const char *mask, const char *reason)
{
Uid *ud;
ud = find_uid(s_OperServ);
send_cmd((UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ),
"RESV * %s :%s", mask, reason);
Uid *ud = find_uid(s_OperServ);
send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "RESV * %s :%s", mask, reason);
}
void ratbox_cmd_unsgline(const char *mask)
@@ -880,7 +877,7 @@ void RatboxProto::cmd_bot_nick(const char *nick, const char *user, const char *h
new_uid(nick, uidbuf);
}
else send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick, static_cast<long>(time(NULL)), modes, user, host, ServerName, real);
ratbox_cmd_sqline(nick, "Reserved for services");
cmd_sqline(nick, "Reserved for services");
}
void RatboxProto::cmd_part(const char *nick, const char *chan, const char *buf)
@@ -1231,7 +1228,7 @@ void RatboxProto::cmd_nick(const char *nick, const char *name, const char *mode)
new_uid(nick, uidbuf);
}
else send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick, static_cast<long>(time(NULL)), mode, ServiceUser, ServiceHost, ServerName, name);
ratbox_cmd_sqline(nick, "Reserved for services");
cmd_sqline(nick, "Reserved for services");
}
void RatboxProto::cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
@@ -1608,7 +1605,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(ratbox_cmd_242);
pmodule_cmd_243(ratbox_cmd_243);
pmodule_cmd_211(ratbox_cmd_211);
pmodule_cmd_sqline(ratbox_cmd_sqline);
pmodule_cmd_squit(ratbox_cmd_squit);
pmodule_cmd_svso(ratbox_cmd_svso);
pmodule_cmd_chg_nick(ratbox_cmd_chg_nick);
src/protocol/ratbox.h
+1 -1
View File
@@ -63,7 +63,6 @@ void ratbox_cmd_318(const char *source, const char *who);
void ratbox_cmd_242(const char *buf);
void ratbox_cmd_243(const char *buf);
void ratbox_cmd_211(const char *buf);
void ratbox_cmd_sqline(const char *mask, const char *reason);
void ratbox_cmd_squit(const char *servname, const char *message);
void ratbox_cmd_svso(const char *source, const char *nick, const char *flag);
void ratbox_cmd_chg_nick(const char *oldnick, const char *newnick);
@@ -111,4 +110,5 @@ class RatboxProto : public IRCDProtoNew {
void cmd_invite(const char *, const char *, const char *);
void cmd_part(const char *, const char *, const char *);
void cmd_global(const char *, const char *);
void cmd_sqline(const char *, const char *);
} ircd_proto;
src/protocol/unreal32.c
+5 -9
View File
@@ -594,7 +594,7 @@ void UnrealIRCdProto::cmd_nick(const char *nick, const char *name, const char *m
EnforceQlinedNick(nick, NULL);
send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s %s%s :%s", send_token("NICK", "&"), nick, static_cast<long>(time(NULL)), ServiceUser, ServiceHost, ServerName, modes,
ServiceHost, myIrcd->nickip ? " *" : " ", name);
unreal_cmd_sqline(nick, "Reserved for services");
cmd_sqline(nick, "Reserved for services");
}
void UnrealIRCdProto::cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
@@ -614,7 +614,7 @@ void UnrealIRCdProto::cmd_bot_nick(const char *nick, const char *user, const cha
EnforceQlinedNick(nick, s_BotServ);
send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s %s%s :%s", send_token("NICK", "&"), nick, static_cast<long>(time(NULL)), user, host, ServerName, modes, host,
myIrcd->nickip ? " *" : " ", real);
unreal_cmd_sqline(nick, "Reserved for services");
cmd_sqline(nick, "Reserved for services");
}
void UnrealIRCdProto::cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
@@ -865,13 +865,10 @@ void unreal_cmd_211(const char *buf)
** - Unreal will translate this to TKL for us
**
*/
void unreal_cmd_sqline(const char *mask, const char *reason)
void UnrealIRCdProto::cmd_sqline(const char *mask, const char *reason)
{
if (!mask || !reason) {
return;
}
send_cmd(NULL, "%s %s :%s", send_token("SQLINE", "c"), mask, reason);
if (!mask || !reason) return;
send_cmd(NULL, "%s %s :%s", send_token("SQLINE", "c"), mask, reason);
}
/* SQUIT */
@@ -1993,7 +1990,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(unreal_cmd_242);
pmodule_cmd_243(unreal_cmd_243);
pmodule_cmd_211(unreal_cmd_211);
pmodule_cmd_sqline(unreal_cmd_sqline);
pmodule_cmd_squit(unreal_cmd_squit);
pmodule_cmd_svso(unreal_cmd_svso);
pmodule_cmd_chg_nick(unreal_cmd_chg_nick);
src/protocol/unreal32.h
+1 -1
View File
@@ -98,7 +98,6 @@ void unreal_cmd_318(const char *source, const char *who);
void unreal_cmd_242(const char *buf);
void unreal_cmd_243(const char *buf);
void unreal_cmd_211(const char *buf);
void unreal_cmd_sqline(const char *mask, const char *reason);
void unreal_cmd_squit(const char *servname, const char *message);
void unreal_cmd_svso(const char *source, const char *nick, const char *flag);
void unreal_cmd_chg_nick(const char *oldnick, const char *newnick);
@@ -141,4 +140,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
void cmd_bot_chan_mode(const char *, const char *);
void cmd_join(const char *, const char *, time_t);
void cmd_unsqline(const char *);
void cmd_sqline(const char *, const char *);
} ircd_proto;