summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ircd.c8
-rw-r--r--src/protocol/bahamut.c6
-rw-r--r--src/protocol/bahamut.h2
-rw-r--r--src/protocol/charybdis.c5
-rw-r--r--src/protocol/charybdis.h2
-rw-r--r--src/protocol/inspircd11.c6
-rwxr-xr-xsrc/protocol/inspircd11.h2
-rw-r--r--src/protocol/ratbox.c7
-rw-r--r--src/protocol/ratbox.h1
-rw-r--r--src/protocol/unreal32.c8
-rw-r--r--src/protocol/unreal32.h2
11 files changed, 14 insertions, 35 deletions
diff --git a/src/ircd.c b/src/ircd.c
index 30224452a..d75563dd3 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -63,7 +63,6 @@ void initIrcdProto()
ircdproto.ircd_cmd_242 = NULL;
ircdproto.ircd_cmd_243 = NULL;
ircdproto.ircd_cmd_211 = NULL;
- ircdproto.ircd_cmd_svshold = NULL;
ircdproto.ircd_cmd_release_svshold = NULL;
ircdproto.ircd_cmd_unsgline = NULL;
ircdproto.ircd_cmd_unszline = NULL;
@@ -497,7 +496,7 @@ void anope_cmd_connect()
void anope_cmd_svshold(const char *nick)
{
- ircdproto.ircd_cmd_svshold(nick);
+ ircdprotonew->cmd_svshold(nick);
}
void anope_cmd_release_svshold(const char *nick)
@@ -705,11 +704,6 @@ void pmodule_cmd_211(void (*func) (const char *buf))
ircdproto.ircd_cmd_211 = func;
}
-void pmodule_cmd_svshold(void (*func) (const char *nick))
-{
- ircdproto.ircd_cmd_svshold = func;
-}
-
void pmodule_cmd_release_svshold(void (*func) (const char *nick))
{
ircdproto.ircd_cmd_release_svshold = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 916275e16..bb64e73d9 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -480,10 +480,9 @@ void BahamutIRCdProto::cmd_mode(const char *source, const char *dest, const char
}
/* SVSHOLD - set */
-void bahamut_cmd_svshold(const char *nick)
+void BahamutIRCdProto::cmd_svshold(const char *nick)
{
- send_cmd(ServerName, "SVSHOLD %s %d :%s", nick, NSReleaseTimeout,
- "Being held for registered user");
+ send_cmd(ServerName, "SVSHOLD %s %d :%s", nick, NSReleaseTimeout, "Being held for registered user");
}
/* SVSHOLD - release */
@@ -1397,7 +1396,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(bahamut_cmd_242);
pmodule_cmd_243(bahamut_cmd_243);
pmodule_cmd_211(bahamut_cmd_211);
- pmodule_cmd_svshold(bahamut_cmd_svshold);
pmodule_cmd_release_svshold(bahamut_cmd_release_svshold);
pmodule_cmd_unsgline(bahamut_cmd_unsgline);
pmodule_cmd_unszline(bahamut_cmd_unszline);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 5d47a8533..351cc9df0 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -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_svshold(const char *nick);
void bahamut_cmd_release_svshold(const char *nick);
void bahamut_cmd_unsgline(const char *mask);
void bahamut_cmd_unszline(const char *mask);
@@ -113,4 +112,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
void cmd_unsqline(const char *);
void cmd_sqline(const char *, const char *);
void cmd_connect();
+ void cmd_svshold(const char *);
} ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 7c9ef39a0..7987d0e6d 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1411,9 +1411,9 @@ int anope_event_capab(const char *source, int ac, const char **av)
}
/* SVSHOLD - set */
-void charybdis_cmd_svshold(const char *nick)
+void CharybdisProto::cmd_svshold(const char *nick)
{
- send_cmd(NULL, "ENCAP * NICKDELAY 300 %s", nick);
+ send_cmd(NULL, "ENCAP * NICKDELAY 300 %s", nick);
}
/* SVSHOLD - release */
@@ -1670,7 +1670,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(charybdis_cmd_242);
pmodule_cmd_243(charybdis_cmd_243);
pmodule_cmd_211(charybdis_cmd_211);
- pmodule_cmd_svshold(charybdis_cmd_svshold);
pmodule_cmd_release_svshold(charybdis_cmd_release_svshold);
pmodule_cmd_unsgline(charybdis_cmd_unsgline);
pmodule_cmd_unszline(charybdis_cmd_unszline);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index e81447a7b..1947a4d36 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -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_svshold(const char *nick);
void charybdis_cmd_release_svshold(const char *nick);
void charybdis_cmd_unsgline(const char *mask);
void charybdis_cmd_unszline(const char *mask);
@@ -110,4 +109,5 @@ class CharybdisProto : public IRCDProtoNew {
void cmd_svsnick(const char *, const char *, time_t);
void cmd_vhost_on(const char *, const char *, const char *);
void cmd_connect();
+ void cmd_svshold(const char *);
} ircd_proto;
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 31ca0311b..6e005d144 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1456,10 +1456,9 @@ int anope_event_capab(const char *source, int ac, const char **av)
}
/* SVSHOLD - set */
-void inspircd_cmd_svshold(const char *nick)
+void InspIRCdProto::cmd_svshold(const char *nick)
{
- send_cmd(s_OperServ, "SVSHOLD %s %ds :%s", nick, NSReleaseTimeout,
- "Being held for registered user");
+ send_cmd(s_OperServ, "SVSHOLD %s %ds :%s", nick, NSReleaseTimeout, "Being held for registered user");
}
/* SVSHOLD - release */
@@ -1648,7 +1647,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(inspircd_cmd_242);
pmodule_cmd_243(inspircd_cmd_243);
pmodule_cmd_211(inspircd_cmd_211);
- pmodule_cmd_svshold(inspircd_cmd_svshold);
pmodule_cmd_release_svshold(inspircd_cmd_release_svshold);
pmodule_cmd_unsgline(inspircd_cmd_unsgline);
pmodule_cmd_unszline(inspircd_cmd_unszline);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 762435f9a..33070d036 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -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_svshold(const char *nick);
void inspircd_cmd_release_svshold(const char *nick);
void inspircd_cmd_unsgline(const char *mask);
void inspircd_cmd_unszline(const char *mask);
@@ -119,4 +118,5 @@ class InspIRCdProto : public IRCDProtoNew {
void cmd_squit(const char *, const char *);
void cmd_vhost_on(const char *, const char *, const char *);
void cmd_connect();
+ void cmd_svshold(const char *);
} ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index d1baa51d7..f9aecd125 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1337,12 +1337,6 @@ int anope_event_capab(const char *source, int ac, const char **av)
return MOD_CONT;
}
-/* SVSHOLD - set */
-void ratbox_cmd_svshold(const char *nick)
-{
- /* Not supported by this IRCD */
-}
-
/* SVSHOLD - release */
void ratbox_cmd_release_svshold(const char *nick)
{
@@ -1560,7 +1554,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(ratbox_cmd_242);
pmodule_cmd_243(ratbox_cmd_243);
pmodule_cmd_211(ratbox_cmd_211);
- pmodule_cmd_svshold(ratbox_cmd_svshold);
pmodule_cmd_release_svshold(ratbox_cmd_release_svshold);
pmodule_cmd_unsgline(ratbox_cmd_unsgline);
pmodule_cmd_unszline(ratbox_cmd_unszline);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index ba12efbea..04720a157 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -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_svshold(const char *nick);
void ratbox_cmd_release_svshold(const char *nick);
void ratbox_cmd_unsgline(const char *mask);
void ratbox_cmd_unszline(const char *mask);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index eb3417f22..e34531e62 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1338,11 +1338,10 @@ int anope_event_whois(const char *source, int ac, const char **av)
}
/* SVSHOLD - set */
-void unreal_cmd_svshold(const char *nick)
+void UnrealIRCdProto::cmd_svshold(const char *nick)
{
- send_cmd(NULL, "%s + Q H %s %s %ld %ld :%s", send_token("TKL", "BD"),
- nick, ServerName, (long int) time(NULL) + NSReleaseTimeout,
- (long int) time(NULL), "Being held for registered user");
+ send_cmd(NULL, "%s + Q H %s %s %ld %ld :%s", send_token("TKL", "BD"), nick, ServerName, static_cast<long>(time(NULL) + NSReleaseTimeout),
+ static_cast<long>(time(NULL)), "Being held for registered user");
}
/* SVSHOLD - release */
@@ -1940,7 +1939,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(unreal_cmd_242);
pmodule_cmd_243(unreal_cmd_243);
pmodule_cmd_211(unreal_cmd_211);
- pmodule_cmd_svshold(unreal_cmd_svshold);
pmodule_cmd_release_svshold(unreal_cmd_release_svshold);
pmodule_cmd_unsgline(unreal_cmd_unsgline);
pmodule_cmd_unszline(unreal_cmd_unszline);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index b1c35c8a9..4dd1fcb57 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -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_svshold(const char *nick);
void unreal_cmd_release_svshold(const char *nick);
void unreal_cmd_unsgline(const char *mask);
void unreal_cmd_unszline(const char *mask);
@@ -139,4 +138,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
void cmd_chg_nick(const char *, const char *);
void cmd_vhost_on(const char *, const char *, const char *);
void cmd_connect();
+ void cmd_svshold(const char *);
} ircd_proto;