1
0
mirror of https://github.com/anope/anope.git synced 2026-07-03 03:03:13 +02:00

Added cmd_bot_nick() function to IRCDProtoNew class.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1219 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
Robin Burchell w00t@inspircd.org
2008-09-30 18:45:11 +00:00
parent 00466f884c
commit d3a79969c2
13 changed files with 36 additions and 70 deletions
-1
View File
@@ -613,7 +613,6 @@ 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));
E void pmodule_cmd_376(void (*func) (const char *source));
E void pmodule_cmd_bot_nick(void (*func) (const char *nick, const char *user, const char *host, const char *real, const char *modes));
E void pmodule_cmd_kick(void (*func) (const char *source, const char *chan, const char *user, const char *buf));
E void pmodule_cmd_notice_ops(void (*func) (const char *source, const char *dest, const char *buf));
E void pmodule_cmd_notice(void (*func) (const char *source, const char *dest, const char *buf));
+1 -1
View File
@@ -1079,7 +1079,6 @@ typedef struct ircd_proto_ {
void (*ircd_cmd_372_error)(const char *source);
void (*ircd_cmd_375)(const char *source);
void (*ircd_cmd_376)(const char *source);
void (*ircd_cmd_bot_nick)(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void (*ircd_cmd_kick)(const char *source, const char *chan, const char *user, const char *buf);
void (*ircd_cmd_notice_ops)(const char *source, const char *dest, const char *buf);
void (*ircd_cmd_notice)(const char *source, const char *dest, const char *buf);
@@ -1151,6 +1150,7 @@ class IRCDProtoNew {
virtual void cmd_nick(const char *, const char *, const char *) = 0;
virtual void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *) { }
virtual void cmd_mode(const char *source, const char *dest, const char *buf) = 0;
virtual void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *) = 0;
};
typedef struct ircd_modes_ {
+1 -9
View File
@@ -50,7 +50,6 @@ void initIrcdProto()
ircdproto.ircd_cmd_372_error = NULL;
ircdproto.ircd_cmd_375 = NULL;
ircdproto.ircd_cmd_376 = NULL;
ircdproto.ircd_cmd_bot_nick = NULL;
ircdproto.ircd_cmd_kick = NULL;
ircdproto.ircd_cmd_notice_ops = NULL;
ircdproto.ircd_cmd_notice = NULL;
@@ -211,7 +210,7 @@ void anope_cmd_mode(const char *source, const char *dest, const char *fmt, ...)
void anope_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
{
ircdproto.ircd_cmd_bot_nick(nick, user, host, real, modes);
ircdprotonew->cmd_bot_nick(nick, user, host, real, modes);
}
void anope_cmd_kick(const char *source, const char *chan, const char *user, const char *fmt, ...)
@@ -698,13 +697,6 @@ void pmodule_cmd_376(void (*func) (const char *source))
ircdproto.ircd_cmd_376 = func;
}
void pmodule_cmd_bot_nick(void (*func)
(const char *nick, const char *user, const char *host, const char *real,
const char *modes))
{
ircdproto.ircd_cmd_bot_nick = func;
}
void pmodule_cmd_kick(void (*func)
(const char *source, const char *chan, const char *user, const char *buf))
{
+4 -7
View File
@@ -1283,13 +1283,11 @@ void bahamut_cmd_351(const char *source)
}
void bahamut_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real,
const char *modes)
void BahamutIRCdProto::cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
{
EnforceQlinedNick(nick, s_BotServ);
send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick,
(long int) time(NULL), modes, user, host, ServerName, real);
bahamut_cmd_sqline(nick, "Reserved for services");
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");
}
/* SVSNICK */
@@ -1532,7 +1530,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_372_error(bahamut_cmd_372_error);
pmodule_cmd_375(bahamut_cmd_375);
pmodule_cmd_376(bahamut_cmd_376);
pmodule_cmd_bot_nick(bahamut_cmd_bot_nick);
pmodule_cmd_kick(bahamut_cmd_kick);
pmodule_cmd_notice_ops(bahamut_cmd_notice_ops);
pmodule_cmd_notice(bahamut_cmd_notice);
+1 -1
View File
@@ -63,7 +63,6 @@ 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);
void bahamut_cmd_376(const char *source);
void bahamut_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void bahamut_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
void bahamut_cmd_notice_ops(const char *source, const char *dest, const char *buf);
void bahamut_cmd_notice(const char *source, const char *dest, const char *buf);
@@ -128,4 +127,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
void cmd_nick(const char *, const char *, const char *);
void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
void cmd_mode(const char *source, const char *dest, const char *buf);
void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
} ircd_proto;
+9 -16
View File
@@ -978,22 +978,16 @@ void charybdis_cmd_connect(int servernum)
charybdis_cmd_svinfo();
}
void charybdis_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real,
const char *modes)
void CharybdisProto::cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
{
EnforceQlinedNick(nick, NULL);
if (UseTS6) {
char *uidbuf = ts6_uid_retrieve();
send_cmd(TS6SID, "UID %s 1 %ld %s %s %s 0 %s :%s", nick,
(long int) time(NULL), modes, user, host, uidbuf,
real);
new_uid(nick, uidbuf);
} else {
send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick,
(long int) time(NULL), modes, user, host, ServerName,
real);
}
charybdis_cmd_sqline(nick, "Reserved for services");
EnforceQlinedNick(nick, NULL);
if (UseTS6) {
char *uidbuf = ts6_uid_retrieve();
send_cmd(TS6SID, "UID %s 1 %ld %s %s %s 0 %s :%s", nick, static_cast<long>(time(NULL)), modes, user, host, uidbuf, real);
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");
}
void charybdis_cmd_part(const char *nick, const char *chan, const char *buf)
@@ -1796,7 +1790,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_372_error(charybdis_cmd_372_error);
pmodule_cmd_375(charybdis_cmd_375);
pmodule_cmd_376(charybdis_cmd_376);
pmodule_cmd_bot_nick(charybdis_cmd_bot_nick);
pmodule_cmd_kick(charybdis_cmd_kick);
pmodule_cmd_notice_ops(charybdis_cmd_notice_ops);
pmodule_cmd_notice(charybdis_cmd_notice);
+1 -1
View File
@@ -51,7 +51,6 @@ 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);
void charybdis_cmd_376(const char *source);
void charybdis_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void charybdis_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
void charybdis_cmd_notice_ops(const char *source, const char *dest, const char *buf);
void charybdis_cmd_notice(const char *source, const char *dest, const char *buf);
@@ -115,4 +114,5 @@ class CharybdisProto : public IRCDProtoNew {
void cmd_svsmode(User *u, int ac, const char **av);
void cmd_nick(const char *, const char *, const char *);
void cmd_mode(const char *source, const char *dest, const char *buf);
void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
} ircd_proto;
+3 -7
View File
@@ -761,13 +761,10 @@ int anope_event_fjoin(const char *source, int ac, const char **av)
return MOD_CONT;
}
void
inspircd_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real,
const char *modes)
void InspIRCdProto::cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
{
send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s",
(long int) time(NULL), nick, host, host, user, modes, real);
send_cmd(nick, "OPERTYPE Bot");
send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real);
send_cmd(nick, "OPERTYPE Bot");
}
void inspircd_cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
@@ -1781,7 +1778,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_372_error(inspircd_cmd_372_error);
pmodule_cmd_375(inspircd_cmd_375);
pmodule_cmd_376(inspircd_cmd_376);
pmodule_cmd_bot_nick(inspircd_cmd_bot_nick);
pmodule_cmd_kick(inspircd_cmd_kick);
pmodule_cmd_notice_ops(inspircd_cmd_notice_ops);
pmodule_cmd_notice(inspircd_cmd_notice);
+1 -1
View File
@@ -56,7 +56,6 @@ 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);
void inspircd_cmd_376(const char *source);
void inspircd_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void inspircd_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
void inspircd_cmd_notice_ops(const char *source, const char *dest, const char *buf);
void inspircd_cmd_notice(const char *source, const char *dest, const char *buf);
@@ -132,4 +131,5 @@ class InspIRCdProto : public IRCDProtoNew {
void cmd_nick(const char *, const char *, const char *);
void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
void cmd_mode(const char *source, const char *dest, const char *buf);
void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
} ircd_proto;
+8 -15
View File
@@ -918,22 +918,16 @@ void ratbox_cmd_connect(int servernum)
ratbox_cmd_svinfo();
}
void ratbox_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real,
const char *modes)
void RatboxProto::cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
{
EnforceQlinedNick(nick, NULL);
if (UseTS6) {
EnforceQlinedNick(nick, NULL);
if (UseTS6) {
char *uidbuf = ts6_uid_retrieve();
send_cmd(TS6SID, "UID %s 1 %ld %s %s %s 0 %s :%s", nick,
(long int) time(NULL), modes, user, host, uidbuf,
real);
new_uid(nick, uidbuf);
} else {
send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick,
(long int) time(NULL), modes, user, host, ServerName,
real);
}
ratbox_cmd_sqline(nick, "Reserved for services");
send_cmd(TS6SID, "UID %s 1 %ld %s %s %s 0 %s :%s", nick, static_cast<long>(time(NULL)), modes, user, host, uidbuf, real);
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");
}
void ratbox_cmd_part(const char *nick, const char *chan, const char *buf)
@@ -1688,7 +1682,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_372_error(ratbox_cmd_372_error);
pmodule_cmd_375(ratbox_cmd_375);
pmodule_cmd_376(ratbox_cmd_376);
pmodule_cmd_bot_nick(ratbox_cmd_bot_nick);
pmodule_cmd_kick(ratbox_cmd_kick);
pmodule_cmd_notice_ops(ratbox_cmd_notice_ops);
pmodule_cmd_notice(ratbox_cmd_notice);
+1 -1
View File
@@ -50,7 +50,6 @@ 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);
void ratbox_cmd_376(const char *source);
void ratbox_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void ratbox_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
void ratbox_cmd_notice_ops(const char *source, const char *dest, const char *buf);
void ratbox_cmd_notice(const char *source, const char *dest, const char *buf);
@@ -113,4 +112,5 @@ class RatboxProto : public IRCDProtoNew {
void cmd_svsmode(User *u, int ac, const char **av);
void cmd_nick(const char *, const char *, const char *);
void cmd_mode(const char *source, const char *dest, const char *buf);
void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
} ircd_proto;
+5 -9
View File
@@ -608,15 +608,12 @@ void UnrealIRCdProto::cmd_mode(const char *source, const char *dest, const char
send_cmd(source, "%s %s %s", send_token("MODE", "G"), dest, buf);
}
void unreal_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real,
const char *modes)
void UnrealIRCdProto::cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
{
EnforceQlinedNick(nick, s_BotServ);
send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s %s%s :%s",
send_token("NICK", "&"), nick, (long int) time(NULL), user,
host, ServerName, modes, host, (myIrcd->nickip ? " *" : " "),
real);
unreal_cmd_sqline(nick, "Reserved for services");
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");
}
void unreal_cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
@@ -2083,7 +2080,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_372_error(unreal_cmd_372_error);
pmodule_cmd_375(unreal_cmd_375);
pmodule_cmd_376(unreal_cmd_376);
pmodule_cmd_bot_nick(unreal_cmd_bot_nick);
pmodule_cmd_kick(unreal_cmd_kick);
pmodule_cmd_notice_ops(unreal_cmd_notice_ops);
pmodule_cmd_notice(unreal_cmd_notice);
+1 -1
View File
@@ -85,7 +85,6 @@ 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);
void unreal_cmd_376(const char *source);
void unreal_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
void unreal_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
void unreal_cmd_notice_ops(const char *source, const char *dest, const char *buf);
void unreal_cmd_notice(const char *source, const char *dest, const char *buf);
@@ -151,4 +150,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
void cmd_nick(const char *, const char *, const char *);
void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
void cmd_mode(const char *source, const char *dest, const char *buf);
void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
} ircd_proto;