pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-01 23:46:38 +02:00
Code Activity

Replaced anope_SendSVSKill() with direct call to SendSVSKill() in IRCDProto class.

Browse Source 
Also added SendSVSKillInternal() function to IRCDProto class, now SendSVSKill() is a stub to handle varargs.


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1326 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
Naram Qashat cyberbotx@cyberbotx.com
2008-10-02 18:04:29 +00:00
parent af0bf80a07
commit 70501666e8
16 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/extern.h
-1
View File
@@ -1155,7 +1155,6 @@ E void anope_SendSVSHOLD(const char *nick); /* SVSHOLD */
E void anope_SendSVSHOLDDel(const char *nick); /* SVSHOLD */
E void anope_cmd_svsinfo(); /* SVSINFO */
E void anope_SendSVSJoin(const char *source, const char *nick,const char *chan, const char *param); /* SVSJOIN */
E void anope_SendSVSKill(const char *source, const char *user, const char *fmt, ...); /* SVSKILL */
E void anope_SendSVSMode(User * u, int ac, const char **av); /* SVSMODE */
E void anope_SendSVSMode_chan(const char *name, const char *mode, const char *nick); /* SVSMODE */
E void anope_SendForceNickChange(const char *nick,const char *newnick, time_t when); /* SVSNICK */
include/services.h
+12 -1
View File
@@ -1230,13 +1230,24 @@ class IRCDProto;
#include "extern.h"
class IRCDProto {
virtual void SendSVSKillInternal(const char *, const char *, const char *) = 0;
public:
virtual void SendSVSNOOP(const char *, int) { }
virtual void SendAkillDel(const char *, const char *) = 0;
virtual void SendTopic(BotInfo *, const char *, const char *, const char *, time_t) = 0;
virtual void SendVhostDel(User *) { }
virtual void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *) = 0;
virtual void SendSVSKill(const char *, const char *, const char *) = 0;
virtual void SendSVSKill(const char *source, const char *user, const char *fmt, ...)
{
va_list args;
char buf[BUFSIZE] = "";
if (fmt) {
va_start(args, fmt);
vsnprintf(buf, BUFSIZE - 1, fmt, args);
va_end(args);
}
SendSVSKillInternal(source, user, buf);
}
virtual void SendSVSMode(User *, int, const char **) = 0;
virtual void SendGuestNick(const char *, const char *, const char *, const char *, const char *) { }
virtual void SendMode(const char *, const char *, const char *) = 0;
src/actions.c
+1 -1
View File
@@ -65,7 +65,7 @@ void kill_user(const char *source, const char *user, const char *reason)
snprintf(buf, sizeof(buf), "%s (%s)", source, reason);
anope_SendSVSKill(source, user, buf);
ircdproto->SendSVSKill(source, user, buf);
if (!ircd->quitonkill && finduser(user)) {
do_kill(user, buf);
src/ircd.c
-12
View File
@@ -43,18 +43,6 @@ void anope_ProcessUsermodes(User *user, int ac, const char **av)
ircdproto->ProcessUsermodes(user, ac, av);
}
void anope_SendSVSKill(const char *source, const char *user, const char *fmt, ...)
{
va_list args;
char buf[BUFSIZE] = "";
if (fmt) {
va_start(args, fmt);
vsnprintf(buf, BUFSIZE - 1, fmt, args);
va_end(args);
}
ircdproto->SendSVSKill(source, user, buf);
}
void anope_SendSVSMode(User *u, int ac, const char **av)
{
ircdproto->SendSVSMode(u, ac, av);
src/nickserv.c
+5 -5
View File
@@ -7,8 +7,8 @@
* Please read COPYING and README for further details.
*
* Based on the original code of Epona by Lara.
* Based on the original code of Services by Andy Church.
*
* Based on the original code of Services by Andy Church.
*
* $Id$
*
*/
@@ -962,7 +962,7 @@ void cancel_user(User * u)
"Services Enforcer", "+");
add_ns_timeout(na, TO_RELEASE, NSReleaseTimeout);
} else {
anope_SendSVSKill(s_NickServ, u->nick,
ircdproto->SendSVSKill(s_NickServ, u->nick,
"Killing to enforce nick");
}
}
@@ -973,7 +973,7 @@ void cancel_user(User * u)
"Services Enforcer", "+");
add_ns_timeout(na, TO_RELEASE, NSReleaseTimeout);
} else {
anope_SendSVSKill(s_NickServ, u->nick,
ircdproto->SendSVSKill(s_NickServ, u->nick,
"Killing to enforce nick");
}
}
@@ -1817,7 +1817,7 @@ int do_setmodes(User * u)
}
/*************************************************************************/
/*
/*
* Nick tracking
*/
src/operserv.c
+1 -1
View File
@@ -1068,7 +1068,7 @@ int check_sgline(const char *nick, const char *realname)
if (match_wild_nocase(sx->mask, realname)) {
anope_SendSGLine(sx->mask, sx->reason);
/* We kill nick since s_sgline can't */
anope_SendSVSKill(ServerName, nick, "G-Lined: %s", sx->reason);
ircdproto->SendSVSKill(ServerName, nick, "G-Lined: %s", sx->reason);
return 1;
}
}
src/protocol/bahamut.c
+1 -1
View File
@@ -693,7 +693,7 @@ void BahamutIRCdProto::SendAkill(const char *user, const char *host, const char
/*
Note: if the stamp is null 0, the below usage is correct of Bahamut
*/
void BahamutIRCdProto::SendSVSKill(const char *source, const char *user, const char *buf)
void BahamutIRCdProto::SendSVSKillInternal(const char *source, const char *user, const char *buf)
{
if (!source || !user || !buf) return;
send_cmd(source, "SVSKILL %s :%s", user, buf);
src/protocol/bahamut.h
+1 -1
View File
@@ -59,12 +59,12 @@
#define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r
class BahamutIRCdProto : public IRCDProto {
void SendSVSKillInternal(const char *, const char *, const char *);
public:
void SendSVSNOOP(const char *, int);
void SendAkillDel(const char *, const char *);
void SendTopic(BotInfo *, const char *, const char *, const char *, time_t);
void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
void SendSVSKill(const char *, const char *, const char *);
void SendSVSMode(User *, int, const char **);
void SendGuestNick(const char *, const char *, const char *, const char *, const char *);
void SendMode(const char *, const char *, const char *);
src/protocol/charybdis.c
+1 -1
View File
@@ -715,7 +715,7 @@ void CharybdisProto::SendAkill(const char *user, const char *host, const char *w
send_cmd(UseTS6 ? (bi ? bi->uid.c_str() : s_OperServ) : s_OperServ, "KLINE * %ld %s %s :%s", static_cast<long>(expires - time(NULL)), user, host, reason);
}
void CharybdisProto::SendSVSKill(const char *source, const char *user, const char *buf)
void CharybdisProto::SendSVSKillInternal(const char *source, const char *user, const char *buf)
{
if (!source || !user || !buf) return;
BotInfo *bi = findbot(source);
src/protocol/charybdis.h
+1 -1
View File
@@ -47,11 +47,11 @@
class CharybdisProto : public IRCDTS6Proto {
void SendSVSKillInternal(const char *, const char *, const char *);
public:
void SendAkillDel(const char *, const char *);
void SendVhostDel(User *);
void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
void SendSVSKill(const char *, const char *, const char *);
void SendSVSMode(User *, int, const char **);
void SendMode(const char *, const char *, const char *);
void SendClientIntroduction(const char *, const char *, const char *, const char *, const char *);
src/protocol/inspircd11.c
+1 -1
View File
@@ -541,7 +541,7 @@ void InspIRCdProto::SendAkill(const char *user, const char *host, const char *wh
send_cmd(ServerName, "ADDLINE G %s@%s %s %ld %ld :%s", user, host, who, static_cast<long>(when), static_cast<long>(timeleft), reason);
}
void InspIRCdProto::SendSVSKill(const char *source, const char *user, const char *buf)
void InspIRCdProto::SendSVSKillInternal(const char *source, const char *user, const char *buf)
{
if (!buf || !source || !user) return;
send_cmd(source, "KILL %s :%s", user, buf);
src/protocol/inspircd11.h
+1 -1
View File
@@ -52,12 +52,12 @@
#define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r
class InspIRCdProto : public IRCDProto {
void SendSVSKillInternal(const char *, const char *, const char *);
public:
void SendAkillDel(const char *, const char *);
void SendTopic(BotInfo *, const char *, const char *, const char *, time_t);
void SendVhostDel(User *);
void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
void SendSVSKill(const char *, const char *, const char *);
void SendSVSMode(User *, int, const char **);
void SendGuestNick(const char *, const char *, const char *, const char *, const char *);
void SendMode(const char *, const char *, const char *);
src/protocol/ratbox.c
+1 -1
View File
@@ -654,7 +654,7 @@ void RatboxProto::SendAkill(const char *user, const char *host, const char *who,
send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "KLINE * %ld %s %s :%s", static_cast<long>(expires - time(NULL)), user, host, reason);
}
void RatboxProto::SendSVSKill(const char *source, const char *user, const char *buf)
void RatboxProto::SendSVSKillInternal(const char *source, const char *user, const char *buf)
{
if (!source || !user || !buf) return;
Uid *ud = find_uid(source), *ud2 = find_uid(user);
src/protocol/ratbox.h
+1 -1
View File
@@ -46,10 +46,10 @@
class RatboxProto : public IRCDTS6Proto {
void SendSVSKillInternal(const char *, const char *, const char *);
public:
void SendAkillDel(const char *, const char *);
void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
void SendSVSKill(const char *, const char *, const char *);
void SendSVSMode(User *, int, const char **);
void SendMode(const char *, const char *, const char *);
void SendClientIntroduction(const char *, const char *, const char *, const char *, const char *);
src/protocol/unreal32.c
+1 -1
View File
@@ -514,7 +514,7 @@ void UnrealIRCdProto::SendAkill(const char *user, const char *host, const char *
** parv[1] = client
** parv[2] = kill message
*/
void UnrealIRCdProto::SendSVSKill(const char *source, const char *user, const char *buf)
void UnrealIRCdProto::SendSVSKillInternal(const char *source, const char *user, const char *buf)
{
if (!source || !user || !buf) return;
send_cmd(source, "%s %s :%s", send_token("SVSKILL", "h"), user, buf);
src/protocol/unreal32.h
+1 -1
View File
@@ -81,13 +81,13 @@
#define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r
class UnrealIRCdProto : public IRCDProto {
void SendSVSKillInternal(const char *, const char *, const char *);
public:
void SendSVSNOOP(const char *, int);
void SendAkillDel(const char *, const char *);
void SendTopic(BotInfo *, const char *, const char *, const char *, time_t);
void SendVhostDel(User *);
void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
void SendSVSKill(const char *, const char *, const char *);
void SendSVSMode(User *, int, const char **);
void SendGuestNick(const char *, const char *, const char *, const char *, const char *);
void SendMode(const char *, const char *, const char *);