summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/actions.c2
-rw-r--r--src/ircd.c12
-rw-r--r--src/nickserv.c10
-rw-r--r--src/operserv.c2
-rw-r--r--src/protocol/bahamut.c2
-rw-r--r--src/protocol/bahamut.h2
-rw-r--r--src/protocol/charybdis.c2
-rw-r--r--src/protocol/charybdis.h2
-rw-r--r--src/protocol/inspircd11.c2
-rwxr-xr-xsrc/protocol/inspircd11.h2
-rw-r--r--src/protocol/ratbox.c2
-rw-r--r--src/protocol/ratbox.h2
-rw-r--r--src/protocol/unreal32.c2
-rw-r--r--src/protocol/unreal32.h2
14 files changed, 17 insertions, 29 deletions
diff --git a/src/actions.c b/src/actions.c
index b3387b2af..6c00bdde1 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -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);
diff --git a/src/ircd.c b/src/ircd.c
index 821f94709..25629250a 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -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);
diff --git a/src/nickserv.c b/src/nickserv.c
index 9ffea4a2f..f40c17778 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -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
*/
diff --git a/src/operserv.c b/src/operserv.c
index ab26bc5c2..7497d72ce 100644
--- a/src/operserv.c
+++ b/src/operserv.c
@@ -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;
}
}
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 9cd553754..53613d37d 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -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);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index df8166c7b..273a8d759 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -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 *);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 6afb2cd07..beff0a919 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -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);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 3d6cd3f90..116bb5d42 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -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 *);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 41f5023a7..f968ff83c 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -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);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 0097d142b..96f3d1d44 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -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 *);
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index d78027487..7e2e97878 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -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);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index b73485279..7eef7ab14 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -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 *);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 0d9789862..05aaeeafa 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -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);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index b25a810e6..8f14783c5 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -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 *);
generated by cgit (git 2.34.1) at 2025-06-18 13:51:24 +0000