1
0
mirror of https://github.com/anope/anope.git synced 2026-06-25 03:06:37 +02:00

Added cmd_svsmode() function to IRCDProtoNew class.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1214 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
Robin Burchell w00t@inspircd.org
2008-09-30 18:45:10 +00:00
parent 3d4bf6d876
commit 24ae706b9c
13 changed files with 25 additions and 51 deletions
-1
View File
@@ -610,7 +610,6 @@ E int servernum;
E void pmodule_ircd_proto(IRCDProtoNew *);
E void pmodule_set_mod_current_buffer(void (*func) (int ac, char **av));
E void pmodule_cmd_svskill(void (*func) (const char *source, const char *user, const char *buf));
E void pmodule_cmd_svsmode(void (*func) (User * u, int ac, const char **av));
E void pmodule_cmd_372(void (*func) (const char *source, const char *msg));
E void pmodule_cmd_372_error(void (*func) (const char *source));
E void pmodule_cmd_375(void (*func) (const char *source));
+1 -1
View File
@@ -1076,7 +1076,6 @@ struct session_ {
typedef struct ircd_proto_ {
void (*ircd_set_mod_current_buffer)(int ac, char **av);
void (*ircd_cmd_svskill)(const char *source, const char *user, const char *buf);
void (*ircd_cmd_svsmode)(User * u, int ac, const char **av);
void (*ircd_cmd_372)(const char *source, const char *msg);
void (*ircd_cmd_372_error)(const char *source);
void (*ircd_cmd_375)(const char *source);
@@ -1152,6 +1151,7 @@ class IRCDProtoNew {
virtual void cmd_vhost_off(User *) { }
virtual void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *) = 0;
virtual void cmd_svskill(const char *source, const char *user, const char *buf) = 0;
virtual void cmd_svsmode(User *u, int ac, const char **av) = 0;
};
typedef struct ircd_modes_ {
+2 -8
View File
@@ -47,7 +47,6 @@ void initIrcdProto()
ircdproto.ircd_set_mod_current_buffer = NULL;
ircdproto.ircd_set_umode = NULL;
ircdproto.ircd_cmd_svskill = NULL;
ircdproto.ircd_cmd_svsmode = NULL;
ircdproto.ircd_cmd_372 = NULL;
ircdproto.ircd_cmd_372_error = NULL;
ircdproto.ircd_cmd_375 = NULL;
@@ -168,9 +167,9 @@ void anope_cmd_svskill(const char *source, const char *user, const char *fmt, ..
ircdproto.ircd_cmd_svskill(source, user, buf);
}
void anope_cmd_svsmode(User * u, int ac, const char **av)
void anope_cmd_svsmode(User *u, int ac, const char **av)
{
ircdproto.ircd_cmd_svsmode(u, ac, av);
ircdprotonew->cmd_svsmode(u, ac, av);
}
void anope_cmd_372(const char *source, const char *msg)
@@ -691,11 +690,6 @@ pmodule_cmd_svskill(void (*func) (const char *source, const char *user, const ch
ircdproto.ircd_cmd_svskill = func;
}
void pmodule_cmd_svsmode(void (*func) (User * u, int ac, const char **av))
{
ircdproto.ircd_cmd_svsmode = func;
}
void pmodule_cmd_372(void (*func) (const char *source, const char *msg))
{
ircdproto.ircd_cmd_372 = func;
+2 -5
View File
@@ -828,11 +828,9 @@ void BahamutIRCdProto::cmd_svskill(const char *source, const char *user, const c
* parv[3] - mode (or services id if old svs version)
* parv[4] - optional arguement (services id)
*/
void bahamut_cmd_svsmode(User * u, int ac, const char **av)
void BahamutIRCdProto::cmd_svsmode(User *u, int ac, const char **av)
{
send_cmd(ServerName, "SVSMODE %s %ld %s%s%s", u->nick,
(long int) u->timestamp, av[0], (ac == 2 ? " " : ""),
(ac == 2 ? av[1] : ""));
send_cmd(ServerName, "SVSMODE %s %ld %s", u->nick, static_cast<long>(u->timestamp), merge_args(ac, av));
}
/* SQUIT */
@@ -1544,7 +1542,6 @@ void bahamut_cmd_chghost(const char *nick, const char *vhost)
**/
void moduleAddAnopeCmds()
{
pmodule_cmd_svsmode(bahamut_cmd_svsmode);
pmodule_cmd_372(bahamut_cmd_372);
pmodule_cmd_372_error(bahamut_cmd_372_error);
pmodule_cmd_375(bahamut_cmd_375);
+1 -1
View File
@@ -59,7 +59,6 @@
#define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r
void bahamut_set_umode(User * user, int ac, const char **av);
void bahamut_cmd_svsmode(User * u, int ac, const char **av);
void bahamut_cmd_372(const char *source, const char *msg);
void bahamut_cmd_372_error(const char *source);
void bahamut_cmd_375(const char *source);
@@ -128,4 +127,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
void cmd_topic(const char *, const char *, const char *, const char *, time_t);
void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
void cmd_svskill(const char *source, const char *user, const char *buf);
void cmd_svsmode(User *u, int ac, const char **av);
} ircd_proto;
+2 -4
View File
@@ -890,10 +890,9 @@ void CharybdisProto::cmd_svskill(const char *source, const char *user, const cha
send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "KILL %s :%s", UseTS6 ? (ud2 ? ud2->uid : user) : user, buf);
}
void charybdis_cmd_svsmode(User * u, int ac, const char **av)
void CharybdisProto::cmd_svsmode(User *u, int ac, const char **av)
{
send_cmd((UseTS6 ? TS6SID : ServerName), "SVSMODE %s %s", u->nick,
av[0]);
send_cmd(UseTS6 ? TS6SID : ServerName, "SVSMODE %s %s", u->nick, av[0]);
}
/*
@@ -1810,7 +1809,6 @@ int charybdis_send_deaccount(int argc, char **argv)
**/
void moduleAddAnopeCmds()
{
pmodule_cmd_svsmode(charybdis_cmd_svsmode);
pmodule_cmd_372(charybdis_cmd_372);
pmodule_cmd_372_error(charybdis_cmd_372_error);
pmodule_cmd_375(charybdis_cmd_375);
+1 -1
View File
@@ -47,7 +47,6 @@
void charybdis_set_umode(User * user, int ac, const char **av);
void charybdis_cmd_svsmode(User * u, int ac, const char **av);
void charybdis_cmd_372(const char *source, const char *msg);
void charybdis_cmd_372_error(const char *source);
void charybdis_cmd_375(const char *source);
@@ -116,4 +115,5 @@ class CharybdisProto : public IRCDProtoNew {
void cmd_vhost_off(User *);
void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
void cmd_svskill(const char *source, const char *user, const char *buf);
void cmd_svsmode(User *u, int ac, const char **av);
} ircd_proto;
+5 -7
View File
@@ -571,13 +571,12 @@ void InspIRCdProto::cmd_svskill(const char *source, const char *user, const char
send_cmd(source, "KILL %s :%s", user, buf);
}
void inspircd_cmd_svsmode(User * u, int ac, const char **av)
void InspIRCdProto::cmd_svsmode(User *u, int ac, const char **av)
{
/* This was originally done using this:
send_cmd(s_NickServ, "MODE %s %s%s%s", u->nick, av[0], (ac == 2 ? " " : ""), (ac == 2 ? av[1] : ""));
* but that's the dirty way of doing things...
*/
send_cmd(s_NickServ, "MODE %s %s", u->nick, merge_args(ac, av));
/* This was originally done using this:
send_cmd(s_NickServ, "MODE %s %s%s%s", u->nick, av[0], (ac == 2 ? " " : ""), (ac == 2 ? av[1] : ""));
* but that's the dirty way of doing things... */
send_cmd(s_NickServ, "MODE %s %s", u->nick, merge_args(ac, av));
}
@@ -1787,7 +1786,6 @@ void inspircd_cmd_ctcp(const char *source, const char *dest, const char *buf)
**/
void moduleAddAnopeCmds()
{
pmodule_cmd_svsmode(inspircd_cmd_svsmode);
pmodule_cmd_372(inspircd_cmd_372);
pmodule_cmd_372_error(inspircd_cmd_372_error);
pmodule_cmd_375(inspircd_cmd_375);
+1 -1
View File
@@ -52,7 +52,6 @@
#define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r
void inspircd_set_umode(User * user, int ac, const char **av);
void inspircd_cmd_svsmode(User * u, int ac, const char **av);
void inspircd_cmd_372(const char *source, const char *msg);
void inspircd_cmd_372_error(const char *source);
void inspircd_cmd_375(const char *source);
@@ -132,4 +131,5 @@ class InspIRCdProto : public IRCDProtoNew {
void cmd_vhost_off(User *);
void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
void cmd_svskill(const char *source, const char *user, const char *buf);
void cmd_svsmode(User *u, int ac, const char **av);
} ircd_proto;
+2 -4
View File
@@ -832,10 +832,9 @@ void RatboxProto::cmd_svskill(const char *source, const char *user, const char *
send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "KILL %s :%s", UseTS6 ? (ud2 ? ud2->uid : user) : user, buf);
}
void ratbox_cmd_svsmode(User * u, int ac, const char **av)
void RatboxProto::cmd_svsmode(User *u, int ac, const char **av)
{
send_cmd((UseTS6 ? TS6SID : ServerName), "SVSMODE %s %s", u->nick,
av[0]);
send_cmd(UseTS6 ? TS6SID : ServerName, "SVSMODE %s %s", u->nick, av[0]);
}
/*
@@ -1702,7 +1701,6 @@ void ratbox_cmd_ctcp(const char *source, const char *dest, const char *buf)
**/
void moduleAddAnopeCmds()
{
pmodule_cmd_svsmode(ratbox_cmd_svsmode);
pmodule_cmd_372(ratbox_cmd_372);
pmodule_cmd_372_error(ratbox_cmd_372_error);
pmodule_cmd_375(ratbox_cmd_375);
+1 -1
View File
@@ -46,7 +46,6 @@
void ratbox_set_umode(User * user, int ac, const char **av);
void ratbox_cmd_svsmode(User * u, int ac, const char **av);
void ratbox_cmd_372(const char *source, const char *msg);
void ratbox_cmd_372_error(const char *source);
void ratbox_cmd_375(const char *source);
@@ -114,4 +113,5 @@ class RatboxProto : public IRCDProtoNew {
void cmd_topic(const char *, const char *, const char *, const char *, time_t);
void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
void cmd_svskill(const char *source, const char *user, const char *buf);
void cmd_svsmode(User *u, int ac, const char **av);
} ircd_proto;
+6 -16
View File
@@ -556,22 +556,13 @@ void UnrealIRCdProto::cmd_svskill(const char *source, const char *user, const ch
* parv[2] - modes to change
* parv[3] - Service Stamp (if mode == d)
*/
void unreal_cmd_svsmode(User * u, int ac, const char **av)
void UnrealIRCdProto::cmd_svsmode(User *u, int ac, const char **av)
{
if (ac >= 1) {
if (!u || !av[0]) {
return;
}
if (UseSVS2MODE) {
send_cmd(ServerName, "%s %s %s%s%s",
send_token("SVS2MODE", "v"), u->nick, av[0],
(ac == 2 ? " " : ""), (ac == 2 ? av[1] : ""));
} else {
send_cmd(ServerName, "%s %s %s%s%s",
send_token("SVSMODE", "n"), u->nick, av[0],
(ac == 2 ? " " : ""), (ac == 2 ? av[1] : ""));
}
}
if (ac >= 1) {
if (!u || !av[0]) return;
if (UseSVS2MODE) send_cmd(ServerName, "%s %s %s", send_token("SVS2MODE", "v"), u->nick, merge_args(ac, av));
else send_cmd(ServerName, "%s %s %s", send_token("SVSMODE", "n"), u->nick, merge_args(ac, av));
}
}
/* 372 */
@@ -2096,7 +2087,6 @@ void moduleAddIRCDMsgs(void) {
**/
void moduleAddAnopeCmds()
{
pmodule_cmd_svsmode(unreal_cmd_svsmode);
pmodule_cmd_372(unreal_cmd_372);
pmodule_cmd_372_error(unreal_cmd_372_error);
pmodule_cmd_375(unreal_cmd_375);
+1 -1
View File
@@ -81,7 +81,6 @@
#define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r
void unreal_set_umode(User * user, int ac, const char **av);
void unreal_cmd_svsmode(User * u, int ac, const char **av);
void unreal_cmd_372(const char *source, const char *msg);
void unreal_cmd_372_error(const char *source);
void unreal_cmd_375(const char *source);
@@ -151,4 +150,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
void cmd_vhost_off(User *);
void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
void cmd_svskill(const char *source, const char *user, const char *buf);
void cmd_svsmode(User *u, int ac, const char **av);
} ircd_proto;