From cf98cd3e06e4de0f9902824b0ef8239e947c5b6a Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 4 Oct 2010 13:59:30 -0400 Subject: Changed the protocol handling system to use a vector of strings instead of C style arrays. Burned the old process/split_buf/memory.c code --- include/anope.h | 2 +- include/channels.h | 7 + include/extern.h | 27 +- include/modules.h | 3 +- include/servers.h | 4 +- modules/protocol/bahamut.cpp | 294 ++++++++++----------- modules/protocol/inspircd11.cpp | 476 ++++++++++++++++----------------- modules/protocol/inspircd12.cpp | 440 +++++++++++++++---------------- modules/protocol/inspircd20.cpp | 442 +++++++++++++++---------------- modules/protocol/ratbox.cpp | 376 +++++++++++++------------- modules/protocol/unreal32.cpp | 572 +++++++++++++++++++--------------------- src/channels.cpp | 164 +++++------- src/memory.cpp | 67 ----- src/messages.cpp | 33 ++- src/misc.cpp | 36 --- src/modules.cpp | 2 +- src/process.cpp | 148 ++++------- src/servers.cpp | 19 +- src/users.cpp | 36 +-- 19 files changed, 1413 insertions(+), 1735 deletions(-) delete mode 100644 src/memory.cpp diff --git a/include/anope.h b/include/anope.h index cbc87bf7b..ce206bc8e 100644 --- a/include/anope.h +++ b/include/anope.h @@ -309,7 +309,7 @@ namespace Anope * @param func A callback function that will be called when this message is received * @return The new message object */ - extern CoreExport Message *AddMessage(const string &name, int (*func)(const string &source, int ac, const char **av)); + extern CoreExport Message *AddMessage(const string &name, bool (*func)(const string &source, const std::vector ¶ms)); /** Deletes a message from Anope * XXX Im not sure what will happen if this function is called indirectly from message function pointed to by this message.. must check diff --git a/include/channels.h b/include/channels.h index 41b252165..d0b0b9dd5 100644 --- a/include/channels.h +++ b/include/channels.h @@ -248,6 +248,13 @@ class CoreExport Channel : public Extensible, public Flags */ void SetModes(BotInfo *bi, bool EnforceMLock, const char *cmodes, ...); + /** Set a string of modes internally on a channel + * @param setter the setter (if it is a user) + * @param mode the modes + * @param EnforceMLock true to enforce mlock + */ + void SetModesInternal(User *setter, const Anope::string &modes, bool EnforceMLock = false); + /** Kick a user from a channel internally * @param source The sender of the kick * @param nick The nick being kicked diff --git a/include/extern.h b/include/extern.h index 89f6f1e0a..86f4f9c8b 100644 --- a/include/extern.h +++ b/include/extern.h @@ -61,18 +61,16 @@ E void get_channel_stats(long *nrec, long *memuse); E Channel *findchan(const Anope::string &chan); -E void ChanSetInternalModes(Channel *c, int ac, const char **av, User *setter = NULL); /* this is dieing soon anyway */ - E User *nc_on_chan(Channel *c, const NickCore *nc); E int get_access_level(ChannelInfo *ci, NickAlias *na); E int get_access_level(ChannelInfo *ci, NickCore *nc); E Anope::string get_xop_level(int level); -E void do_cmode(const Anope::string &source, int ac, const char **av); -E void do_join(const Anope::string &source, int ac, const char **av); -E void do_kick(const Anope::string &source, int ac, const char **av); -E void do_part(const Anope::string &source, int ac, const char **av); +E void do_cmode(const Anope::string &source, const Anope::string &channel, const Anope::string &modes, const Anope::string &ts); +E void do_join(const Anope::string &source, const Anope::string &channels, const Anope::string &ts); +E void do_kick(const Anope::string &source, const Anope::string &channel, const Anope::string &users, const Anope::string &reason); +E void do_part(const Anope::string &source, const Anope::string &channels, const Anope::string &reason); E void MassChannelModes(BotInfo *bi, const Anope::string &modes); E void chan_set_correct_modes(User *user, Channel *c, int give_modes); @@ -201,11 +199,6 @@ class UplinkSocket : public ConnectionSocket bool Read(const Anope::string &buf); }; -/**** memory.c ****/ - -E void *scalloc(long elsize, long els); -E void *srealloc(void *oldptr, long newsize); - /**** memoserv.c ****/ E void ms_init(); @@ -222,10 +215,10 @@ E int m_away(const Anope::string &source, const Anope::string &msg); E int m_kill(const Anope::string &nick, const Anope::string &msg); E int m_motd(const Anope::string &source); E int m_privmsg(const Anope::string &source, const Anope::string &receiver, const Anope::string &message); -E int m_stats(const Anope::string &source, int ac, const char **av); +E bool m_stats(const Anope::string &source, const std::vector &); E int m_whois(const Anope::string &source, const Anope::string &who); -E int m_time(const Anope::string &source, int ac, const char **av); -E int m_version(const Anope::string &source, int ac, const char **av); +E bool m_time(const Anope::string &source, const std::vector &); +E bool m_version(const Anope::string &source, const std::vector &); /**** misc.c ****/ @@ -255,7 +248,6 @@ E bool isvalidchar(char c); E Anope::string myStrGetToken(const Anope::string &str, char dilim, int token_number); E Anope::string myStrGetTokenRemainder(const Anope::string &str, char dilim, int token_number); E int myNumToken(const Anope::string &str, char dilim); -E void doCleanBuffer(char *str); E void EnforceQlinedNick(const Anope::string &nick, const Anope::string &killer); E bool nickIsServices(const Anope::string &nick, bool bot); @@ -313,7 +305,6 @@ E IgnoreData *get_ignore(const Anope::string &nick); E int delete_ignore(const Anope::string &nick); E int clear_ignores(); -E int split_buf(char *buf, const char ***argv, int colon_special); E void process(const Anope::string &buf); /**** send.c ****/ @@ -361,8 +352,8 @@ E Anope::string TS6SID; E User *do_nick(const Anope::string &source, const Anope::string &nick, const Anope::string &username, const Anope::string &host, const Anope::string &server, const Anope::string &realname, time_t ts, const Anope::string &ip, const Anope::string &vhost, const Anope::string &uid, const Anope::string &modes); -E void do_umode(const Anope::string &source, int ac, const char **av); -E void do_quit(const Anope::string &source, int ac, const char **av); +E void do_umode(const Anope::string &, const Anope::string &user, const Anope::string &modes); +E void do_quit(const Anope::string &source, const Anope::string &reason); E void do_kill(const Anope::string &source, const Anope::string &reason); E bool is_oper(User *user); diff --git a/include/modules.h b/include/modules.h index a48e7385f..6d5b5d6e9 100644 --- a/include/modules.h +++ b/include/modules.h @@ -159,7 +159,6 @@ enum Priority { PRIORITY_FIRST, PRIORITY_DONTCARE, PRIORITY_LAST, PRIORITY_BEFOR /* Module types, in the order in which they are unloaded. The order these are in is IMPORTANT */ enum MODType { MT_BEGIN, THIRD, QATESTED, SUPPORTED, CORE, DATABASE, ENCRYPTION, PROTOCOL, SOCKETENGINE, MT_END }; -struct Message; typedef std::multimap message_map; extern CoreExport message_map MessageMap; class Module; @@ -1269,7 +1268,7 @@ class service_reference : public dynamic_reference struct Message { Anope::string name; - int (*func)(const Anope::string &source, int ac, const char **av); + bool (*func)(const Anope::string &source, const std::vector ¶ms); }; #endif // MODULES_H diff --git a/include/servers.h b/include/servers.h index 514660286..2ba9510ba 100644 --- a/include/servers.h +++ b/include/servers.h @@ -4,10 +4,10 @@ /* Anope */ extern CoreExport Server *Me; -extern CoreExport void CapabParse(int ac, const char **av); +extern CoreExport void CapabParse(const std::vector ¶ms); extern CoreExport void do_server(const Anope::string &source, const Anope::string &servername, unsigned int hops, const Anope::string &descript, const Anope::string &numeric); -extern CoreExport void do_squit(const Anope::string &source, int ac, const char **av); +extern CoreExport void do_squit(const Anope::string &source, const Anope::string &server); extern CoreExport const char *ts6_uid_retrieve(); extern CoreExport const char *ts6_sid_retrieve(); diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp index efe5e4d16..283c4014b 100644 --- a/modules/protocol/bahamut.cpp +++ b/modules/protocol/bahamut.cpp @@ -293,15 +293,15 @@ class BahamutIRCdProto : public IRCDProto } ircd_proto; /* EVENT: SJOIN */ -int anope_event_sjoin(const Anope::string &source, int ac, const char **av) +bool event_sjoin(const Anope::string &source, const std::vector ¶ms) { - Channel *c = findchan(av[1]); - time_t ts = Anope::string(av[0]).is_pos_number_only() ? convertTo(av[0]) : 0; + Channel *c = findchan(params[1]); + time_t ts = Anope::string(params[0]).is_pos_number_only() ? convertTo(params[0]) : 0; bool keep_their_modes = false; if (!c) { - c = new Channel(av[1], ts); + c = new Channel(params[1], ts); c->SetFlag(CH_SYNCING); } /* Our creation time is newer than what the server gave us */ @@ -318,16 +318,21 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av) keep_their_modes = false; /* If we need to keep their modes, and this SJOIN string contains modes */ - if (keep_their_modes && ac >= 4) + if (keep_their_modes && params.size() >= 4) { /* Set the modes internally */ - ChanSetInternalModes(c, ac - 3, av + 2); + Anope::string modes; + for (unsigned i = 2; i < params.size(); ++i) + modes += " " + params[i]; + if (!modes.empty()) + modes.erase(modes.begin()); + c->SetModesInternal(NULL, modes); } /* For a reason unknown to me, bahamut will send a SJOIN from the user joining a channel * if the channel already existed */ - if (!c->HasFlag(CH_SYNCING) && ac == 2) + if (!c->HasFlag(CH_SYNCING) && params.size() == 2) { User *u = finduser(source); if (!u) @@ -355,7 +360,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av) } else { - spacesepstream sep(av[ac - 1]); + spacesepstream sep(params[params.size() - 1]); Anope::string buf; while (sep.GetToken(buf)) { @@ -418,7 +423,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av) c->Sync(); } - return MOD_CONT; + return true; } /* @@ -439,17 +444,17 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av) ** parv[0] = new nickname ** parv[1] = hopcount */ -int anope_event_nick(const Anope::string &source, int ac, const char **av) +bool event_nick(const Anope::string &source, const std::vector ¶ms) { User *user; - if (ac != 2) + if (params.size() != 2) { - user = do_nick(source, av[0], av[4], av[5], av[6], av[9], Anope::string(av[2]).is_pos_number_only() ? convertTo(av[2]) : 0, av[8], "", "", av[3]); + user = do_nick(source, params[0], params[4], params[5], params[6], params[9], Anope::string(params[2]).is_pos_number_only() ? convertTo(params[2]) : 0, params[8], "", "", params[3]); if (user) { NickAlias *na; - if (user->timestamp == convertTo(av[7]) && (na = findnick(user->nick))) + if (user->timestamp == convertTo(params[7]) && (na = findnick(user->nick))) { user->Login(na->nc); user->SetMode(NickServ, UMODE_REGISTERED); @@ -459,214 +464,199 @@ int anope_event_nick(const Anope::string &source, int ac, const char **av) } } else - do_nick(source, av[0], "", "", "", "", Anope::string(av[1]).is_pos_number_only() ? convertTo(av[1]) : 0, "", "", "", ""); - return MOD_CONT; + do_nick(source, params[0], "", "", "", "", Anope::string(params[1]).is_pos_number_only() ? convertTo(params[1]) : 0, "", "", "", ""); + return true; } /* EVENT : CAPAB */ -int anope_event_capab(const Anope::string &source, int ac, const char **av) +bool event_capab(const Anope::string &source, const std::vector ¶ms) { - CapabParse(ac, av); - return MOD_CONT; + CapabParse(params); + return true; } /* EVENT : OS */ -int anope_event_os(const Anope::string &source, int ac, const char **av) +bool event_os(const Anope::string &source, const std::vector ¶ms) { - if (ac < 1) - return MOD_CONT; - m_privmsg(source, Config->s_OperServ, av[0]); - return MOD_CONT; + if (!params.empty()) + m_privmsg(source, Config->s_OperServ, params[0]); + return true; } /* EVENT : NS */ -int anope_event_ns(const Anope::string &source, int ac, const char **av) +bool event_ns(const Anope::string &source, const std::vector ¶ms) { - if (ac < 1) - return MOD_CONT; - m_privmsg(source, Config->s_NickServ, av[0]); - return MOD_CONT; + if (!params.empty()) + m_privmsg(source, Config->s_NickServ, params[0]); + return true; } /* EVENT : MS */ -int anope_event_ms(const Anope::string &source, int ac, const char **av) +bool event_ms(const Anope::string &source, const std::vector ¶ms) { - if (ac < 1) - return MOD_CONT; - m_privmsg(source, Config->s_MemoServ, av[0]); - return MOD_CONT; + if (!params.empty()) + m_privmsg(source, Config->s_MemoServ, params[0]); + return true; } /* EVENT : HS */ -int anope_event_hs(const Anope::string &source, int ac, const char **av) +bool event_hs(const Anope::string &source, const std::vector ¶ms) { - if (ac < 1) - return MOD_CONT; - m_privmsg(source, Config->s_HostServ, av[0]); - return MOD_CONT; + if (!params.empty()) + m_privmsg(source, Config->s_HostServ, params[0]); + return true; } /* EVENT : CS */ -int anope_event_cs(const Anope::string &source, int ac, const char **av) +bool event_cs(const Anope::string &source, const std::vector ¶ms) { - if (ac < 1) - return MOD_CONT; - m_privmsg(source, Config->s_ChanServ, av[0]); - return MOD_CONT; + if (!params.empty()) + m_privmsg(source, Config->s_ChanServ, params[0]); + return true; } -int anope_event_436(const Anope::string &source, int ac, const char **av) +bool event_436(const Anope::string &source, const std::vector ¶ms) { - if (ac < 1) - return MOD_CONT; - - m_nickcoll(av[0]); - return MOD_CONT; + if (!params.empty()) + m_nickcoll(params[0]); + return true; } /* EVENT : SERVER */ -int anope_event_server(const Anope::string &source, int ac, const char **av) +bool event_server(const Anope::string &source, const std::vector ¶ms) { - do_server(source, av[0], Anope::string(av[1]).is_pos_number_only() ? convertTo(av[1]) : 0, av[2], ""); - return MOD_CONT; + do_server(source, params[0], Anope::string(params[1]).is_pos_number_only() ? convertTo(params[1]) : 0, params[2], ""); + return true; } /* EVENT : PRIVMSG */ -int anope_event_privmsg(const Anope::string &source, int ac, const char **av) +bool event_privmsg(const Anope::string &source, const std::vector ¶ms) { - if (ac != 2) - return MOD_CONT; - m_privmsg(source, av[0], av[1]); - return MOD_CONT; + if (params.size() > 1) + m_privmsg(source, params[0], params[1]); + return true; } -int anope_event_part(const Anope::string &source, int ac, const char **av) +bool event_part(const Anope::string &source, const std::vector ¶ms) { - if (ac < 1 || ac > 2) - return MOD_CONT; - do_part(source, ac, av); - return MOD_CONT; + if (!params.empty()) + do_part(source, params[0], params.size() > 1 ? params[1] : ""); + return true; } -int anope_event_whois(const Anope::string &source, int ac, const char **av) +bool event_whois(const Anope::string &source, const std::vector ¶ms) { - if (!source.empty() && ac >= 1) - m_whois(source, av[0]); - return MOD_CONT; + if (!source.empty() && params.size() > 0) + m_whois(source, params[0]); + return true; } -int anope_event_topic(const Anope::string &source, int ac, const char **av) +bool event_topic(const Anope::string &source, const std::vector ¶ms) { - if (ac != 4) - return MOD_CONT; + if (params.size() < 4) + return true; - Channel *c = findchan(av[0]); + Channel *c = findchan(params[0]); if (!c) { - Log() << "TOPIC for nonexistant channel " << av[0]; - return MOD_CONT; + Log() << "TOPIC for nonexistant channel " << params[0]; + return true; } - c->ChangeTopicInternal(av[1], av[3], Anope::string(av[2]).is_pos_number_only() ? convertTo(av[2]) : Anope::CurTime); + c->ChangeTopicInternal(params[1], params[3], Anope::string(params[2]).is_pos_number_only() ? convertTo(params[2]) : Anope::CurTime); - return MOD_CONT; + return true; } -int anope_event_squit(const Anope::string &source, int ac, const char **av) +bool event_squit(const Anope::string &source, const std::vector ¶ms) { - if (ac != 2) - return MOD_CONT; - do_squit(source, ac, av); - return MOD_CONT; + if (params.size() > 0) + do_squit(source, params[0]); + return true; } -int anope_event_quit(const Anope::string &source, int ac, const char **av) +bool event_quit(const Anope::string &source, const std::vector ¶ms) { - if (ac != 1) - return MOD_CONT; - do_quit(source, ac, av); - return MOD_CONT; + if (params.size() > 0) + do_quit(source, params[0]); + return true; } /* EVENT: MODE */ -int anope_event_mode(const Anope::string &source, int ac, const char **av) +bool event_mode(const Anope::string &source, const std::vector ¶ms) { - if (ac < 2) - return MOD_CONT; + if (params.size() < 3) + return true; - if (*av[0] == '#' || *av[0] == '&') - do_cmode(source, ac, av); + if (params[0][0] == '#' || params[0][0] == '&') + do_cmode(source, params[0], params[2], params[1]); else - do_umode(source, ac, av); - return MOD_CONT; + do_umode(source, params[0], params[1]); + return true; } /* EVENT: KILL */ -int anope_event_kill(const Anope::string &source, int ac, const char **av) +bool event_kill(const Anope::string &source, const std::vector ¶ms) { - if (ac != 2) - return MOD_CONT; - - m_kill(av[0], av[1]); - return MOD_CONT; + if (params.size() > 1) + m_kill(params[0], params[1]); + return true; } /* EVENT: KICK */ -int anope_event_kick(const Anope::string &source, int ac, const char **av) +bool event_kick(const Anope::string &source, const std::vector ¶ms) { - if (ac != 3) - return MOD_CONT; - do_kick(source, ac, av); - return MOD_CONT; + if (params.size() > 2) + do_kick(source, params[0], params[1], params[2]); + return true; } /* EVENT: JOIN */ -int anope_event_join(const Anope::string &source, int ac, const char **av) +bool event_join(const Anope::string &source, const std::vector ¶ms) { - if (ac != 1) - return MOD_CONT; - do_join(source, ac, av); - return MOD_CONT; + if (params.size() >= 2) + do_join(source, params[0], params[1]); + return true; } /* EVENT: MOTD */ -int anope_event_motd(const Anope::string &source, int ac, const char **av) +bool event_motd(const Anope::string &source, const std::vector ¶ms) { if (source.empty()) - return MOD_CONT; + return true; m_motd(source); - return MOD_CONT; + return true; } -int anope_event_away(const Anope::string &source, int ac, const char **av) +bool event_away(const Anope::string &source, const std::vector ¶ms) { if (source.empty()) - return MOD_CONT; - m_away(source, ac ? av[0] : ""); - return MOD_CONT; + return true; + m_away(source, !params.empty() ? params[0] : ""); + return true; } -int anope_event_ping(const Anope::string &source, int ac, const char **av) +bool event_ping(const Anope::string &source, const std::vector ¶ms) { - if (ac < 1) - return MOD_CONT; - ircdproto->SendPong(ac > 1 ? av[1] : Config->ServerName, av[0]); - return MOD_CONT; + if (params.size() < 1) + return true; + ircdproto->SendPong(params.size() > 1 ? params[1] : Config->ServerName, params[0]); + return true; } -int anope_event_error(const Anope::string &source, int ac, const char **av) +bool event_error(const Anope::string &source, const std::vector ¶ms) { - if (ac >= 1) - Log(LOG_DEBUG) << av[0]; - return MOD_CONT; + if (params.size() > 0) + Log(LOG_DEBUG) << params[0]; + return true; } -int anope_event_burst(const Anope::string &source, int ac, const char **av) +bool event_burst(const Anope::string &source, const std::vector ¶ms) { Server *s = Server::Find(source); - if (!ac) + if (params.empty()) { /* for future use - start burst */ } @@ -681,7 +671,7 @@ int anope_event_burst(const Anope::string &source, int ac, const char **av) if (s) s->Sync(true); } - return MOD_CONT; + return true; } bool ChannelModeFlood::IsValid(const Anope::string &value) const @@ -695,32 +685,32 @@ bool ChannelModeFlood::IsValid(const Anope::string &value) const void moduleAddIRCDMsgs() { - Anope::AddMessage("436", anope_event_436); - Anope::AddMessage("AWAY", anope_event_away); - Anope::AddMessage("JOIN", anope_event_join); - Anope::AddMessage("KICK", anope_event_kick); - Anope::AddMessage("KILL", anope_event_kill); - Anope::AddMessage("MODE", anope_event_mode); - Anope::AddMessage("MOTD", anope_event_motd); - Anope::AddMessage("NICK", anope_event_nick); - Anope::AddMessage("PART", anope_event_part); - Anope::AddMessage("PING", anope_event_ping); - Anope::AddMessage("PRIVMSG", anope_event_privmsg); - Anope::AddMessage("QUIT", anope_event_quit); - Anope::AddMessage("SERVER", anope_event_server); - Anope::AddMessage("SQUIT", anope_event_squit); - Anope::AddMessage("TOPIC", anope_event_topic); - Anope::AddMessage("WHOIS", anope_event_whois); - Anope::AddMessage("SVSMODE", anope_event_mode); - Anope::AddMessage("CAPAB", anope_event_capab); - Anope::AddMessage("CS", anope_event_cs); - Anope::AddMessage("HS", anope_event_hs); - Anope::AddMessage("MS", anope_event_ms); - Anope::AddMessage("NS", anope_event_ns); - Anope::AddMessage("OS", anope_event_os); - Anope::AddMessage("SJOIN", anope_event_sjoin); - Anope::AddMessage("ERROR", anope_event_error); - Anope::AddMessage("BURST", anope_event_burst); + Anope::AddMessage("436", event_436); + Anope::AddMessage("AWAY", event_away); + Anope::AddMessage("JOIN", event_join); + Anope::AddMessage("KICK", event_kick); + Anope::AddMessage("KILL", event_kill); + Anope::AddMessage("MODE", event_mode); + Anope::AddMessage("MOTD", event_motd); + Anope::AddMessage("NICK", event_nick); + Anope::AddMessage("PART", event_part); + Anope::AddMessage("PING", event_ping); + Anope::AddMessage("PRIVMSG", event_privmsg); + Anope::AddMessage("QUIT", event_quit); + Anope::AddMessage("SERVER", event_server); + Anope::AddMessage("SQUIT", event_squit); + Anope::AddMessage("TOPIC", event_topic); + Anope::AddMessage("WHOIS", event_whois); + Anope::AddMessage("SVSMODE", event_mode); + Anope::AddMessage("CAPAB", event_capab); + Anope::AddMessage("CS", event_cs); + Anope::AddMessage("HS", event_hs); + Anope::AddMessage("MS", event_ms); + Anope::AddMessage("NS", event_ns); + Anope::AddMessage("OS", event_os); + Anope::AddMessage("SJOIN", event_sjoin); + Anope::AddMessage("ERROR", event_error); + Anope::AddMessage("BURST", event_burst); } static void AddModes() diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp index c468c0f9a..fd1143f54 100644 --- a/modules/protocol/inspircd11.cpp +++ b/modules/protocol/inspircd11.cpp @@ -66,11 +66,11 @@ void inspircd_cmd_chghost(const Anope::string &nick, const Anope::string &vhost) ircdproto->SendGlobops(OperServ, "CHGHOST not loaded!"); } -int anope_event_idle(const Anope::string &source, int ac, const char **av) +bool event_idle(const Anope::string &source, const std::vector ¶ms) { - if (ac == 1) - send_cmd(av[0], "IDLE %s %ld 0", source.c_str(), static_cast(Anope::CurTime)); - return MOD_CONT; + if (!params.empty()) + send_cmd(params[0], "IDLE %s %ld 0", source.c_str(), static_cast(Anope::CurTime)); + return true; } static Anope::string currentpass; @@ -296,112 +296,105 @@ class InspIRCdProto : public IRCDProto } ircd_proto; -int anope_event_ftopic(const Anope::string &source, int ac, const char **av) +bool event_ftopic(const Anope::string &source, const std::vector ¶ms) { /* :source FTOPIC channel ts setby :topic */ - if (ac < 4) - return MOD_CONT; + if (params.size() < 4) + return true; - Channel *c = findchan(av[0]); + Channel *c = findchan(params[0]); if (!c) { - Log() << "TOPIC for nonexistant channel " << av[0]; - return MOD_CONT; + Log() << "TOPIC for nonexistant channel " << params[0]; + return true; } - c->ChangeTopicInternal(av[2], av[3], Anope::string(av[1]).is_pos_number_only() ? convertTo(av[1]) : Anope::CurTime); + c->ChangeTopicInternal(params[2], params[3], Anope::string(params[1]).is_pos_number_only() ? convertTo(params[1]) : Anope::CurTime); - return MOD_CONT; + return true; } -int anope_event_mode(const Anope::string &source, int ac, const char **av) +bool event_mode(const Anope::string &source, const std::vector ¶ms) { - if (ac < 2) - return MOD_CONT; + if (params.size() < 2) + return true; - if (*av[0] == '#' || *av[0] == '&') - do_cmode(source, ac, av); + if (params[0][0] == '#' || params[0][0] == '&') + do_cmode(source, params[0], params[1], params[2]); else { /* InspIRCd lets opers change another - users modes, we have to kludge this - as it slightly breaks RFC1459 + users modes */ - if (source.equals_ci(av[0])) - do_umode(source, ac, av); - else - do_umode(av[0], ac, av); + do_umode(source, params[0], params[1]); } - return MOD_CONT; + return true; } -int anope_event_opertype(const Anope::string &source, int ac, const char **av) +bool event_opertype(const Anope::string &source, const std::vector ¶ms) { /* opertype is equivalent to mode +o because servers dont do this directly */ - User *u; - u = finduser(source); + User *u = finduser(source); if (u && !is_oper(u)) { - const char *newav[2]; - newav[0] = source.c_str(); - newav[1] = "+o"; - return anope_event_mode(source, 2, newav); + std::vector newparams; + newparams.push_back(source); + newparams.push_back("+o"); + return event_mode(source, newparams); } else - return MOD_CONT; + return true; } -int anope_event_fmode(const Anope::string &source, int ac, const char **av) +bool event_fmode(const Anope::string &source, const std::vector ¶ms) { - const char *newav[128]; - int n, o; - Channel *c; - /* :source FMODE #test 12345678 +nto foo */ - if (ac < 3) - return MOD_CONT; + if (params.size() < 3) + return true; + Channel *c = findchan(params[0]); /* Checking the TS for validity to avoid desyncs */ - if ((c = findchan(av[0]))) + if (c) { - time_t ts = Anope::string(av[1]).is_pos_number_only() ? convertTo(av[1]) : 0; + time_t ts = Anope::string(params[1]).is_pos_number_only() ? convertTo(params[1]) : 0; if (c->creation_time > ts) + { /* Our TS is bigger, we should lower it */ c->creation_time = ts; + c->Reset(); + } else if (c->creation_time < ts) /* The TS we got is bigger, we should ignore this message. */ - return MOD_CONT; + return true; } else /* Got FMODE for a non-existing channel */ - return MOD_CONT; + return true; /* TS's are equal now, so we can proceed with parsing */ - n = o = 0; - while (n < ac) + std::vector newparams; + for (unsigned n = 0; n < params.size(); ++n) { if (n != 1) { - newav[o] = av[n]; - ++o; - Log(LOG_DEBUG) << "Param: " << newav[o - 1]; + newparams.push_back(params[n]); + Log(LOG_DEBUG) << "Param: " << params[n]; } - ++n; } - return anope_event_mode(source, ac - 1, newav); + return event_mode(source, newparams); } -int anope_event_fjoin(const Anope::string &source, int ac, const char **av) +bool event_fjoin(const Anope::string &source, const std::vector ¶ms) { - Channel *c = findchan(av[0]); - time_t ts = Anope::string(av[1]).is_pos_number_only() ? convertTo(av[1]) : 0; + Channel *c = findchan(params[0]); + time_t ts = Anope::string(params[1]).is_pos_number_only() ? convertTo(params[1]) : 0; bool keep_their_modes = true; if (!c) { - c = new Channel(av[0], ts); + c = new Channel(params[0], ts); c->SetFlag(CH_SYNCING); } /* Our creation time is newer than what the server gave us */ @@ -417,7 +410,7 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av) else if (ts > c->creation_time) keep_their_modes = false; - spacesepstream sep(av[ac - 1]); + spacesepstream sep(params[params.size() - 1]); Anope::string buf; while (sep.GetToken(buf)) { @@ -481,291 +474,262 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av) c->Sync(); } - return MOD_CONT; + return true; } /* Events */ -int anope_event_ping(const Anope::string &source, int ac, const char **av) +bool event_ping(const Anope::string &source, const std::vector ¶ms) { - if (ac < 1) - return MOD_CONT; - ircdproto->SendPong(Config->ServerName, av[0]); - return MOD_CONT; + if (!params.empty()) + ircdproto->SendPong(Config->ServerName, params[0]); + return true; } -int anope_event_436(const Anope::string &source, int ac, const char **av) +bool event_436(const Anope::string &source, const std::vector ¶ms) { - if (ac < 1) - return MOD_CONT; - - m_nickcoll(av[0]); - return MOD_CONT; + if (!params.empty()) + m_nickcoll(params[0]); + return true; } -int anope_event_away(const Anope::string &source, int ac, const char **av) +bool event_away(const Anope::string &source, const std::vector ¶ms) { - if (source.empty()) - return MOD_CONT; - m_away(source, ac ? av[0] : ""); - return MOD_CONT; + if (!source.empty()) + m_away(source, !params.empty() ? params[0] : ""); + return true; } /* Taken from hybrid.c, topic syntax is identical */ -int anope_event_topic(const Anope::string &source, int ac, const char **av) +bool event_topic(const Anope::string &source, const std::vector ¶ms) { - Channel *c = findchan(av[0]); + Channel *c = findchan(params[0]); if (!c) { - Log() << "TOPIC " << merge_args(ac - 1, av + 1) << " for nonexistent channel " << av[0]; - return MOD_CONT; + Log() << "TOPIC " << (params.size() > 1 ? params[1] : "") << " for nonexistent channel " << params[0]; + return true; } - c->ChangeTopicInternal(source, (ac > 1 && *av[1] ? av[1] : ""), Anope::CurTime); + c->ChangeTopicInternal(source, (params.size() > 1 ? params[1] : ""), Anope::CurTime); - return MOD_CONT; + return true; } -int anope_event_squit(const Anope::string &source, int ac, const char **av) +bool event_squit(const Anope::string &source, const std::vector ¶ms) { - if (ac != 2) - return MOD_CONT; - do_squit(source, ac, av); - return MOD_CONT; + if (!params.empty()) + do_squit(source, params[0]); + return true; } -int anope_event_rsquit(const Anope::string &source, int ac, const char **av) +bool event_rsquit(const Anope::string &source, const std::vector ¶ms) { - if (ac < 1 || ac > 3) - return MOD_CONT; + if (params.empty() || params.size() > 3) + return true; /* Horrible workaround to an insp bug (#) in how RSQUITs are sent - mark */ - if (ac > 1 && Config->ServerName.equals_cs(av[0])) - do_squit(source, ac - 1, av + 1); + if (params.size() > 1 && Config->ServerName.equals_cs(params[0])) + do_squit(source, params[1]); else - do_squit(source, ac, av); + do_squit(source, params[0]); - return MOD_CONT; + return true; } -int anope_event_quit(const Anope::string &source, int ac, const char **av) +bool event_quit(const Anope::string &source, const std::vector ¶ms) { - if (ac != 1) - return MOD_CONT; - do_quit(source, ac, av); - return MOD_CONT; + if (!params.empty()) + do_quit(source, params[0]); + return true; } -int anope_event_kill(const Anope::string &source, int ac, const char **av) +bool event_kill(const Anope::string &source, const std::vector ¶ms) { - if (ac != 2) - return MOD_CONT; - - m_kill(av[0], av[1]); - return MOD_CONT; + if (params.size() > 1) + m_kill(params[0], params[1]); + return true; } -int anope_event_kick(const Anope::string &source, int ac, const char **av) +bool event_kick(const Anope::string &source, const std::vector ¶ms) { - if (ac != 3) - return MOD_CONT; - do_kick(source, ac, av); - return MOD_CONT; + if (params.size() > 2) + do_kick(source, params[0], params[1], params[2]); + return true; } -int anope_event_join(const Anope::string &source, int ac, const char **av) +bool event_join(const Anope::string &source, const std::vector ¶ms) { - if (ac != 2) - return MOD_CONT; - do_join(source, ac, av); - return MOD_CONT; + if (params.size() > 1) + do_join(source, params[0], params[1]); + return true; } -int anope_event_motd(const Anope::string &source, int ac, const char **av) +bool event_motd(const Anope::string &source, const std::vector ¶ms) { if (source.empty()) - return MOD_CONT; + return true; m_motd(source); - return MOD_CONT; + return true; } -int anope_event_setname(const Anope::string &source, int ac, const char **av) +bool event_setname(const Anope::string &source, const std::vector ¶ms) { - User *u; - - if (ac != 1) - return MOD_CONT; + if (params.empty()) + return true; - u = finduser(source); + User *u = finduser(source); if (!u) { Log(LOG_DEBUG) << "SETNAME for nonexistent user " << source; - return MOD_CONT; + return true; } - u->SetRealname(av[0]); - return MOD_CONT; + u->SetRealname(params[0]); + return true; } -int anope_event_chgname(const Anope::string &source, int ac, const char **av) +bool event_chgname(const Anope::string &source, const std::vector ¶ms) { - User *u; - - if (ac != 2) - return MOD_CONT; + if (params.size() < 2) + return true; - u = finduser(source); + User *u = finduser(source); if (!u) { Log(LOG_DEBUG) << "FNAME for nonexistent user " << source; - return MOD_CONT; + return true; } - u->SetRealname(av[0]); - return MOD_CONT; + u->SetRealname(params[0]); + return true; } -int anope_event_setident(const Anope::string &source, int ac, const char **av) +bool event_setident(const Anope::string &source, const std::vector ¶ms) { - User *u; - - if (ac != 1) - return MOD_CONT; + if (!params.empty()) + return true; - u = finduser(source); + User *u = finduser(source); if (!u) { Log(LOG_DEBUG) << "SETIDENT for nonexistent user " << source; - return MOD_CONT; + return true; } - u->SetIdent(av[0]); - return MOD_CONT; + u->SetIdent(params[0]); + return true; } -int anope_event_chgident(const Anope::string &source, int ac, const char **av) +bool event_chgident(const Anope::string &source, const std::vector ¶ms) { - User *u; - - if (ac != 2) - return MOD_CONT; + if (params.size() < 2) + return true; - u = finduser(av[0]); + User *u = finduser(params[0]); if (!u) { - Log(LOG_DEBUG) << "CHGIDENT for nonexistent user " << av[0]; - return MOD_CONT; + Log(LOG_DEBUG) << "CHGIDENT for nonexistent user " << params[0]; + return true; } - u->SetIdent(av[1]); - return MOD_CONT; + u->SetIdent(params[1]); + return true; } -int anope_event_sethost(const Anope::string &source, int ac, const char **av) +bool event_sethost(const Anope::string &source, const std::vector ¶ms) { - User *u; - - if (ac != 1) - return MOD_CONT; + if (params.empty()) + return true; - u = finduser(source); + User *u = finduser(source); if (!u) { Log(LOG_DEBUG) << "SETHOST for nonexistent user " << source; - return MOD_CONT; + return true; } - u->SetDisplayedHost(av[0]); - return MOD_CONT; + u->SetDisplayedHost(params[0]); + return true; } -int anope_event_nick(const Anope::string &source, int ac, const char **av) +bool event_nick(const Anope::string &source, const std::vector ¶ms) { - User *user; - - if (ac != 1) + if (params.size() == 8) { - if (ac == 8) + time_t ts = Anope::string(params[0]).is_pos_number_only() ? convertTo(params[0]) : 0; + + User *user = do_nick("", params[1], params[4], params[2], source, params[7], ts, params[6], params[3], "", params[5]); + if (user) { - time_t ts = Anope::string(av[0]).is_pos_number_only() ? convertTo(av[0]) : 0; + user->SetCloakedHost(params[3]); - user = do_nick("", av[1], av[4], av[2], source, av[7], ts, av[6], av[3], "", av[5]); - if (user) + NickAlias *na = findnick(user->nick); + Anope::string svidbuf; + if (na && na->nc->GetExtRegular("authenticationtoken", svidbuf) && svidbuf == params[0]) { - user->SetCloakedHost(av[3]); - - NickAlias *na = findnick(user->nick); - Anope::string svidbuf; - if (na && na->nc->GetExtRegular("authenticationtoken", svidbuf) && svidbuf == av[0]) - { - user->Login(na->nc); - user->SetMode(NickServ, UMODE_REGISTERED); - } - else - validate_user(user); + user->Login(na->nc); + user->SetMode(NickServ, UMODE_REGISTERED); } + else + validate_user(user); } } - else - do_nick(source, av[0], "", "", "", "", 0, "", "", "", ""); - return MOD_CONT; + else if (params.size() == 1) + do_nick(source, params[0], "", "", "", "", 0, "", "", "", ""); + return true; } -int anope_event_chghost(const Anope::string &source, int ac, const char **av) +bool event_chghost(const Anope::string &source, const std::vector ¶ms) { - User *u; - - if (ac != 1) - return MOD_CONT; + if (params.empty()) + return true; - u = finduser(source); + User *u = finduser(source); if (!u) { Log(LOG_DEBUG) << "FHOST for nonexistent user " << source; - return MOD_CONT; + return true; } - u->SetDisplayedHost(av[0]); - return MOD_CONT; + u->SetDisplayedHost(params[0]); + return true; } /* EVENT: SERVER */ -int anope_event_server(const Anope::string &source, int ac, const char **av) +bool event_server(const Anope::string &source, const std::vector ¶ms) { - do_server(source, av[0], Anope::string(av[1]).is_pos_number_only() ? convertTo(av[1]) : 0, av[2], ""); - return MOD_CONT; + do_server(source, params[0], Anope::string(params[1]).is_pos_number_only() ? convertTo(params[1]) : 0, params[2], ""); + return true; } -int anope_event_privmsg(const Anope::string &source, int ac, const char **av) +bool event_privmsg(const Anope::string &source, const std::vector ¶ms) { - if (ac != 2) - return MOD_CONT; - m_privmsg(source, av[0], av[1]); - return MOD_CONT; + if (params.size() > 1) + m_privmsg(source, params[0], params[1]); + return true; } -int anope_event_part(const Anope::string &source, int ac, const char **av) +bool event_part(const Anope::string &source, const std::vector ¶ms) { - if (ac < 1 || ac > 2) - return MOD_CONT; - do_part(source, ac, av); - return MOD_CONT; + if (!params.empty()) + do_part(source, params[0], params.size() > 1 ? params[1] : ""); + return true; } -int anope_event_whois(const Anope::string &source, int ac, const char **av) +bool event_whois(const Anope::string &source, const std::vector ¶ms) { - if (!source.empty() && ac >= 1) - m_whois(source, av[0]); - return MOD_CONT; + if (!source.empty() && !params.empty()) + m_whois(source, params[0]); + return true; } -int anope_event_capab(const Anope::string &source, int ac, const char **av) +bool event_capab(const Anope::string &source, const std::vector ¶ms) { - if (!strcasecmp(av[0], "START")) + if (params[0].equals_cs("START")) { /* reset CAPAB */ has_servicesmod = false; @@ -775,24 +739,24 @@ int anope_event_capab(const Anope::string &source, int ac, const char **av) has_chgidentmod = false; has_hidechansmod = false; } - else if (!strcasecmp(av[0], "MODULES")) + else if (params[0].equals_cs("MODULES")) { - if (strstr(av[1], "m_globops.so")) + if (params[1].find("m_globops.so") != Anope::string::npos) has_globopsmod = true; - if (strstr(av[1], "m_services.so")) + if (params[1].find("m_services.so") != Anope::string::npos) has_servicesmod = true; - if (strstr(av[1], "m_svshold.so")) + if (params[1].find("m_svshold.so") != Anope::string::npos) has_svsholdmod = true; - if (strstr(av[1], "m_chghost.so")) + if (params[1].find("m_chghost.so") != Anope::string::npos) has_chghostmod = true; - if (strstr(av[1], "m_chgident.so")) + if (params[1].find("m_chgident.so") != Anope::string::npos) has_chgidentmod = true; - if (strstr(av[1], "m_hidechans.so")) + if (params[1].find("m_hidechans.so") != Anope::string::npos) has_hidechansmod = true; } - else if (!strcasecmp(av[0], "CAPABILITIES")) + else if (params[0].equals_cs("CAPABILITIES")) { - spacesepstream ssep(av[1]); + spacesepstream ssep(params[1]); Anope::string capab; while (ssep.GetToken(capab)) { @@ -950,14 +914,14 @@ int anope_event_capab(const Anope::string &source, int ac, const char **av) } } } - else if (capab.find("MAXMODES=") != std::string::npos) + else if (capab.find("MAXMODES=") != Anope::string::npos) { Anope::string maxmodes(capab.begin() + 9, capab.end()); ircd->maxmodes = maxmodes.is_pos_number_only() ? convertTo(maxmodes) : 3; } } } - else if (!strcasecmp(av[0], "END")) + else if (params[0].equals_cs("END")) { if (!has_globopsmod) { @@ -989,49 +953,49 @@ int anope_event_capab(const Anope::string &source, int ac, const char **av) ircd->svshold = has_svsholdmod; } - CapabParse(ac, av); - return MOD_CONT; + CapabParse(params); + return true; } -int anope_event_endburst(const Anope::string &source, int ac, const char **av) +bool event_endburst(const Anope::string &source, const std::vector ¶ms) { Me->GetLinks().front()->Sync(true); - return MOD_CONT; + return true; } void moduleAddIRCDMsgs() { - Anope::AddMessage("ENDBURST", anope_event_endburst); - Anope::AddMessage("436", anope_event_436); - Anope::AddMessage("AWAY", anope_event_away); - Anope::AddMessage("JOIN", anope_event_join); - Anope::AddMessage("KICK", anope_event_kick); - Anope::AddMessage("KILL", anope_event_kill); - Anope::AddMessage("MODE", anope_event_mode); - Anope::AddMessage("MOTD", anope_event_motd); - Anope::AddMessage("NICK", anope_event_nick); - Anope::AddMessage("CAPAB", anope_event_capab); - Anope::AddMessage("PART", anope_event_part); - Anope::AddMessage("PING", anope_event_ping); - Anope::AddMessage("PRIVMSG", anope_event_privmsg); - Anope::AddMessage("QUIT", anope_event_quit); - Anope::AddMessage("SERVER", anope_event_server); - Anope::AddMessage("SQUIT", anope_event_squit); - Anope::AddMessage("RSQUIT", anope_event_rsquit); - Anope::AddMessage("TOPIC", anope_event_topic); - Anope::AddMessage("WHOIS", anope_event_whois); - Anope::AddMessage("SVSMODE", anope_event_mode); - Anope::AddMessage("FHOST", anope_event_chghost); - Anope::AddMessage("CHGIDENT", anope_event_chgident); - Anope::AddMessage("FNAME", anope_event_chgname); - Anope::AddMessage("SETHOST", anope_event_sethost); - Anope::AddMessage("SETIDENT", anope_event_setident); - Anope::AddMessage("SETNAME", anope_event_setname); - Anope::AddMessage("FJOIN", anope_event_fjoin); - Anope::AddMessage("FMODE", anope_event_fmode); - Anope::AddMessage("FTOPIC", anope_event_ftopic); - Anope::AddMessage("OPERTYPE", anope_event_opertype); - Anope::AddMessage("IDLE", anope_event_idle); + Anope::AddMessage("ENDBURST", event_endburst); + Anope::AddMessage("436", event_436); + Anope::AddMessage("AWAY", event_away); + Anope::AddMessage("JOIN", event_join); + Anope::AddMessage("KICK", event_kick); + Anope::AddMessage("KILL", event_kill); + Anope::AddMessage("MODE", event_mode); + Anope::AddMessage("MOTD", event_motd); + Anope::AddMessage("NICK", event_nick); + Anope::AddMessage("CAPAB", event_capab); + Anope::AddMessage("PART", event_part); + Anope::AddMessage("PING", event_ping); + Anope::AddMessage("PRIVMSG", event_privmsg); + Anope::AddMessage("QUIT", event_quit); + Anope::AddMessage("SERVER", event_server); + Anope::AddMessage("SQUIT", event_squit); + Anope::AddMessage("RSQUIT", event_rsquit); + Anope::AddMessage("TOPIC", event_topic); + Anope::AddMessage("WHOIS", event_whois); + Anope::AddMessage("SVSMODE", event_mode); + Anope::AddMessage("FHOST", event_chghost); + Anope::AddMessage("CHGIDENT", event_chgident); + Anope::AddMessage("FNAME", event_chgname); + Anope::AddMessage("SETHOST", event_sethost); + Anope::AddMessage("SETIDENT", event_setident); + Anope::AddMessage("SETNAME", event_setname); + Anope::AddMessage("FJOIN", event_fjoin); + Anope::AddMessage("FMODE", event_fmode); + Anope::AddMessage("FTOPIC", event_ftopic); + Anope::AddMessage("OPERTYPE", event_opertype); + Anope::AddMessage("IDLE", event_idle); } bool ChannelModeFlood::IsValid(const Anope::string &value) const diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp index 9e8eef8c8..66e519a88 100644 --- a/modules/protocol/inspircd12.cpp +++ b/modules/protocol/inspircd12.cpp @@ -68,12 +68,12 @@ void inspircd_cmd_chghost(const Anope::string &nick, const Anope::string &vhost) send_cmd(HostServ ? HostServ->GetUID() : TS6SID, "CHGHOST %s %s", nick.c_str(), vhost.c_str()); } -int anope_event_idle(const Anope::string &source, int ac, const char **av) +bool event_idle(const Anope::string &source, const std::vector ¶ms) { - BotInfo *bi = findbot(av[0]); + BotInfo *bi = findbot(params[0]); - send_cmd(bi ? bi->GetUID() : av[0], "IDLE %s %ld %ld", source.c_str(), static_cast(start_time), bi ? (static_cast(Anope::CurTime - bi->lastmsg)) : 0); - return MOD_CONT; + send_cmd(bi ? bi->GetUID() : params[0], "IDLE %s %ld %ld", source.c_str(), static_cast(start_time), bi ? (static_cast(Anope::CurTime - bi->lastmsg)) : 0); + return true; } static Anope::string currentpass; @@ -306,28 +306,28 @@ class InspIRCdProto : public IRCDProto } } ircd_proto; -int anope_event_ftopic(const Anope::string &source, int ac, const char **av) +bool event_ftopic(const Anope::string &source, const std::vector ¶ms) { /* :source FTOPIC channel ts setby :topic */ - if (ac < 4) - return MOD_CONT; + if (params.size() < 4) + return true; - Channel *c = findchan(av[0]); + Channel *c = findchan(params[0]); if (!c) { - Log(LOG_DEBUG) << "TOPIC " << merge_args(ac - 1, av + 1) << " for nonexistent channel " << av[0]; - return MOD_CONT; + Log(LOG_DEBUG) << "TOPIC " << params[3] << " for nonexistent channel " << params[0]; + return true; } - c->ChangeTopicInternal(av[2], av[3], Anope::string(av[1]).is_pos_number_only() ? convertTo(av[1]) : Anope::CurTime); + c->ChangeTopicInternal(params[2], params[3], Anope::string(params[1]).is_pos_number_only() ? convertTo(params[1]) : Anope::CurTime); - return MOD_CONT; + return true; } -int anope_event_mode(const Anope::string &source, int ac, const char **av) +bool event_mode(const Anope::string &source, const std::vector ¶ms) { - if (*av[0] == '#' || *av[0] == '&') - do_cmode(source, ac, av); + if (params[0][0] == '#' || params[0][0] == '&') + do_cmode(source, params[0], params[2], params[1]); else { /* InspIRCd lets opers change another @@ -335,7 +335,7 @@ int anope_event_mode(const Anope::string &source, int ac, const char **av) as it slightly breaks RFC1459 */ User *u = finduser(source); - User *u2 = finduser(av[0]); + User *u2 = finduser(params[0]); // This can happen with server-origin modes. if (!u) @@ -343,71 +343,68 @@ int anope_event_mode(const Anope::string &source, int ac, const char **av) // if it's still null, drop it like fire. // most likely situation was that server introduced a nick which we subsequently akilled - if (!u) - return MOD_CONT; + if (!u || !u2) + return true; - av[0] = u2->nick.c_str(); - do_umode(u->nick, ac, av); + do_umode(u->nick, u2->nick, params[1]); } - return MOD_CONT; + return true; } -int anope_event_opertype(const Anope::string &source, int ac, const char **av) +bool event_opertype(const Anope::string &source, const std::vector ¶ms) { /* opertype is equivalent to mode +o because servers dont do this directly */ - User *u; - u = finduser(source); + User *u = finduser(source); if (u && !is_oper(u)) { - const char *newav[2]; - newav[0] = source.c_str(); - newav[1] = "+o"; - return anope_event_mode(source, 2, newav); + std::vector newparams; + newparams.push_back(source); + newparams.push_back(Anope::CurTime); + newparams.push_back("+o"); + return event_mode(source, newparams); } - else - return MOD_CONT; + + return true; } -int anope_event_fmode(const Anope::string &source, int ac, const char **av) +bool event_fmode(const Anope::string &source, const std::vector ¶ms) { - const char *newav[128]; - int n, o; - Channel *c; - /* :source FMODE #test 12345678 +nto foo */ - if (ac < 3) - return MOD_CONT; + if (params.size() < 3) + return true; + Channel *c = findchan(params[0]); /* Checking the TS for validity to avoid desyncs */ - if ((c = findchan(av[0]))) + if ((c = findchan(params[0]))) { - time_t ts = Anope::string(av[1]).is_pos_number_only() ? convertTo(av[1]) : 0; + time_t ts = Anope::string(params[1]).is_pos_number_only() ? convertTo(params[1]) : 0; if (c->creation_time > ts) + { /* Our TS is bigger, we should lower it */ c->creation_time = ts; + c->Reset(); + } else if (c->creation_time < ts) /* The TS we got is bigger, we should ignore this message. */ - return MOD_CONT; + return true; } else /* Got FMODE for a non-existing channel */ - return MOD_CONT; + return true; /* TS's are equal now, so we can proceed with parsing */ - n = o = 0; - while (n < ac) + std::vector newparams; + for (unsigned n = 0; n < params.size(); ++n) { if (n != 1) { - newav[o] = av[n]; - ++o; - Log(LOG_DEBUG) << "Param: " << newav[o - 1]; + newparams.push_back(params[n]); + Log(LOG_DEBUG) << "Param: " << params[n]; } - ++n; } - return anope_event_mode(source, ac - 1, newav); + return event_mode(source, newparams); } /* @@ -418,15 +415,15 @@ int anope_event_fmode(const Anope::string &source, int ac, const char **av) * 2: channel modes + params (NOTE: this may definitely be more than one param!) * last: users */ -int anope_event_fjoin(const Anope::string &source, int ac, const char **av) +bool event_fjoin(const Anope::string &source, const std::vector ¶ms) { - Channel *c = findchan(av[0]); - time_t ts = Anope::string(av[1]).is_pos_number_only() ? convertTo(av[1]) : 0; + Channel *c = findchan(params[0]); + time_t ts = Anope::string(params[1]).is_pos_number_only() ? convertTo(params[1]) : 0; bool keep_their_modes = true; if (!c) { - c = new Channel(av[0], ts); + c = new Channel(params[0], ts); c->SetFlag(CH_SYNCING); } /* Our creation time is newer than what the server gave us */ @@ -443,13 +440,18 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av) keep_their_modes = false; /* If we need to keep their modes, and this FJOIN string contains modes */ - if (keep_their_modes && ac >= 4) + if (keep_their_modes && params.size() >= 3) { + Anope::string modes; + for (unsigned i = 2; i < params.size() - 1; ++i) + modes += " " + params[i]; + if (!modes.empty()) + modes.erase(modes.begin()); /* Set the modes internally */ - ChanSetInternalModes(c, ac - 3, av + 2); + c->SetModesInternal(NULL, modes); } - spacesepstream sep(av[ac - 1]); + spacesepstream sep(params[params.size() - 1]); Anope::string buf; while (sep.GetToken(buf)) { @@ -512,190 +514,185 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av) c->Sync(); } - return MOD_CONT; + return true; } /* Events */ -int anope_event_ping(const Anope::string &source, int ac, const char **av) +bool event_ping(const Anope::string &source, const std::vector ¶ms) { - if (ac == 1) - ircdproto->SendPong("", av[0]); - - if (ac == 2) - ircdproto->SendPong(av[1], av[0]); + if (params.size() == 1) + ircdproto->SendPong("", params[0]); + else if (params.size() == 2) + ircdproto->SendPong(params[1], params[0]); - return MOD_CONT; + return true; } -int anope_event_time(const Anope::string &source, int ac, const char **av) +bool event_time(const Anope::string &source, const std::vector ¶ms) { - if (ac !=2) - return MOD_CONT; + if (params.size() < 2) + return true; - send_cmd(TS6SID, "TIME %s %s %ld", source.c_str(), av[1], static_cast(Anope::CurTime)); + send_cmd(TS6SID, "TIME %s %s %ld", source.c_str(), params[1].c_str(), static_cast(Anope::CurTime)); /* We handled it, don't pass it on to the core.. * The core doesn't understand our syntax anyways.. ~ Viper */ return MOD_STOP; } -int anope_event_436(const Anope::string &source, int ac, const char **av) +bool event_436(const Anope::string &source, const std::vector ¶ms) { - m_nickcoll(av[0]); - return MOD_CONT; + if (!params.empty()) + m_nickcoll(params[0]); + return true; } -int anope_event_away(const Anope::string &source, int ac, const char **av) +bool event_away(const Anope::string &source, const std::vector ¶ms) { - m_away(source, ac ? av[0] : ""); - return MOD_CONT; + m_away(source, !params.empty() ? params[0] : ""); + return true; } /* Taken from hybrid.c, topic syntax is identical */ -int anope_event_topic(const Anope::string &source, int ac, const char **av) +bool event_topic(const Anope::string &source, const std::vector ¶ms) { - Channel *c = findchan(av[0]); + Channel *c = findchan(params[0]); if (!c) { - Log() << "TOPIC " << merge_args(ac - 1, av + 1) << " for nonexistent channel " << av[0]; - return MOD_CONT; + Log() << "TOPIC " << params[1] << " for nonexistent channel " << params[0]; + return true; } - c->ChangeTopicInternal(source, (ac > 1 && *av[1] ? av[1] : ""), Anope::CurTime); + c->ChangeTopicInternal(source, (params.size() > 1 ? params[1] : ""), Anope::CurTime); - return MOD_CONT; + return true; } -int anope_event_squit(const Anope::string &source, int ac, const char **av) +bool event_squit(const Anope::string &source, const std::vector ¶ms) { - do_squit(source, ac, av); - return MOD_CONT; + do_squit(source, params[0]); + return true; } -int anope_event_rsquit(const Anope::string &source, int ac, const char **av) +bool event_rsquit(const Anope::string &source, const std::vector ¶ms) { /* On InspIRCd we must send a SQUIT when we recieve RSQUIT for a server we have juped */ - Server *s = Server::Find(av[0]); + Server *s = Server::Find(params[0]); if (s && s->HasFlag(SERVER_JUPED)) - send_cmd(TS6SID, "SQUIT %s :%s", s->GetSID().c_str(), ac > 1 ? av[1] : ""); + send_cmd(TS6SID, "SQUIT %s :%s", s->GetSID().c_str(), params.size() > 1 ? params[1].c_str() : ""); - do_squit(source, ac, av); + do_squit(source, params[0]); - return MOD_CONT; + return true; } -int anope_event_quit(const Anope::string &source, int ac, const char **av) +bool event_quit(const Anope::string &source, const std::vector ¶ms) { - do_quit(source, ac, av); - return MOD_CONT; + do_quit(source, params[0]); + return true; } -int anope_event_kill(const Anope::string &source, int ac, const char **av) +bool event_kill(const Anope::string &source, const std::vector ¶ms) { - User *u = finduser(av[0]); - BotInfo *bi = findbot(av[0]); - m_kill(u ? u->nick : (bi ? bi->nick : av[0]), av[1]); - return MOD_CONT; + User *u = finduser(params[0]); + BotInfo *bi = findbot(params[0]); + m_kill(u ? u->nick : (bi ? bi->nick : params[0]), params[1]); + return true; } -int anope_event_kick(const Anope::string &source, int ac, const char **av) +bool event_kick(const Anope::string &source, const std::vector ¶ms) { - do_kick(source, ac, av); - return MOD_CONT; + if (params.size() > 2) + do_kick(source, params[0], params[1], params[2]); + return true; } -int anope_event_join(const Anope::string &source, int ac, const char **av) +bool event_join(const Anope::string &source, const std::vector ¶ms) { - do_join(source, ac, av); - return MOD_CONT; + do_join(source, params[0], params[1]); + return true; } -int anope_event_motd(const Anope::string &source, int ac, const char **av) +bool event_motd(const Anope::string &source, const std::vector ¶ms) { m_motd(source); - return MOD_CONT; + return true; } -int anope_event_setname(const Anope::string &source, int ac, const char **av) +bool event_setname(const Anope::string &source, const std::vector ¶ms) { - User *u; - - u = finduser(source); + User *u = finduser(source); if (!u) { Log(LOG_DEBUG) << "SETNAME for nonexistent user " << source; - return MOD_CONT; + return true; } - u->SetRealname(av[0]); - return MOD_CONT; + u->SetRealname(params[0]); + return true; } -int anope_event_chgname(const Anope::string &source, int ac, const char **av) +bool event_chgname(const Anope::string &source, const std::vector ¶ms) { - User *u; + User *u = finduser(source); - u = finduser(source); if (!u) { Log(LOG_DEBUG) << "FNAME for nonexistent user " << source; - return MOD_CONT; + return true; } - u->SetRealname(av[0]); - return MOD_CONT; + u->SetRealname(params[0]); + return true; } -int anope_event_setident(const Anope::string &source, int ac, const char **av) +bool event_setident(const Anope::string &source, const std::vector ¶ms) { - User *u; + User *u = finduser(source); - u = finduser(source); if (!u) { Log(LOG_DEBUG) << "SETIDENT for nonexistent user " << source; - return MOD_CONT; + return true; } - u->SetIdent(av[0]); - return MOD_CONT; + u->SetIdent(params[0]); + return true; } -int anope_event_chgident(const Anope::string &source, int ac, const char **av) +bool event_chgident(const Anope::string &source, const std::vector ¶ms) { - User *u; + User *u = finduser(params[0]); - u = finduser(av[0]); if (!u) { - Log(LOG_DEBUG) << "CHGIDENT for nonexistent user " << av[0]; - return MOD_CONT; + Log(LOG_DEBUG) << "CHGIDENT for nonexistent user " << params[0]; + return true; } - u->SetIdent(av[1]); - return MOD_CONT; + u->SetIdent(params[1]); + return true; } -int anope_event_sethost(const Anope::string &source, int ac, const char **av) +bool event_sethost(const Anope::string &source, const std::vector ¶ms) { - User *u; + User *u = finduser(source); - u = finduser(source); if (!u) { Log(LOG_DEBUG) << "SETHOST for nonexistent user " << source; - return MOD_CONT; + return true; } - u->SetDisplayedHost(av[0]); - return MOD_CONT; + u->SetDisplayedHost(params[0]); + return true; } -int anope_event_nick(const Anope::string &source, int ac, const char **av) +bool event_nick(const Anope::string &source, const std::vector ¶ms) { - do_nick(source, av[0], "", "", "", "", 0, "", "", "", ""); - return MOD_CONT; + do_nick(source, params[0], "", "", "", "", 0, "", "", "", ""); + return true; } /* @@ -712,11 +709,11 @@ int anope_event_nick(const Anope::string &source, int ac, const char **av) * last: realname */ -int anope_event_uid(const Anope::string &source, int ac, const char **av) +bool event_uid(const Anope::string &source, const std::vector ¶ms) { User *user; Server *s = Server::Find(source); - int ts = strtoul(av[1], NULL, 10); + time_t ts = convertTo(params[1]); /* Check if the previously introduced user was Id'd for the nickgroup of the nick he s currently using. * If not, validate the user. ~ Viper*/ @@ -737,10 +734,10 @@ int anope_event_uid(const Anope::string &source, int ac, const char **av) user->SetMode(NickServ, UMODE_REGISTERED); } - Anope::string modes = av[8]; - for (int i = 9; i < ac - 1; ++i) - modes += Anope::string(" ") + av[i]; - user = do_nick("", av[2], av[5], av[3], s->GetName(), av[ac - 1], ts, av[6], av[4], av[0], modes); + Anope::string modes = params[8]; + for (unsigned i = 9; i < params.size() - 1; ++i) + modes += " " + params[i]; + user = do_nick("", params[2], params[5], params[3], s->GetName(), params[params.size() - 1], ts, params[6], params[4], params[0], modes); if (user) { if (!user->server->IsSynced()) @@ -749,22 +746,21 @@ int anope_event_uid(const Anope::string &source, int ac, const char **av) validate_user(user); } - return MOD_CONT; + return true; } -int anope_event_chghost(const Anope::string &source, int ac, const char **av) +bool event_chghost(const Anope::string &source, const std::vector ¶ms) { - User *u; + User *u = finduser(source); - u = finduser(source); if (!u) { Log(LOG_DEBUG) << "FHOST for nonexistent user " << source; - return MOD_CONT; + return true; } - u->SetDisplayedHost(av[0]); - return MOD_CONT; + u->SetDisplayedHost(params[0]); + return true; } /* @@ -775,53 +771,53 @@ int anope_event_chghost(const Anope::string &source, int ac, const char **av) * 3: numeric * 4: desc */ -int anope_event_server(const Anope::string &source, int ac, const char **av) +bool event_server(const Anope::string &source, const std::vector ¶ms) { - do_server(source, av[0], Anope::string(av[2]).is_pos_number_only() ? convertTo(av[2]) : 0, av[4], av[3]); - return MOD_CONT; + do_server(source, params[0], Anope::string(params[2]).is_pos_number_only() ? convertTo(params[2]) : 0, params[4], params[3]); + return true; } -int anope_event_privmsg(const Anope::string &source, int ac, const char **av) +bool event_privmsg(const Anope::string &source, const std::vector ¶ms) { if (!finduser(source)) - return MOD_CONT; // likely a message from a server, which can happen. + return true; // likely a message from a server, which can happen. - m_privmsg(source, av[0], av[1]); - return MOD_CONT; + m_privmsg(source, params[0], params[1]); + return true; } -int anope_event_part(const Anope::string &source, int ac, const char **av) +bool event_part(const Anope::string &source, const std::vector ¶ms) { - do_part(source, ac, av); - return MOD_CONT; + do_part(source, params[0], params[1]); + return true; } -int anope_event_whois(const Anope::string &source, int ac, const char **av) +bool event_whois(const Anope::string &source, const std::vector ¶ms) { - m_whois(source, av[0]); - return MOD_CONT; + m_whois(source, params[0]); + return true; } -int anope_event_metadata(const Anope::string &source, int ac, const char **av) +bool event_metadata(const Anope::string &source, const std::vector ¶ms) { - if (ac < 3) - return MOD_CONT; - else if (!strcmp(av[1], "accountname")) + if (params.size() < 3) + return true; + if (params[1].equals_cs("accountname")) { - User *u = finduser(av[0]); - NickCore *nc = findcore(av[2]); + User *u = finduser(params[0]); + NickCore *nc = findcore(params[2]); if (u && nc) { u->Login(nc); } } - return MOD_CONT; + return true; } -int anope_event_capab(const Anope::string &source, int ac, const char **av) +bool event_capab(const Anope::string &source, const std::vector ¶ms) { - if (!strcasecmp(av[0], "START")) + if (params[0].equals_cs("START")) { /* reset CAPAB */ has_servicesmod = false; @@ -831,26 +827,26 @@ int anope_event_capab(const Anope::string &source, int ac, const char **av) has_chgidentmod = false; has_hidechansmod = false; } - else if (!strcasecmp(av[0], "MODULES")) + else if (params[0].equals_cs("MODULES")) { - if (strstr(av[1], "m_globops.so")) + if (params[1].find("m_globops.so") != Anope::string::npos) has_globopsmod = true; - if (strstr(av[1], "m_services_account.so")) + if (params[1].find("m_services_account.so") != Anope::string::npos) has_servicesmod = true; - if (strstr(av[1], "m_svshold.so"