From b57c7f4e466f72fdd2ac3deca42caa1ea7748338 Mon Sep 17 00:00:00 2001 From: w00t Date: Mon, 15 Oct 2007 20:59:05 +0000 Subject: In the grand tradition of huge fucking commits: - chanrec -> Channel - userrec -> User Enjoy. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8204 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/channels.cpp | 108 +++++------ src/cmd_admin.cpp | 2 +- src/cmd_away.cpp | 2 +- src/cmd_clearcache.cpp | 2 +- src/cmd_commands.cpp | 2 +- src/cmd_connect.cpp | 2 +- src/cmd_die.cpp | 2 +- src/cmd_eline.cpp | 2 +- src/cmd_gline.cpp | 2 +- src/cmd_info.cpp | 2 +- src/cmd_invite.cpp | 6 +- src/cmd_ison.cpp | 6 +- src/cmd_join.cpp | 6 +- src/cmd_kick.cpp | 8 +- src/cmd_kill.cpp | 6 +- src/cmd_kline.cpp | 2 +- src/cmd_links.cpp | 2 +- src/cmd_list.cpp | 2 +- src/cmd_loadmodule.cpp | 2 +- src/cmd_lusers.cpp | 2 +- src/cmd_map.cpp | 2 +- src/cmd_mode.cpp | 2 +- src/cmd_modules.cpp | 2 +- src/cmd_motd.cpp | 2 +- src/cmd_names.cpp | 4 +- src/cmd_nick.cpp | 4 +- src/cmd_notice.cpp | 6 +- src/cmd_oper.cpp | 2 +- src/cmd_part.cpp | 4 +- src/cmd_pass.cpp | 2 +- src/cmd_ping.cpp | 2 +- src/cmd_pong.cpp | 2 +- src/cmd_privmsg.cpp | 6 +- src/cmd_qline.cpp | 2 +- src/cmd_quit.cpp | 4 +- src/cmd_rehash.cpp | 2 +- src/cmd_reloadmodule.cpp | 2 +- src/cmd_restart.cpp | 2 +- src/cmd_rules.cpp | 2 +- src/cmd_server.cpp | 2 +- src/cmd_squit.cpp | 2 +- src/cmd_stats.cpp | 16 +- src/cmd_time.cpp | 2 +- src/cmd_topic.cpp | 4 +- src/cmd_trace.cpp | 2 +- src/cmd_unloadmodule.cpp | 2 +- src/cmd_user.cpp | 2 +- src/cmd_userhost.cpp | 4 +- src/cmd_version.cpp | 2 +- src/cmd_wallops.cpp | 2 +- src/cmd_who.cpp | 18 +- src/cmd_whois.cpp | 6 +- src/cmd_whowas.cpp | 8 +- src/cmd_zline.cpp | 2 +- src/command_parse.cpp | 20 +- src/commands.cpp | 6 +- src/configreader.cpp | 8 +- src/cull_list.cpp | 16 +- src/helperfuncs.cpp | 42 ++-- src/inspircd.cpp | 10 +- src/mode.cpp | 38 ++-- src/modes/cmode_b.cpp | 16 +- src/modes/cmode_h.cpp | 20 +- src/modes/cmode_i.cpp | 2 +- src/modes/cmode_k.cpp | 10 +- src/modes/cmode_l.cpp | 6 +- src/modes/cmode_m.cpp | 2 +- src/modes/cmode_n.cpp | 2 +- src/modes/cmode_o.cpp | 20 +- src/modes/cmode_p.cpp | 2 +- src/modes/cmode_s.cpp | 2 +- src/modes/cmode_t.cpp | 2 +- src/modes/cmode_v.cpp | 20 +- src/modes/umode_i.cpp | 2 +- src/modes/umode_n.cpp | 2 +- src/modes/umode_o.cpp | 4 +- src/modes/umode_s.cpp | 2 +- src/modes/umode_w.cpp | 2 +- src/modules.cpp | 152 +++++++-------- src/modules/extra/m_filter_pcre.cpp | 6 +- src/modules/extra/m_httpclienttest.cpp | 4 +- src/modules/extra/m_mysql.cpp | 2 +- src/modules/extra/m_pgsql.cpp | 2 +- src/modules/extra/m_sqlauth.cpp | 18 +- src/modules/extra/m_sqlite3.cpp | 2 +- src/modules/extra/m_sqllog.cpp | 14 +- src/modules/extra/m_sqloper.cpp | 14 +- src/modules/extra/m_sqlutils.cpp | 12 +- src/modules/extra/m_sqlutils.h | 12 +- src/modules/extra/m_ssl_gnutls.cpp | 18 +- src/modules/extra/m_ssl_openssl.cpp | 18 +- src/modules/extra/m_ssl_oper_cert.cpp | 8 +- src/modules/extra/m_sslinfo.cpp | 4 +- src/modules/extra/m_ziplink.cpp | 2 +- src/modules/m_alias.cpp | 8 +- src/modules/m_alltime.cpp | 2 +- src/modules/m_antibear.cpp | 4 +- src/modules/m_antibottler.cpp | 2 +- src/modules/m_auditorium.cpp | 14 +- src/modules/m_banexception.cpp | 8 +- src/modules/m_banredirect.cpp | 14 +- src/modules/m_blockamsg.cpp | 8 +- src/modules/m_blockcaps.cpp | 10 +- src/modules/m_blockcolor.cpp | 8 +- src/modules/m_botmode.cpp | 4 +- src/modules/m_cban.cpp | 6 +- src/modules/m_censor.cpp | 16 +- src/modules/m_cgiirc.cpp | 24 +-- src/modules/m_chancreate.cpp | 2 +- src/modules/m_chanfilter.cpp | 22 +-- src/modules/m_chanprotect.cpp | 54 +++--- src/modules/m_check.cpp | 6 +- src/modules/m_chghost.cpp | 6 +- src/modules/m_chgident.cpp | 4 +- src/modules/m_chgname.cpp | 4 +- src/modules/m_cloaking.cpp | 4 +- src/modules/m_clones.cpp | 2 +- src/modules/m_close.cpp | 6 +- src/modules/m_commonchans.cpp | 8 +- src/modules/m_conn_join.cpp | 6 +- src/modules/m_conn_umodes.cpp | 4 +- src/modules/m_conn_waitpong.cpp | 14 +- src/modules/m_connflood.cpp | 8 +- src/modules/m_customtitle.cpp | 14 +- src/modules/m_cycle.cpp | 8 +- src/modules/m_dccallow.cpp | 34 ++-- src/modules/m_deaf.cpp | 16 +- src/modules/m_denychans.cpp | 4 +- src/modules/m_devoice.cpp | 4 +- src/modules/m_dnsbl.cpp | 12 +- src/modules/m_filter.cpp | 6 +- src/modules/m_filter.h | 36 ++-- src/modules/m_foobar.cpp | 8 +- src/modules/m_globalload.cpp | 6 +- src/modules/m_globops.cpp | 2 +- src/modules/m_helpop.cpp | 8 +- src/modules/m_hidechans.cpp | 4 +- src/modules/m_hideoper.cpp | 4 +- src/modules/m_hostchange.cpp | 4 +- src/modules/m_httpd_stats.cpp | 12 +- src/modules/m_ident.cpp | 16 +- src/modules/m_invisible.cpp | 22 +-- src/modules/m_inviteexception.cpp | 8 +- src/modules/m_joinflood.cpp | 12 +- src/modules/m_jumpserver.cpp | 12 +- src/modules/m_kicknorejoin.cpp | 18 +- src/modules/m_knock.cpp | 6 +- src/modules/m_lockserv.cpp | 12 +- src/modules/m_messageflood.cpp | 32 +-- src/modules/m_namesx.cpp | 6 +- src/modules/m_nickflood.cpp | 12 +- src/modules/m_nicklock.cpp | 16 +- src/modules/m_noctcp.cpp | 8 +- src/modules/m_noinvite.cpp | 4 +- src/modules/m_nokicks.cpp | 4 +- src/modules/m_nonicks.cpp | 6 +- src/modules/m_nonotice.cpp | 6 +- src/modules/m_oper_hash.cpp | 6 +- src/modules/m_operchans.cpp | 4 +- src/modules/m_operflood.cpp | 2 +- src/modules/m_operjoin.cpp | 6 +- src/modules/m_operlevels.cpp | 4 +- src/modules/m_operlog.cpp | 2 +- src/modules/m_opermodes.cpp | 4 +- src/modules/m_opermotd.cpp | 8 +- src/modules/m_override.cpp | 12 +- src/modules/m_randquote.cpp | 4 +- src/modules/m_redirect.cpp | 14 +- src/modules/m_regonlycreate.cpp | 2 +- src/modules/m_remove.cpp | 12 +- src/modules/m_restrictbanned.cpp | 12 +- src/modules/m_restrictchans.cpp | 4 +- src/modules/m_restrictmsg.cpp | 6 +- src/modules/m_safelist.cpp | 14 +- src/modules/m_sajoin.cpp | 8 +- src/modules/m_samode.cpp | 2 +- src/modules/m_sanick.cpp | 4 +- src/modules/m_sapart.cpp | 8 +- src/modules/m_saquit.cpp | 6 +- src/modules/m_securelist.cpp | 4 +- src/modules/m_seenicks.cpp | 2 +- src/modules/m_services.cpp | 24 +-- src/modules/m_services_account.cpp | 28 +-- src/modules/m_servprotect.cpp | 8 +- src/modules/m_sethost.cpp | 4 +- src/modules/m_setident.cpp | 2 +- src/modules/m_setidle.cpp | 2 +- src/modules/m_setname.cpp | 2 +- src/modules/m_showwhois.cpp | 4 +- src/modules/m_silence.cpp | 12 +- src/modules/m_silence_ext.cpp | 22 +-- src/modules/m_spanningtree/main.cpp | 96 ++++----- src/modules/m_spanningtree/main.h | 92 ++++----- src/modules/m_spanningtree/override_admin.cpp | 2 +- src/modules/m_spanningtree/override_map.cpp | 4 +- src/modules/m_spanningtree/override_modules.cpp | 2 +- src/modules/m_spanningtree/override_motd.cpp | 2 +- src/modules/m_spanningtree/override_squit.cpp | 2 +- src/modules/m_spanningtree/override_stats.cpp | 4 +- src/modules/m_spanningtree/override_time.cpp | 2 +- src/modules/m_spanningtree/override_whois.cpp | 4 +- src/modules/m_spanningtree/postcommand.cpp | 2 +- src/modules/m_spanningtree/precommand.cpp | 2 +- src/modules/m_spanningtree/rconnect.cpp | 2 +- src/modules/m_spanningtree/rconnect.h | 2 +- src/modules/m_spanningtree/rsquit.cpp | 4 +- src/modules/m_spanningtree/rsquit.h | 4 +- src/modules/m_spanningtree/treeserver.cpp | 10 +- src/modules/m_spanningtree/treesocket.h | 4 +- src/modules/m_spanningtree/treesocket1.cpp | 34 ++-- src/modules/m_spanningtree/treesocket2.cpp | 82 ++++---- src/modules/m_spanningtree/utils.cpp | 8 +- src/modules/m_spanningtree/utils.h | 2 +- src/modules/m_spy.cpp | 8 +- src/modules/m_ssl_dummy.cpp | 6 +- src/modules/m_sslmodes.cpp | 4 +- src/modules/m_stripcolor.cpp | 12 +- src/modules/m_svshold.cpp | 6 +- src/modules/m_swhois.cpp | 20 +- src/modules/m_taxonomy.cpp | 6 +- src/modules/m_testcommand.cpp | 2 +- src/modules/m_timedbans.cpp | 8 +- src/modules/m_tline.cpp | 2 +- src/modules/m_uhnames.cpp | 6 +- src/modules/m_uninvite.cpp | 6 +- src/modules/m_userip.cpp | 4 +- src/modules/m_vhost.cpp | 2 +- src/modules/m_watch.cpp | 40 ++-- src/modules/m_xmlsocket.cpp | 6 +- src/snomasks.cpp | 4 +- src/socket.cpp | 2 +- src/userprocess.cpp | 20 +- src/users.cpp | 246 ++++++++++++------------ src/xline.cpp | 56 +++--- 234 files changed, 1295 insertions(+), 1295 deletions(-) (limited to 'src') diff --git a/src/channels.cpp b/src/channels.cpp index 5169fbf63..8f0d2d744 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -16,7 +16,7 @@ #include "wildcard.h" #include "mode.h" -chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance) +Channel::Channel(InspIRCd* Instance) : ServerInstance(Instance) { *name = *topic = *setby = *key = 0; maxbans = created = topicset = limit = 0; @@ -24,7 +24,7 @@ chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance) age = ServerInstance->Time(true); } -void chanrec::SetMode(char mode,bool mode_on) +void Channel::SetMode(char mode,bool mode_on) { modes[mode-65] = mode_on; if (!mode_on) @@ -32,7 +32,7 @@ void chanrec::SetMode(char mode,bool mode_on) } -void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on) +void Channel::SetModeParam(char mode,const char* parameter,bool mode_on) { CustomModeList::iterator n = custom_mode_params.find(mode); @@ -51,12 +51,12 @@ void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on) } } -bool chanrec::IsModeSet(char mode) +bool Channel::IsModeSet(char mode) { return modes[mode-65]; } -std::string chanrec::GetModeParameter(char mode) +std::string Channel::GetModeParameter(char mode) { switch (mode) { @@ -73,17 +73,17 @@ std::string chanrec::GetModeParameter(char mode) } } -long chanrec::GetUserCounter() +long Channel::GetUserCounter() { return (this->internal_userlist.size()); } -void chanrec::AddUser(userrec* user) +void Channel::AddUser(User* user) { internal_userlist[user] = user->nick; } -unsigned long chanrec::DelUser(userrec* user) +unsigned long Channel::DelUser(User* user) { CUListIter a = internal_userlist.find(user); @@ -99,17 +99,17 @@ unsigned long chanrec::DelUser(userrec* user) return internal_userlist.size(); } -bool chanrec::HasUser(userrec* user) +bool Channel::HasUser(User* user) { return (internal_userlist.find(user) != internal_userlist.end()); } -void chanrec::AddOppedUser(userrec* user) +void Channel::AddOppedUser(User* user) { internal_op_userlist[user] = user->nick; } -void chanrec::DelOppedUser(userrec* user) +void Channel::DelOppedUser(User* user) { CUListIter a = internal_op_userlist.find(user); if (a != internal_op_userlist.end()) @@ -119,12 +119,12 @@ void chanrec::DelOppedUser(userrec* user) } } -void chanrec::AddHalfoppedUser(userrec* user) +void Channel::AddHalfoppedUser(User* user) { internal_halfop_userlist[user] = user->nick; } -void chanrec::DelHalfoppedUser(userrec* user) +void Channel::DelHalfoppedUser(User* user) { CUListIter a = internal_halfop_userlist.find(user); @@ -134,12 +134,12 @@ void chanrec::DelHalfoppedUser(userrec* user) } } -void chanrec::AddVoicedUser(userrec* user) +void Channel::AddVoicedUser(User* user) { internal_voice_userlist[user] = user->nick; } -void chanrec::DelVoicedUser(userrec* user) +void Channel::DelVoicedUser(User* user) { CUListIter a = internal_voice_userlist.find(user); @@ -149,27 +149,27 @@ void chanrec::DelVoicedUser(userrec* user) } } -CUList* chanrec::GetUsers() +CUList* Channel::GetUsers() { return &internal_userlist; } -CUList* chanrec::GetOppedUsers() +CUList* Channel::GetOppedUsers() { return &internal_op_userlist; } -CUList* chanrec::GetHalfoppedUsers() +CUList* Channel::GetHalfoppedUsers() { return &internal_halfop_userlist; } -CUList* chanrec::GetVoicedUsers() +CUList* Channel::GetVoicedUsers() { return &internal_voice_userlist; } -void chanrec::SetDefaultModes() +void Channel::SetDefaultModes() { irc::spacesepstream list(ServerInstance->Config->DefaultModes); std::string modeseq; @@ -196,7 +196,7 @@ void chanrec::SetDefaultModes() * add a channel to a user, creating the record for it if needed and linking * it to the user record */ -chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bool override, const char* key, time_t TS) +Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool override, const char* key, time_t TS) { if (!user || !cn) return NULL; @@ -204,7 +204,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo char cname[MAXBUF]; int MOD_RESULT = 0; std::string privs; - chanrec *Ptr; + Channel *Ptr; /* * We don't restrict the number of channels that remote users or users that are override-joining may be in. @@ -254,7 +254,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo if (!IS_LOCAL(user)) { if (!TS) - Instance->Log(DEBUG,"*** BUG *** chanrec::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick, cn); + Instance->Log(DEBUG,"*** BUG *** Channel::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick, cn); } else { @@ -270,7 +270,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo } /* create a new one */ - Ptr = new chanrec(Instance); + Ptr = new Channel(Instance); (*(Instance->chanlist))[cname] = Ptr; strlcpy(Ptr->name, cname,CHANMAX); @@ -357,10 +357,10 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo } } - return chanrec::ForceChan(Instance, Ptr, user, privs); + return Channel::ForceChan(Instance, Ptr, user, privs); } -chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, const std::string &privs) +Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs) { std::string nick = user->nick; bool silent = false; @@ -427,7 +427,7 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con return Ptr; } -bool chanrec::IsBanned(userrec* user) +bool Channel::IsBanned(User* user) { char mask[MAXBUF]; int MOD_RESULT = 0; @@ -450,11 +450,11 @@ bool chanrec::IsBanned(userrec* user) return false; } -/* chanrec::PartUser +/* Channel::PartUser * remove a channel from a users record, and return the number of users left. - * Therefore, if this function returns 0 the caller should delete the chanrec. + * Therefore, if this function returns 0 the caller should delete the Channel. */ -long chanrec::PartUser(userrec *user, const char* reason) +long Channel::PartUser(User *user, const char* reason) { bool silent = false; @@ -488,7 +488,7 @@ long chanrec::PartUser(userrec *user, const char* reason) return this->GetUserCounter(); } -long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggerevents) +long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents) { bool silent = false; @@ -534,7 +534,7 @@ long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggereven return this->GetUserCounter(); } -long chanrec::KickUser(userrec *src, userrec *user, const char* reason) +long Channel::KickUser(User *src, User *user, const char* reason) { bool silent = false; @@ -612,7 +612,7 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason) return this->GetUserCounter(); } -void chanrec::WriteChannel(userrec* user, char* text, ...) +void Channel::WriteChannel(User* user, char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -627,7 +627,7 @@ void chanrec::WriteChannel(userrec* user, char* text, ...) this->WriteChannel(user, std::string(textbuffer)); } -void chanrec::WriteChannel(userrec* user, const std::string &text) +void Channel::WriteChannel(User* user, const std::string &text) { CUList *ulist = this->GetUsers(); char tb[MAXBUF]; @@ -645,7 +645,7 @@ void chanrec::WriteChannel(userrec* user, const std::string &text) } } -void chanrec::WriteChannelWithServ(const char* ServName, const char* text, ...) +void Channel::WriteChannelWithServ(const char* ServName, const char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -660,7 +660,7 @@ void chanrec::WriteChannelWithServ(const char* ServName, const char* text, ...) this->WriteChannelWithServ(ServName, std::string(textbuffer)); } -void chanrec::WriteChannelWithServ(const char* ServName, const std::string &text) +void Channel::WriteChannelWithServ(const char* ServName, const std::string &text) { CUList *ulist = this->GetUsers(); char tb[MAXBUF]; @@ -677,7 +677,7 @@ void chanrec::WriteChannelWithServ(const char* ServName, const std::string &text /* write formatted text from a source user to all users on a channel except * for the sender (for privmsg etc) */ -void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, char* text, ...) +void Channel::WriteAllExceptSender(User* user, bool serversource, char status, char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -692,7 +692,7 @@ void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status this->WriteAllExceptSender(user, serversource, status, std::string(textbuffer)); } -void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CUList &except_list, char* text, ...) +void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -707,7 +707,7 @@ void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CULi this->WriteAllExcept(user, serversource, status, except_list, std::string(textbuffer)); } -void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CUList &except_list, const std::string &text) +void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const std::string &text) { CUList *ulist; char tb[MAXBUF]; @@ -743,7 +743,7 @@ void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CULi } } -void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, const std::string& text) +void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const std::string& text) { CUList except_list; except_list[user] = user->nick; @@ -754,7 +754,7 @@ void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status * return a count of the users on a specific channel accounting for * invisible users who won't increase the count. e.g. for /LIST */ -int chanrec::CountInvisible() +int Channel::CountInvisible() { int count = 0; CUList *ulist= this->GetUsers(); @@ -767,7 +767,7 @@ int chanrec::CountInvisible() return count; } -char* chanrec::ChanModes(bool showkey) +char* Channel::ChanModes(bool showkey) { static char scratch[MAXBUF]; static char sparam[MAXBUF]; @@ -777,7 +777,7 @@ char* chanrec::ChanModes(bool showkey) *scratch = '\0'; *sparam = '\0'; - /* This was still iterating up to 190, chanrec::modes is only 64 elements -- Om */ + /* This was still iterating up to 190, Channel::modes is only 64 elements -- Om */ for(int n = 0; n < 64; n++) { if(this->modes[n]) @@ -821,7 +821,7 @@ char* chanrec::ChanModes(bool showkey) /* compile a userlist of a channel into a string, each nick seperated by * spaces and op, voice etc status shown as @ and +, and send it to 'user' */ -void chanrec::UserList(userrec *user, CUList *ulist) +void Channel::UserList(User *user, CUList *ulist) { char list[MAXBUF]; size_t dlen, curlen; @@ -893,7 +893,7 @@ void chanrec::UserList(userrec *user, CUList *ulist) user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, this->name); } -long chanrec::GetMaxBans() +long Channel::GetMaxBans() { /* Return the cached value if there is one */ if (this->maxbans) @@ -914,7 +914,7 @@ long chanrec::GetMaxBans() return this->maxbans; } -void chanrec::ResetMaxBans() +void Channel::ResetMaxBans() { this->maxbans = 0; } @@ -923,7 +923,7 @@ void chanrec::ResetMaxBans() * % for halfop etc. If the user has several modes set, the highest mode * the user has must be returned. */ -const char* chanrec::GetPrefixChar(userrec *user) +const char* Channel::GetPrefixChar(User *user) { static char pf[2] = {0, 0}; @@ -946,7 +946,7 @@ const char* chanrec::GetPrefixChar(userrec *user) return pf; } -const char* chanrec::GetAllPrefixChars(userrec* user) +const char* Channel::GetAllPrefixChars(User* user) { static char prefix[MAXBUF]; int ctr = 0; @@ -966,7 +966,7 @@ const char* chanrec::GetAllPrefixChars(userrec* user) return prefix; } -unsigned int chanrec::GetPrefixValue(userrec* user) +unsigned int Channel::GetPrefixValue(User* user) { prefixlist::iterator n = prefixes.find(user); if (n != prefixes.end()) @@ -977,7 +977,7 @@ unsigned int chanrec::GetPrefixValue(userrec* user) return 0; } -int chanrec::GetStatusFlags(userrec *user) +int Channel::GetStatusFlags(User *user) { UCListIter i = user->chans.find(this); if (i != user->chans.end()) @@ -987,7 +987,7 @@ int chanrec::GetStatusFlags(userrec *user) return 0; } -int chanrec::GetStatus(userrec *user) +int Channel::GetStatus(User *user) { if (ServerInstance->ULine(user->server)) return STATUS_OP; @@ -1012,7 +1012,7 @@ int chanrec::GetStatus(userrec *user) return STATUS_NORMAL; } -void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, bool adding) +void Channel::SetPrefix(User* user, char prefix, unsigned int prefix_value, bool adding) { prefixlist::iterator n = prefixes.find(user); prefixtype pfx = std::make_pair(prefix,prefix_value); @@ -1035,7 +1035,7 @@ void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, b { pfxcontainer one; one.push_back(pfx); - prefixes.insert(std::make_pair(user, one)); + prefixes.insert(std::make_pair(user, one)); } } else @@ -1049,7 +1049,7 @@ void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, b } } -void chanrec::RemoveAllPrefixes(userrec* user) +void Channel::RemoveAllPrefixes(User* user) { prefixlist::iterator n = prefixes.find(user); if (n != prefixes.end()) diff --git a/src/cmd_admin.cpp b/src/cmd_admin.cpp index a7a72c0f8..427342cfb 100644 --- a/src/cmd_admin.cpp +++ b/src/cmd_admin.cpp @@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /ADMIN */ -CmdResult cmd_admin::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_admin::Handle (const char** parameters, int pcnt, User *user) { user->WriteServ("256 %s :Administrative info for %s",user->nick,ServerInstance->Config->ServerName); if (*ServerInstance->Config->AdminName) diff --git a/src/cmd_away.cpp b/src/cmd_away.cpp index c27ce222a..c237a94fd 100644 --- a/src/cmd_away.cpp +++ b/src/cmd_away.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /AWAY */ -CmdResult cmd_away::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_away::Handle (const char** parameters, int pcnt, User *user) { if ((pcnt) && (*parameters[0])) { diff --git a/src/cmd_clearcache.cpp b/src/cmd_clearcache.cpp index 0a08498e8..aed05c093 100644 --- a/src/cmd_clearcache.cpp +++ b/src/cmd_clearcache.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /CLEARCACHE */ -CmdResult cmd_clearcache::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_clearcache::Handle (const char** parameters, int pcnt, User *user) { int n = ServerInstance->Res->ClearCache(); user->WriteServ("NOTICE %s :*** Cleared DNS cache of %d items.", user->nick, n); diff --git a/src/cmd_commands.cpp b/src/cmd_commands.cpp index 41f68690e..bfdafb6ad 100644 --- a/src/cmd_commands.cpp +++ b/src/cmd_commands.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_commands(Instance); } -CmdResult cmd_commands::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_commands::Handle (const char** parameters, int pcnt, User *user) { for (Commandable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++) { diff --git a/src/cmd_connect.cpp b/src/cmd_connect.cpp index 63afa02a2..eff8a23f0 100644 --- a/src/cmd_connect.cpp +++ b/src/cmd_connect.cpp @@ -25,7 +25,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /CONNECT */ -CmdResult cmd_connect::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_connect::Handle (const char** parameters, int pcnt, User *user) { user->WriteServ( "NOTICE %s :Look into loading a linking module (like m_spanningtree) if you want this to do anything useful.", user->nick); return CMD_SUCCESS; diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp index 4772c9d17..3193a19e1 100644 --- a/src/cmd_die.cpp +++ b/src/cmd_die.cpp @@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /DIE */ -CmdResult cmd_die::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_die::Handle (const char** parameters, int pcnt, User *user) { if (!strcmp(parameters[0],ServerInstance->Config->diepass)) { diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp index d28f72418..6a4db99dd 100644 --- a/src/cmd_eline.cpp +++ b/src/cmd_eline.cpp @@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /ELINE */ -CmdResult cmd_eline::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_eline::Handle (const char** parameters, int pcnt, User *user) { if (pcnt >= 3) { diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp index 2dff4902e..1cd4bcb48 100644 --- a/src/cmd_gline.cpp +++ b/src/cmd_gline.cpp @@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /GLINE */ -CmdResult cmd_gline::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_gline::Handle (const char** parameters, int pcnt, User *user) { if (pcnt >= 3) { diff --git a/src/cmd_info.cpp b/src/cmd_info.cpp index 29085afb7..447834a7f 100644 --- a/src/cmd_info.cpp +++ b/src/cmd_info.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /INFO */ -CmdResult cmd_info::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_info::Handle (const char** parameters, int pcnt, User *user) { user->WriteServ( "371 %s : -/\\- \2InspIRCd\2 -\\/-", user->nick); user->WriteServ( "371 %s : November 2002 - Present", user->nick); diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp index a1e3fb24b..49382deb8 100644 --- a/src/cmd_invite.cpp +++ b/src/cmd_invite.cpp @@ -21,14 +21,14 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /INVITE */ -CmdResult cmd_invite::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_invite::Handle (const char** parameters, int pcnt, User *user) { int MOD_RESULT = 0; if (pcnt == 2) { - userrec* u = ServerInstance->FindNick(parameters[0]); - chanrec* c = ServerInstance->FindChan(parameters[1]); + User* u = ServerInstance->FindNick(parameters[0]); + Channel* c = ServerInstance->FindChan(parameters[1]); if ((!c) || (!u)) { diff --git a/src/cmd_ison.cpp b/src/cmd_ison.cpp index 4c5542cd8..94221f152 100644 --- a/src/cmd_ison.cpp +++ b/src/cmd_ison.cpp @@ -21,10 +21,10 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /ISON */ -CmdResult cmd_ison::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_ison::Handle (const char** parameters, int pcnt, User *user) { - std::map ison_already; - userrec *u; + std::map ison_already; + User *u; std::string reply = std::string("303 ") + user->nick + " :"; for (int i = 0; i < pcnt; i++) diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp index 171f90bba..0c5c3f157 100644 --- a/src/cmd_join.cpp +++ b/src/cmd_join.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /JOIN */ -CmdResult cmd_join::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_join::Handle (const char** parameters, int pcnt, User *user) { if (pcnt > 1) { @@ -30,7 +30,7 @@ CmdResult cmd_join::Handle (const char** parameters, int pcnt, userrec *user) if (ServerInstance->IsChannel(parameters[0])) { - chanrec::JoinUser(ServerInstance, user, parameters[0], false, parameters[1]); + Channel::JoinUser(ServerInstance, user, parameters[0], false, parameters[1]); return CMD_SUCCESS; } } @@ -41,7 +41,7 @@ CmdResult cmd_join::Handle (const char** parameters, int pcnt, userrec *user) if (ServerInstance->IsChannel(parameters[0])) { - chanrec::JoinUser(ServerInstance, user, parameters[0], false, ""); + Channel::JoinUser(ServerInstance, user, parameters[0], false, ""); return CMD_SUCCESS; } } diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp index 78edb177d..c4eeaf609 100644 --- a/src/cmd_kick.cpp +++ b/src/cmd_kick.cpp @@ -21,11 +21,11 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /KICK */ -CmdResult cmd_kick::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_kick::Handle (const char** parameters, int pcnt, User *user) { char reason[MAXKICK]; - chanrec* c = ServerInstance->FindChan(parameters[0]); - userrec* u = ServerInstance->FindNick(parameters[1]); + Channel* c = ServerInstance->FindChan(parameters[0]); + User* u = ServerInstance->FindNick(parameters[1]); if (!u || !c) { @@ -49,7 +49,7 @@ CmdResult cmd_kick::Handle (const char** parameters, int pcnt, userrec *user) } if (!c->KickUser(user, u, reason)) - /* Nobody left here, delete the chanrec */ + /* Nobody left here, delete the Channel */ delete c; return CMD_SUCCESS; diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp index a2e76ce45..e137e1ab2 100644 --- a/src/cmd_kill.cpp +++ b/src/cmd_kill.cpp @@ -21,13 +21,13 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /KILL */ -CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_kill::Handle (const char** parameters, int pcnt, User *user) { /* Allow comma seperated lists of users for /KILL (thanks w00t) */ if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0)) return CMD_SUCCESS; - userrec *u = ServerInstance->FindNick(parameters[0]); + User *u = ServerInstance->FindNick(parameters[0]); char killreason[MAXBUF]; int MOD_RESULT = 0; @@ -103,7 +103,7 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user) } // send the quit out - userrec::QuitUser(ServerInstance, u, killreason); + User::QuitUser(ServerInstance, u, killreason); } else { diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp index 75a868577..5dbdf2b2e 100644 --- a/src/cmd_kline.cpp +++ b/src/cmd_kline.cpp @@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /KLINE */ -CmdResult cmd_kline::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_kline::Handle (const char** parameters, int pcnt, User *user) { if (pcnt >= 3) { diff --git a/src/cmd_links.cpp b/src/cmd_links.cpp index 2576b63e9..0bf8a19de 100644 --- a/src/cmd_links.cpp +++ b/src/cmd_links.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /LINKS */ -CmdResult cmd_links::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_links::Handle (const char** parameters, int pcnt, User *user) { user->WriteServ("364 %s %s %s :0 %s",user->nick,ServerInstance->Config->ServerName,ServerInstance->Config->ServerName,ServerInstance->Config->ServerDesc); user->WriteServ("365 %s * :End of /LINKS list.",user->nick); diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp index e77feeb66..ff4715bec 100644 --- a/src/cmd_list.cpp +++ b/src/cmd_list.cpp @@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_list(Instance); } -CmdResult cmd_list::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_list::Handle (const char** parameters, int pcnt, User *user) { int minusers = 0, maxusers = 0; diff --git a/src/cmd_loadmodule.cpp b/src/cmd_loadmodule.cpp index 0c5cb139b..a16a58789 100644 --- a/src/cmd_loadmodule.cpp +++ b/src/cmd_loadmodule.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /LOADMODULE */ -CmdResult cmd_loadmodule::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_loadmodule::Handle (const char** parameters, int pcnt, User *user) { if (ServerInstance->Modules->Load(parameters[0])) { diff --git a/src/cmd_lusers.cpp b/src/cmd_lusers.cpp index cc66ba435..1ea6f2f42 100644 --- a/src/cmd_lusers.cpp +++ b/src/cmd_lusers.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /LUSERS */ -CmdResult cmd_lusers::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_lusers::Handle (const char** parameters, int pcnt, User *user) { // this lusers command shows one server at all times because // a protocol module must override it to show those stats. diff --git a/src/cmd_map.cpp b/src/cmd_map.cpp index 471f53a1a..05bd0cbef 100644 --- a/src/cmd_map.cpp +++ b/src/cmd_map.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /MAP */ -CmdResult cmd_map::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_map::Handle (const char** parameters, int pcnt, User *user) { // as with /LUSERS this does nothing without a linking // module to override its behaviour and display something diff --git a/src/cmd_mode.cpp b/src/cmd_mode.cpp index 5680e1b05..e5240b00d 100644 --- a/src/cmd_mode.cpp +++ b/src/cmd_mode.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /MODE */ -CmdResult cmd_mode::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_mode::Handle (const char** parameters, int pcnt, User *user) { ServerInstance->Modes->Process(parameters, pcnt, user, false); return CMD_SUCCESS; diff --git a/src/cmd_modules.cpp b/src/cmd_modules.cpp index 12697a68f..fd86254e5 100644 --- a/src/cmd_modules.cpp +++ b/src/cmd_modules.cpp @@ -38,7 +38,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /MODULES */ -CmdResult cmd_modules::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_modules::Handle (const char** parameters, int pcnt, User *user) { for (unsigned int i = 0; i < ServerInstance->Config->module_names.size(); i++) { diff --git a/src/cmd_motd.cpp b/src/cmd_motd.cpp index 53d140a9d..019b13228 100644 --- a/src/cmd_motd.cpp +++ b/src/cmd_motd.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /MOTD */ -CmdResult cmd_motd::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_motd::Handle (const char** parameters, int pcnt, User *user) { user->ShowMOTD(); return CMD_SUCCESS; diff --git a/src/cmd_names.cpp b/src/cmd_names.cpp index 21ab2f3ed..29d448f28 100644 --- a/src/cmd_names.cpp +++ b/src/cmd_names.cpp @@ -21,9 +21,9 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /NAMES */ -CmdResult cmd_names::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_names::Handle (const char** parameters, int pcnt, User *user) { - chanrec* c; + Channel* c; if (!pcnt) { diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp index 6eb72349b..d350b26b6 100644 --- a/src/cmd_nick.cpp +++ b/src/cmd_nick.cpp @@ -25,7 +25,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) * for the client introduction code in here, youre in the wrong place. * You need to look in the spanningtree module for this! */ -CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_nick::Handle (const char** parameters, int pcnt, User *user) { char oldnick[NICKMAX]; @@ -73,7 +73,7 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user) * the nickname too, we force a nickchange on the older user (Simply the one who was * here first, no TS checks need to take place here) */ - userrec* InUse = ServerInstance->FindNickOnly(parameters[0]); + User* InUse = ServerInstance->FindNickOnly(parameters[0]); if (InUse && (InUse != user) && ((ServerInstance->IsNick(parameters[0]) || allowinvalid))) { if (InUse->registered != REG_ALL) diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp index 7c0f06b40..cf4d7b44a 100644 --- a/src/cmd_notice.cpp +++ b/src/cmd_notice.cpp @@ -20,10 +20,10 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_notice(Instance); } -CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_notice::Handle (const char** parameters, int pcnt, User *user) { - userrec *dest; - chanrec *chan; + User *dest; + Channel *chan; CUList exempt_list; diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp index cc2ae6e65..1af42fffa 100644 --- a/src/cmd_oper.cpp +++ b/src/cmd_oper.cpp @@ -35,7 +35,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_oper(Instance); } -CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_oper::Handle (const char** parameters, int pcnt, User *user) { char LoginName[MAXBUF]; char Password[MAXBUF]; diff --git a/src/cmd_part.cpp b/src/cmd_part.cpp index 9088ec21d..18e8d19d9 100644 --- a/src/cmd_part.cpp +++ b/src/cmd_part.cpp @@ -19,12 +19,12 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_part(Instance); } -CmdResult cmd_part::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_part::Handle (const char** parameters, int pcnt, User *user) { if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0)) return CMD_SUCCESS; - chanrec* c = ServerInstance->FindChan(parameters[0]); + Channel* c = ServerInstance->FindChan(parameters[0]); if (c) { diff --git a/src/cmd_pass.cpp b/src/cmd_pass.cpp index 78bf1a2cf..db84eb051 100644 --- a/src/cmd_pass.cpp +++ b/src/cmd_pass.cpp @@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_pass(Instance); } -CmdResult cmd_pass::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_pass::Handle (const char** parameters, int pcnt, User *user) { // Check to make sure they havnt registered -- Fix by FCS if (user->registered == REG_ALL) diff --git a/src/cmd_ping.cpp b/src/cmd_ping.cpp index ff16f2e44..735f9c3be 100644 --- a/src/cmd_ping.cpp +++ b/src/cmd_ping.cpp @@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_ping(Instance); } -CmdResult cmd_ping::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_ping::Handle (const char** parameters, int pcnt, User *user) { user->WriteServ("PONG %s :%s",ServerInstance->Config->ServerName,parameters[0]); return CMD_SUCCESS; diff --git a/src/cmd_pong.cpp b/src/cmd_pong.cpp index dab4de720..aca317078 100644 --- a/src/cmd_pong.cpp +++ b/src/cmd_pong.cpp @@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_pong(Instance); } -CmdResult cmd_pong::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_pong::Handle (const char** parameters, int pcnt, User *user) { // set the user as alive so they survive to next ping user->lastping = 1; diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp index 2c54a770a..fddf810d2 100644 --- a/src/cmd_privmsg.cpp +++ b/src/cmd_privmsg.cpp @@ -20,10 +20,10 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_privmsg(Instance); } -CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, User *user) { - userrec *dest; - chanrec *chan; + User *dest; + Channel *chan; CUList except_list; user->idle_lastmsg = ServerInstance->Time(); diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp index 1d4f8d089..4f843cb5e 100644 --- a/src/cmd_qline.cpp +++ b/src/cmd_qline.cpp @@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_qline(Instance); } -CmdResult cmd_qline::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_qline::Handle (const char** parameters, int pcnt, User *user) { if (pcnt >= 3) { diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp index 8626db1ef..ae3d68296 100644 --- a/src/cmd_quit.cpp +++ b/src/cmd_quit.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_quit(Instance); } -CmdResult cmd_quit::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_quit::Handle (const char** parameters, int pcnt, User *user) { std::string quitmsg; @@ -38,7 +38,7 @@ CmdResult cmd_quit::Handle (const char** parameters, int pcnt, userrec *user) else quitmsg = pcnt ? parameters[0] : "Client exited"; - userrec::QuitUser(ServerInstance, user, quitmsg); + User::QuitUser(ServerInstance, user, quitmsg); return CMD_SUCCESS; } diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp index a1292f19f..5612f59fa 100644 --- a/src/cmd_rehash.cpp +++ b/src/cmd_rehash.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_rehash(Instance); } -CmdResult cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_rehash::Handle (const char** parameters, int pcnt, User *user) { user->WriteServ("382 %s %s :Rehashing",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName)); std::string parameter; diff --git a/src/cmd_reloadmodule.cpp b/src/cmd_reloadmodule.cpp index b1201ef6e..a08dc7fec 100644 --- a/src/cmd_reloadmodule.cpp +++ b/src/cmd_reloadmodule.cpp @@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_reloadmodule(Instance); } -CmdResult cmd_reloadmodule::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_reloadmodule::Handle (const char** parameters, int pcnt, User *user) { if (ServerInstance->Modules->Unload(parameters[0])) { diff --git a/src/cmd_restart.cpp b/src/cmd_restart.cpp index 8da98f77e..6880d5e28 100644 --- a/src/cmd_restart.cpp +++ b/src/cmd_restart.cpp @@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_restart(Instance); } -CmdResult cmd_restart::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_restart::Handle (const char** parameters, int pcnt, User *user) { ServerInstance->Log(DEFAULT,"Restart: %s",user->nick); if (!strcmp(parameters[0],ServerInstance->Config->restartpass)) diff --git a/src/cmd_rules.cpp b/src/cmd_rules.cpp index 7c47607db..668a207b7 100644 --- a/src/cmd_rules.cpp +++ b/src/cmd_rules.cpp @@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_rules(Instance); } -CmdResult cmd_rules::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_rules::Handle (const char** parameters, int pcnt, User *user) { user->ShowRULES(); return CMD_SUCCESS; diff --git a/src/cmd_server.cpp b/src/cmd_server.cpp index 837c94067..7781d3331 100644 --- a/src/cmd_server.cpp +++ b/src/cmd_server.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_server(Instance); } -CmdResult cmd_server::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_server::Handle (const char** parameters, int pcnt, User *user) { user->WriteServ("666 %s :You cannot identify as a server, you are a USER. IRC Operators informed.",user->nick); ServerInstance->WriteOpers("*** WARNING: %s attempted to issue a SERVER command and is registered as a user!",user->nick); diff --git a/src/cmd_squit.cpp b/src/cmd_squit.cpp index a29ddbaef..3f8175093 100644 --- a/src/cmd_squit.cpp +++ b/src/cmd_squit.cpp @@ -24,7 +24,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_squit(Instance); } -CmdResult cmd_squit::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_squit::Handle (const char** parameters, int pcnt, User *user) { user->WriteServ( "NOTICE %s :Look into loading a linking module (like m_spanningtree) if you want this to do anything useful.", user->nick); return CMD_FAILURE; diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp index 4b93d5f5f..38cae03cf 100644 --- a/src/cmd_stats.cpp +++ b/src/cmd_stats.cpp @@ -31,7 +31,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_stats(Instance); } -CmdResult cmd_stats::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_stats::Handle (const char** parameters, int pcnt, User *user) { if (IS_LOCAL(user)) { @@ -44,7 +44,7 @@ CmdResult cmd_stats::Handle (const char** parameters, int pcnt, userrec *user) return CMD_SUCCESS; } -DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_list &results) +DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, string_list &results) { std::string sn = ServerInstance->Config->ServerName; @@ -173,8 +173,8 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, case 'z': { results.push_back(sn+" 240 "+user->nick+" :InspIRCd(CLASS) "+ConvToStr(sizeof(InspIRCd))+" bytes"); - results.push_back(sn+" 249 "+user->nick+" :Users(HASH_MAP) "+ConvToStr(ServerInstance->clientlist->size())+" ("+ConvToStr(ServerInstance->clientlist->size()*sizeof(userrec))+" bytes)"); - results.push_back(sn+" 249 "+user->nick+" :Channels(HASH_MAP) "+ConvToStr(ServerInstance->chanlist->size())+" ("+ConvToStr(ServerInstance->chanlist->size()*sizeof(chanrec))+" bytes)"); + results.push_back(sn+" 249 "+user->nick+" :Users(HASH_MAP) "+ConvToStr(ServerInstance->clientlist->size())+" ("+ConvToStr(ServerInstance->clientlist->size()*sizeof(User))+" bytes)"); + results.push_back(sn+" 249 "+user->nick+" :Channels(HASH_MAP) "+ConvToStr(ServerInstance->chanlist->size())+" ("+ConvToStr(ServerInstance->chanlist->size()*sizeof(Channel))+" bytes)"); results.push_back(sn+" 249 "+user->nick+" :Commands(VECTOR) "+ConvToStr(ServerInstance->Parser->cmdlist.size())+" ("+ConvToStr(ServerInstance->Parser->cmdlist.size()*sizeof(Command))+" bytes)"); if (!ServerInstance->Config->WhoWasGroupSize == 0 && !ServerInstance->Config->WhoWasMaxGroups == 0) @@ -259,9 +259,9 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, /* stats l (show user I/O stats) */ case 'l': results.push_back(sn+" 211 "+user->nick+" :nick[ident@host] sendq cmds_out bytes_out cmds_in bytes_in time_open"); - for (std::vector::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++) + for (std::vector::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++) { - userrec* i = *n; + User* i = *n; if (ServerInstance->IsNick(i->nick)) { results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->dhost+"] "+ConvToStr(i->sendq.length())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(ServerInstance->Time() - i->age)); @@ -272,9 +272,9 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, /* stats L (show user I/O stats with IP addresses) */ case 'L': results.push_back(sn+" 211 "+user->nick+" :nick[ident@ip] sendq cmds_out bytes_out cmds_in bytes_in time_open"); - for (std::vector::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++) + for (std::vector::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++) { - userrec* i = *n; + User* i = *n; if (ServerInstance->IsNick(i->nick)) { results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->GetIPString()+"] "+ConvToStr(i->sendq.length())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(ServerInstance->Time() - i->age)); diff --git a/src/cmd_time.cpp b/src/cmd_time.cpp index 926d69204..ddeb0b190 100644 --- a/src/cmd_time.cpp +++ b/src/cmd_time.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_time(Instance); } -CmdResult cmd_time::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_time::Handle (const char** parameters, int pcnt, User *user) { struct tm* timeinfo; time_t local = ServerInstance->Time(); diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp index 3318972fb..b3034ba39 100644 --- a/src/cmd_topic.cpp +++ b/src/cmd_topic.cpp @@ -20,9 +20,9 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_topic(Instance); } -CmdResult cmd_topic::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_topic::Handle (const char** parameters, int pcnt, User *user) { - chanrec* Ptr; + Channel* Ptr; if (pcnt == 1) { diff --git a/src/cmd_trace.cpp b/src/cmd_trace.cpp index a71bb42bf..5899c6832 100644 --- a/src/cmd_trace.cpp +++ b/src/cmd_trace.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** XXX: This is crap. someone fix this when you have time, to be more useful. */ -CmdResult cmd_trace::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_trace::Handle (const char** parameters, int pcnt, User *user) { for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++) { diff --git a/src/cmd_unloadmodule.cpp b/src/cmd_unloadmodule.cpp index 5cb410950..d0b35f69f 100644 --- a/src/cmd_unloadmodule.cpp +++ b/src/cmd_unloadmodule.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_unloadmodule(Instance); } -CmdResult cmd_unloadmodule::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_unloadmodule::Handle (const char** parameters, int pcnt, User *user) { if (ServerInstance->Modules->Unload(parameters[0])) { diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp index f2240bb92..a3d10a723 100644 --- a/src/cmd_user.cpp +++ b/src/cmd_user.cpp @@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_user(Instance); } -CmdResult cmd_user::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_user::Handle (const char** parameters, int pcnt, User *user) { /* A user may only send the USER command once */ if (!(user->registered & REG_USER)) diff --git a/src/cmd_userhost.cpp b/src/cmd_userhost.cpp index dd1a2d819..78d435a39 100644 --- a/src/cmd_userhost.cpp +++ b/src/cmd_userhost.cpp @@ -19,14 +19,14 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_userhost(Instance); } -CmdResult cmd_userhost::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_userhost::Handle (const char** parameters, int pcnt, User *user) { std::string retbuf = std::string("302 ") + user->nick + " :"; for (int i = 0; i < pcnt; i++) { - userrec *u = ServerInstance->FindNick(parameters[i]); + User *u = ServerInstance->FindNick(parameters[i]); if ((u) && (u->registered == REG_ALL)) { diff --git a/src/cmd_version.cpp b/src/cmd_version.cpp index c355717f7..86fde3210 100644 --- a/src/cmd_version.cpp +++ b/src/cmd_version.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_version(Instance); } -CmdResult cmd_version::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_version::Handle (const char** parameters, int pcnt, User *user) { user->WriteServ("351 %s :%s",user->nick,ServerInstance->GetVersionString().c_str()); ServerInstance->Config->Send005(user); diff --git a/src/cmd_wallops.cpp b/src/cmd_wallops.cpp index 90a7d8bde..14924e56b 100644 --- a/src/cmd_wallops.cpp +++ b/src/cmd_wallops.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_wallops(Instance); } -CmdResult cmd_wallops::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_wallops::Handle (const char** parameters, int pcnt, User *user) { user->WriteWallOps(std::string(parameters[0])); FOREACH_MOD(I_OnWallops,OnWallops(user,parameters[0])); diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp index 91c651bcc..0ebe20d10 100644 --- a/src/cmd_who.cpp +++ b/src/cmd_who.cpp @@ -15,7 +15,7 @@ #include "wildcard.h" #include "commands/cmd_who.h" -static char *get_first_visible_channel(userrec *u) +static char *get_first_visible_channel(User *u) { UCListIter i = u->chans.begin(); if (i != u->chans.end()) @@ -27,7 +27,7 @@ static char *get_first_visible_channel(userrec *u) return "*"; } -bool cmd_who::whomatch(userrec* user, const char* matchtext) +bool cmd_who::whomatch(User* user, const char* matchtext) { bool realhost = false; bool realname = false; @@ -112,7 +112,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_who(Instance); } -bool cmd_who::CanView(chanrec* chan, userrec* user) +bool cmd_who::CanView(Channel* chan, User* user) { if (!user || !chan) return false; @@ -132,10 +132,10 @@ bool cmd_who::CanView(chanrec* chan, userrec* user) return false; } -void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch, userrec* u, std::vector &whoresults) +void cmd_who::SendWhoLine(User* user, const std::string &initial, Channel* ch, User* u, std::vector &whoresults) { std::string lcn = get_first_visible_channel(u); - chanrec* chlast = ServerInstance->FindChan(lcn); + Channel* chlast = ServerInstance->FindChan(lcn); /* Not visible to this user */ if (u->Visibility && !u->Visibility->VisibleTo(user)) @@ -165,7 +165,7 @@ void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch whoresults.push_back(wholine); } -CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_who::Handle (const char** parameters, int pcnt, User *user) { /* * XXX - RFC says: @@ -187,7 +187,7 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user) opt_local = false; opt_far = false; - chanrec *ch = NULL; + Channel *ch = NULL; std::vector whoresults; std::string initial = "352 " + std::string(user->nick) + " "; @@ -295,9 +295,9 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user) if (opt_viewopersonly) { /* Showing only opers */ - for (std::list::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++) + for (std::list::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++) { - userrec* oper = *i; + User* oper = *i; if (whomatch(oper, matchtext)) { diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp index 508200cb6..f861dde36 100644 --- a/src/cmd_whois.cpp +++ b/src/cmd_whois.cpp @@ -15,7 +15,7 @@ #include "commands/cmd_whois.h" #include "hashcomp.h" -void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned long signon, unsigned long idle, const char* nick) +void do_whois(InspIRCd* ServerInstance, User* user, User* dest,unsigned long signon, unsigned long idle, const char* nick) { if (dest->Visibility && !dest->Visibility->VisibleTo(user)) { @@ -91,9 +91,9 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_whois(Instance); } -CmdResult cmd_whois::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_whois::Handle (const char** parameters, int pcnt, User *user) { - userrec *dest; + User *dest; int userindex = 0; unsigned long idle = 0, signon = 0; diff --git a/src/cmd_whowas.cpp b/src/cmd_whowas.cpp index f982d4873..de13d5b26 100644 --- a/src/cmd_whowas.cpp +++ b/src/cmd_whowas.cpp @@ -29,7 +29,7 @@ cmd_whowas::cmd_whowas(InspIRCd* Instance) Instance->Timers->AddTimer(timer); } -CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user) +CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, User* user) { /* if whowas disabled in config */ if (ServerInstance->Config->WhoWasGroupSize == 0 || ServerInstance->Config->WhoWasMaxGroups == 0) @@ -92,7 +92,7 @@ CmdResult cmd_whowas::HandleInternal(const unsigned int id, const std::dequeExtend("stats", stats.c_str()); } -void cmd_whowas::AddToWhoWas(userrec* user) +void cmd_whowas::AddToWhoWas(User* user) { /* if whowas disabled */ if (ServerInstance->Config->WhoWasGroupSize == 0 || ServerInstance->Config->WhoWasMaxGroups == 0) @@ -316,7 +316,7 @@ cmd_whowas::~cmd_whowas() } } -WhoWasGroup::WhoWasGroup(userrec* user) : host(NULL), dhost(NULL), ident(NULL), server(NULL), gecos(NULL), signon(user->signon) +WhoWasGroup::WhoWasGroup(User* user) : host(NULL), dhost(NULL), ident(NULL), server(NULL), gecos(NULL), signon(user->signon) { this->host = strdup(user->host); this->dhost = strdup(user->dhost); diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp index cb0167f4e..a1d22e32a 100644 --- a/src/cmd_zline.cpp +++ b/src/cmd_zline.cpp @@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new cmd_zline(Instance); } -CmdResult cmd_zline::Handle (const char** parameters, int pcnt, userrec *user) +CmdResult cmd_zline::Handle (const char** parameters, int pcnt, User *user) { if (pcnt >= 3) { diff --git a/src/command_parse.cpp b/src/command_parse.cpp index 68555ec8b..462b50d88 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -112,7 +112,7 @@ long InspIRCd::Duration(const std::string &str) * The second version is much simpler and just has the one stream to read, and is used in NAMES, WHOIS, PRIVMSG etc. * Both will only parse until they reach ServerInstance->Config->MaxTargets number of targets, to stop abuse via spam. */ -int CommandParser::LoopCall(userrec* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra) +int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra) { /* First check if we have more than one item in the list, if we don't we return zero here and the handler * which called us just carries on as it was. @@ -161,7 +161,7 @@ int CommandParser::LoopCall(userrec* user, Command* CommandObj, const char** par return 1; } -int CommandParser::LoopCall(userrec* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere) +int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere) { /* First check if we have more than one item in the list, if we don't we return zero here and the handler * which called us just carries on as it was. @@ -209,7 +209,7 @@ int CommandParser::LoopCall(userrec* user, Command* CommandObj, const char** par return 1; } -bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user) +bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, User * user) { Commandable::iterator n = cmdlist.find(commandname); @@ -244,7 +244,7 @@ Command* CommandParser::GetHandler(const std::string &commandname) // calls a handler function for a command -CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user) +CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, User *user) { Commandable::iterator n = cmdlist.find(commandname); @@ -280,7 +280,7 @@ CmdResult CommandParser::CallHandler(const std::string &commandname,const char** return CMD_INVALID; } -void CommandParser::ProcessCommand(userrec *user, std::string &cmd) +void CommandParser::ProcessCommand(User *user, std::string &cmd) { const char *command_p[MAXPARAMETERS]; int items = 0; @@ -409,7 +409,7 @@ void CommandParser::RemoveCommand(Commandable::iterator safei, const char* sourc } } -void CommandParser::ProcessBuffer(std::string &buffer,userrec *user) +void CommandParser::ProcessBuffer(std::string &buffer,User *user) { std::string::size_type a; @@ -470,7 +470,7 @@ bool CommandParser::FindSym(void** v, void* h, const std::string &name) return true; } -bool CommandParser::ReloadCommand(const char* cmd, userrec* user) +bool CommandParser::ReloadCommand(const char* cmd, User* user) { char filename[MAXBUF]; char commandname[MAXBUF]; @@ -511,7 +511,7 @@ bool CommandParser::ReloadCommand(const char* cmd, userrec* user) return false; } -CmdResult cmd_reload::Handle(const char** parameters, int pcnt, userrec *user) +CmdResult cmd_reload::Handle(const char** parameters, int pcnt, User *user) { user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]); if (ServerInstance->Parser->ReloadCommand(parameters[0], user)) @@ -558,7 +558,7 @@ const char* CommandParser::LoadCommand(const char* name) return NULL; } -void CommandParser::SetupCommandTable(userrec* user) +void CommandParser::SetupCommandTable(User* user) { RFCCommands.clear(); @@ -607,7 +607,7 @@ void CommandParser::SetupCommandTable(userrec* user) int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest) { - userrec* user = NULL; + User* user = NULL; std::string item; int translations = 0; diff --git a/src/commands.cpp b/src/commands.cpp index 7f74471c8..edb8a529e 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -18,7 +18,7 @@ /* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */ -bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user) +bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user) { char itrigger[MAXBUF]; long matches = 0; @@ -49,7 +49,7 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user) return false; } -bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user) +bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user) { char itrigger[MAXBUF]; long matches = 0; @@ -78,7 +78,7 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user) return false; } -bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user) +bool InspIRCd::NickMatchesEveryone(const std::string &nick, User* user) { char itrigger[MAXBUF]; long matches = 0; diff --git a/src/configreader.cpp b/src/configreader.cpp index daf1b04de..0bb4587b3 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -143,13 +143,13 @@ void ServerConfig::Update005() } } -void ServerConfig::Send005(userrec* user) +void ServerConfig::Send005(User* user) { for (std::vector::iterator line = ServerInstance->Config->isupport.begin(); line != ServerInstance->Config->isupport.end(); line++) user->WriteServ("005 %s %s", user->nick, line->c_str()); } -bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user) +bool ServerConfig::CheckOnce(char* tag, bool bail, User* user) { int count = ConfValueEnum(this->config_data, tag); @@ -586,7 +586,7 @@ bool DoneMaxBans(ServerConfig* conf, const char* tag) return true; } -void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, userrec* user) +void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, User* user) { ServerInstance->Log(DEFAULT, "There were errors in your configuration file: %s", errormessage.c_str()); if (bail) @@ -625,7 +625,7 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, } } -void ServerConfig::Read(bool bail, userrec* user) +void ServerConfig::Read(bool bail, User* user) { static char debug[MAXBUF]; /* Temporary buffer for debugging value */ static char maxkeep[MAXBUF]; /* Temporary buffer for WhoWasMaxKeep value */ diff --git a/src/cull_list.cpp b/src/cull_list.cpp index 0da622cb1..188c3a8e6 100644 --- a/src/cull_list.cpp +++ b/src/cull_list.cpp @@ -14,7 +14,7 @@ #include "inspircd.h" #include "cull_list.h" -CullItem::CullItem(userrec* u, std::string &r, const char* o_reason) +CullItem::CullItem(User* u, std::string &r, const char* o_reason) { this->user = u; this->reason = r; @@ -26,7 +26,7 @@ CullItem::CullItem(userrec* u, std::string &r, const char* o_reason) this->oper_reason = r; } -CullItem::CullItem(userrec* u, const char* r, const char* o_reason) +CullItem::CullItem(User* u, const char* r, const char* o_reason) { this->user = u; this->reason = r; @@ -52,7 +52,7 @@ CullItem::~CullItem() { } -userrec* CullItem::GetUser() +User* CullItem::GetUser() { return this->user; } @@ -73,13 +73,13 @@ CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance) exempt.clear(); } -void CullList::AddItem(userrec* user, std::string &reason, const char* o_reason) +void CullList::AddItem(User* user, std::string &reason, const char* o_reason) { AddItem(user, reason.c_str(), o_reason); } -void CullList::AddItem(userrec* user, const char* reason, const char* o_reason) +void CullList::AddItem(User* user, const char* reason, const char* o_reason) { if (exempt.find(user) == exempt.end()) { @@ -89,7 +89,7 @@ void CullList::AddItem(userrec* user, const char* reason, const char* o_reason) } } -void CullList::MakeSilent(userrec* user) +void CullList::MakeSilent(User* user) { for (std::vector::iterator a = list.begin(); a != list.end(); ++a) { @@ -110,7 +110,7 @@ int CullList::Apply() std::vector::iterator a = list.begin(); user_hash::iterator iter = ServerInstance->clientlist->find(a->GetUser()->nick); - std::map::iterator exemptiter = exempt.find(a->GetUser()); + std::map::iterator exemptiter = exempt.find(a->GetUser()); const char* preset_reason = a->GetUser()->GetOperQuit(); std::string reason = a->GetReason(); std::string oper_reason = *preset_reason ? preset_reason : a->GetOperReason(); @@ -184,7 +184,7 @@ int CullList::Apply() { if (IS_LOCAL(a->GetUser())) { - std::vector::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),a->GetUser()); + std::vector::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),a->GetUser()); if (x != ServerInstance->local_users.end()) ServerInstance->local_users.erase(x); } diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 1cad143c5..a90dd0105 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -114,9 +114,9 @@ void InspIRCd::WriteOpers(const char* text, ...) void InspIRCd::WriteOpers(const std::string &text) { - for (std::list::iterator i = this->all_opers.begin(); i != this->all_opers.end(); i++) + for (std::list::iterator i = this->all_opers.begin(); i != this->all_opers.end(); i++) { - userrec* a = *i; + User* a = *i; if (IS_LOCAL(a) && a->IsModeSet('s')) { // send server notices to all with +s @@ -139,9 +139,9 @@ void InspIRCd::ServerNoticeAll(char* text, ...) snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer); - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - userrec* t = *i; + User* t = *i; t->WriteServ(std::string(formatbuffer)); } } @@ -160,9 +160,9 @@ void InspIRCd::ServerPrivmsgAll(char* text, ...) snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",Config->ServerName,textbuffer); - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - userrec* t = *i; + User* t = *i; t->WriteServ(std::string(formatbuffer)); } } @@ -186,9 +186,9 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) if (flags == WM_AND) { - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - userrec* t = *i; + User* t = *i; bool send_to_user = true; for (int n = 0; n < modelen; n++) @@ -207,9 +207,9 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) } else if (flags == WM_OR) { - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - userrec* t = *i; + User* t = *i; bool send_to_user = false; for (int n = 0; n < modelen; n++) @@ -230,7 +230,7 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) } /* Find a user record by nickname and return a pointer to it */ -userrec* InspIRCd::FindNick(const std::string &nick) +User* InspIRCd::FindNick(const std::string &nick) { if (!nick.empty() && isdigit(*nick.begin())) return FindUUID(nick); @@ -244,7 +244,7 @@ userrec* InspIRCd::FindNick(const std::string &nick) return iter->second; } -userrec* InspIRCd::FindNick(const char* nick) +User* InspIRCd::FindNick(const char* nick) { if (isdigit(*nick)) return FindUUID(nick); @@ -257,7 +257,7 @@ userrec* InspIRCd::FindNick(const char* nick) return iter->second; } -userrec* InspIRCd::FindNickOnly(const std::string &nick) +User* InspIRCd::FindNickOnly(const std::string &nick) { user_hash::iterator iter = clientlist->find(nick); @@ -267,7 +267,7 @@ userrec* InspIRCd::FindNickOnly(const std::string &nick) return iter->second; } -userrec* InspIRCd::FindNickOnly(const char* nick) +User* InspIRCd::FindNickOnly(const char* nick) { user_hash::iterator iter = clientlist->find(nick); @@ -277,12 +277,12 @@ userrec* InspIRCd::FindNickOnly(const char* nick) return iter->second; } -userrec *InspIRCd::FindUUID(const std::string &uid) +User *InspIRCd::FindUUID(const std::string &uid) { return FindUUID(uid.c_str()); } -userrec *InspIRCd::FindUUID(const char *uid) +User *InspIRCd::FindUUID(const char *uid) { user_hash::iterator finduuid = uuidlist->find(uid); @@ -293,7 +293,7 @@ userrec *InspIRCd::FindUUID(const char *uid) } /* find a channel record by channel name and return a pointer to it */ -chanrec* InspIRCd::FindChan(const char* chan) +Channel* InspIRCd::FindChan(const char* chan) { chan_hash::iterator iter = chanlist->find(chan); @@ -304,7 +304,7 @@ chanrec* InspIRCd::FindChan(const char* chan) return iter->second; } -chanrec* InspIRCd::FindChan(const std::string &chan) +Channel* InspIRCd::FindChan(const std::string &chan) { chan_hash::iterator iter = chanlist->find(chan); @@ -318,7 +318,7 @@ chanrec* InspIRCd::FindChan(const std::string &chan) /* Send an error notice to all users, registered or not */ void InspIRCd::SendError(const std::string &s) { - for (std::vector::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++) + for (std::vector::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++) { if ((*i)->registered == REG_ALL) { @@ -527,7 +527,7 @@ void InspIRCd::CheckDie() } } -void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const std::string &text) +void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const std::string &text) { std::string copy_text = text; @@ -538,7 +538,7 @@ void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const st user->WriteServ("%d %s", numeric, copy_text.c_str()); } -void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const char* format, ...) +void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const char* format, ...) { char textbuffer[MAXBUF]; va_list argsPtr; diff --git a/src/inspircd.cpp b/src/inspircd.cpp index cf062e397..d16938818 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -82,7 +82,7 @@ void InspIRCd::Cleanup() } /* Close all client sockets, or the new process inherits them */ - for (std::vector::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++) + for (std::vector::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++) { (*i)->SetWriteError("Server shutdown"); (*i)->CloseSocket(); @@ -463,7 +463,7 @@ InspIRCd::InspIRCd(int argc, char** argv) this->InitialiseUID(); /* set up fake client */ - this->FakeClient = new userrec(this); + this->FakeClient = new User(this); this->FakeClient->SetFd(FD_MAGIC_NUMBER); if (!do_root) @@ -721,7 +721,7 @@ int main(int argc, char** argv) * (until this returns true, a user will block in the waiting state, waiting to connect up to the * registration timeout maximum seconds) */ -bool InspIRCd::AllModulesReportReady(userrec* user) +bool InspIRCd::AllModulesReportReady(User* user) { if (!Config->global_implementation[I_OnCheckReady]) return true; @@ -753,7 +753,7 @@ int InspIRCd::SetTimeDelta(int delta) return old; } -void InspIRCd::AddLocalClone(userrec* user) +void InspIRCd::AddLocalClone(User* user) { clonemap::iterator x = local_clones.find(user->GetIPString()); if (x != local_clones.end()) @@ -762,7 +762,7 @@ void InspIRCd::AddLocalClone(userrec* user) local_clones[user->GetIPString()] = 1; } -void InspIRCd::AddGlobalClone(userrec* user) +void InspIRCd::AddGlobalClone(User* user) { clonemap::iterator y = global_clones.find(user->GetIPString()); if (y != global_clones.end()) diff --git a/src/mode.cpp b/src/mode.cpp index acfd16da9..1f6cc08b9 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -104,12 +104,12 @@ char ModeHandler::GetModeChar() return mode; } -ModeAction ModeHandler::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { return MODEACTION_DENY; } -ModePair ModeHandler::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) +ModePair ModeHandler::ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { if (dest) { @@ -121,15 +121,15 @@ ModePair ModeHandler::ModeSet(userrec* source, userrec* dest, chanrec* channel, } } -void ModeHandler::DisplayList(userrec* user, chanrec* channel) +void ModeHandler::DisplayList(User* user, Channel* channel) { } -void ModeHandler::DisplayEmptyList(userrec* user, chanrec* channel) +void ModeHandler::DisplayEmptyList(User* user, Channel* channel) { } -bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel) +bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel) { return (ours < theirs); } @@ -152,18 +152,18 @@ ModeType ModeWatcher::GetModeType() return m_type; } -bool ModeWatcher::BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding, ModeType type) +bool ModeWatcher::BeforeMode(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, ModeType type) { return true; } -void ModeWatcher::AfterMode(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter, bool adding, ModeType type) +void ModeWatcher::AfterMode(User* source, User* dest, Channel* channel, const std::string ¶meter, bool adding, ModeType type) { } -userrec* ModeParser::SanityChecks(userrec *user,const char *dest,chanrec *chan,int status) +User* ModeParser::SanityChecks(User *user,const char *dest,Channel *chan,int status) { - userrec *d; + User *d; if ((!user) || (!dest) || (!chan) || (!*dest)) { return NULL; @@ -177,7 +177,7 @@ userrec* ModeParser::SanityChecks(userrec *user,const char *dest,chanrec *chan,i return d; } -const char* ModeParser::Grant(userrec *d,chanrec *chan,int MASK) +const char* ModeParser::Grant(User *d,Channel *chan,int MASK) { if (!chan) return ""; @@ -207,7 +207,7 @@ const char* ModeParser::Grant(userrec *d,chanrec *chan,int MASK) return ""; } -const char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK) +const char* ModeParser::Revoke(User *d,Channel *chan,int MASK) { if (!chan) return ""; @@ -237,7 +237,7 @@ const char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK) return ""; } -void ModeParser::DisplayCurrentModes(userrec *user, userrec* targetuser, chanrec* targetchannel, const char* text) +void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targetchannel, const char* text) { if (targetchannel) { @@ -274,13 +274,13 @@ void ModeParser::DisplayCurrentModes(userrec *user, userrec* targetuser, chanrec return; } -void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool servermode) +void ModeParser::Process(const char** parameters, int pcnt, User *user, bool servermode) { std::string target = parameters[0]; ModeType type = MODETYPE_USER; unsigned char mask = 0; - chanrec* targetchannel = ServerInstance->FindChan(parameters[0]); - userrec* targetuser = ServerInstance->FindNick(parameters[0]); + Channel* targetchannel = ServerInstance->FindChan(parameters[0]); + User* targetuser = ServerInstance->FindNick(parameters[0]); LastParse.clear(); @@ -577,7 +577,7 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool /* Does this mode have a prefix? */ if (modehandlers[handler_id]->GetPrefix() && targetchannel) { - userrec* user_to_prefix = ServerInstance->FindNick(parameter); + User* user_to_prefix = ServerInstance->FindNick(parameter); if (user_to_prefix) targetchannel->SetPrefix(user_to_prefix, modehandlers[handler_id]->GetPrefix(), modehandlers[handler_id]->GetPrefixRank(), adding); @@ -833,7 +833,7 @@ ModeHandler* ModeParser::FindPrefix(unsigned const char pfxletter) return NULL; } -std::string ModeParser::ModeString(userrec* user, chanrec* channel) +std::string ModeParser::ModeString(User* user, Channel* channel) { std::string types; std::string pars; @@ -996,7 +996,7 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw) /** This default implementation can remove simple user modes */ -void ModeHandler::RemoveMode(userrec* user) +void ModeHandler::RemoveMode(User* user) { char moderemove[MAXBUF]; const char* parameters[] = { user->nick, moderemove }; @@ -1011,7 +1011,7 @@ void ModeHandler::RemoveMode(userrec* user) /** This default implementation can remove simple channel modes * (no parameters) */ -void ModeHandler::RemoveMode(chanrec* channel) +void ModeHandler::RemoveMode(Channel* channel) { char moderemove[MAXBUF]; const char* parameters[] = { channel->name, moderemove }; diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp index 1c6fe3fa5..4192a95ce 100644 --- a/src/modes/cmode_b.cpp +++ b/src/modes/cmode_b.cpp @@ -29,7 +29,7 @@ ModeChannelBan::ModeChannelBan(InspIRCd* Instance) : ModeHandler(Instance, 'b', { } -ModeAction ModeChannelBan::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelBan::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { int status = channel->GetStatus(source); /* Call the correct method depending on wether we're adding or removing the mode */ @@ -49,7 +49,7 @@ ModeAction ModeChannelBan::OnModeChange(userrec* source, userrec* dest, chanrec* return MODEACTION_ALLOW; } -void ModeChannelBan::RemoveMode(chanrec* channel) +void ModeChannelBan::RemoveMode(Channel* channel) { BanList copy; char moderemove[MAXBUF]; @@ -67,11 +67,11 @@ void ModeChannelBan::RemoveMode(chanrec* channel) } } -void ModeChannelBan::RemoveMode(userrec* user) +void ModeChannelBan::RemoveMode(User* user) { } -void ModeChannelBan::DisplayList(userrec* user, chanrec* channel) +void ModeChannelBan::DisplayList(User* user, Channel* channel) { /* Display the channel banlist */ for (BanList::reverse_iterator i = channel->bans.rbegin(); i != channel->bans.rend(); ++i) @@ -82,12 +82,12 @@ void ModeChannelBan::DisplayList(userrec* user, chanrec* channel) return; } -void ModeChannelBan::DisplayEmptyList(userrec* user, chanrec* channel) +void ModeChannelBan::DisplayEmptyList(User* user, Channel* channel) { user->WriteServ("368 %s %s :End of channel ban list",user->nick, channel->name); } -std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *chan,int status) +std::string& ModeChannelBan::AddBan(User *user,std::string &dest,Channel *chan,int status) { if ((!user) || (!chan)) { @@ -142,7 +142,7 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha return dest; } -ModePair ModeChannelBan::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) +ModePair ModeChannelBan::ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++) { @@ -154,7 +154,7 @@ ModePair ModeChannelBan::ModeSet(userrec* source, userrec* dest, chanrec* channe return std::make_pair(false, parameter); } -std::string& ModeChannelBan::DelBan(userrec *user,std::string& dest,chanrec *chan,int status) +std::string& ModeChannelBan::DelBan(User *user,std::string& dest,Channel *chan,int status) { if ((!user) || (!chan)) { diff --git a/src/modes/cmode_h.cpp b/src/modes/cmode_h.cpp index 831ec809c..98187b089 100644 --- a/src/modes/cmode_h.cpp +++ b/src/modes/cmode_h.cpp @@ -28,9 +28,9 @@ unsigned int ModeChannelHalfOp::GetPrefixRank() return HALFOP_VALUE; } -ModePair ModeChannelHalfOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) +ModePair ModeChannelHalfOp::ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { - userrec* x = ServerInstance->FindNick(parameter); + User* x = ServerInstance->FindNick(parameter); if (x) { if (channel->GetStatusFlags(x) & UCMODE_HOP) @@ -45,7 +45,7 @@ ModePair ModeChannelHalfOp::ModeSet(userrec* source, userrec* dest, chanrec* cha return std::make_pair(false, parameter); } -void ModeChannelHalfOp::RemoveMode(chanrec* channel) +void ModeChannelHalfOp::RemoveMode(Channel* channel) { CUList* list = channel->GetHalfoppedUsers(); CUList copy; @@ -53,7 +53,7 @@ void ModeChannelHalfOp::RemoveMode(chanrec* channel) for (CUList::iterator i = list->begin(); i != list->end(); i++) { - userrec* n = i->first; + User* n = i->first; copy.insert(std::make_pair(n,n->nick)); } @@ -66,11 +66,11 @@ void ModeChannelHalfOp::RemoveMode(chanrec* channel) } -void ModeChannelHalfOp::RemoveMode(userrec* user) +void ModeChannelHalfOp::RemoveMode(User* user) { } -ModeAction ModeChannelHalfOp::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelHalfOp::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { /* If halfops are not enabled in the conf, we don't execute * anything in this class at all. @@ -103,9 +103,9 @@ ModeAction ModeChannelHalfOp::OnModeChange(userrec* source, userrec* dest, chanr return MODEACTION_DENY; } -std::string ModeChannelHalfOp::AddHalfOp(userrec *user,const char* dest,chanrec *chan,int status) +std::string ModeChannelHalfOp::AddHalfOp(User *user,const char* dest,Channel *chan,int status) { - userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status); + User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status); if (d) { @@ -131,9 +131,9 @@ std::string ModeChannelHalfOp::AddHalfOp(userrec *user,const char* dest,chanrec return ""; } -std::string ModeChannelHalfOp::DelHalfOp(userrec *user,const char *dest,chanrec *chan,int status) +std::string ModeChannelHalfOp::DelHalfOp(User *user,const char *dest,Channel *chan,int status) { - userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status); + User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status); if (d) { diff --git a/src/modes/cmode_i.cpp b/src/modes/cmode_i.cpp index 12bdb18b8..550ea24d1 100644 --- a/src/modes/cmode_i.cpp +++ b/src/modes/cmode_i.cpp @@ -21,7 +21,7 @@ ModeChannelInviteOnly::ModeChannelInviteOnly(InspIRCd* Instance) : ModeHandler(I { } -ModeAction ModeChannelInviteOnly::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelInviteOnly::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (channel->modes[CM_INVITEONLY] != adding) { diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp index f6a29af35..34d8a6452 100644 --- a/src/modes/cmode_k.cpp +++ b/src/modes/cmode_k.cpp @@ -21,7 +21,7 @@ ModeChannelKey::ModeChannelKey(InspIRCd* Instance) : ModeHandler(Instance, 'k', { } -ModePair ModeChannelKey::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) +ModePair ModeChannelKey::ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { if (channel->modes[CM_KEY]) { @@ -33,7 +33,7 @@ ModePair ModeChannelKey::ModeSet(userrec* source, userrec* dest, chanrec* channe } } -void ModeChannelKey::RemoveMode(chanrec* channel) +void ModeChannelKey::RemoveMode(Channel* channel) { /** +k needs a parameter when being removed, * so we have a special-case RemoveMode here for it @@ -48,17 +48,17 @@ void ModeChannelKey::RemoveMode(chanrec* channel) } } -void ModeChannelKey::RemoveMode(userrec* user) +void ModeChannelKey::RemoveMode(User* user) { } -bool ModeChannelKey::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel) +bool ModeChannelKey::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel) { /* When TS is equal, the alphabetically later channel key wins */ return (their_param < our_param); } -ModeAction ModeChannelKey::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelKey::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if ((channel->modes[CM_KEY] != adding) || (!IS_LOCAL(source))) { diff --git a/src/modes/cmode_l.cpp b/src/modes/cmode_l.cpp index 1a57a440d..50ee28683 100644 --- a/src/modes/cmode_l.cpp +++ b/src/modes/cmode_l.cpp @@ -21,7 +21,7 @@ ModeChannelLimit::ModeChannelLimit(InspIRCd* Instance) : ModeHandler(Instance, ' { } -ModePair ModeChannelLimit::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) +ModePair ModeChannelLimit::ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { if (channel->limit) { @@ -33,13 +33,13 @@ ModePair ModeChannelLimit::ModeSet(userrec* source, userrec* dest, chanrec* chan } } -bool ModeChannelLimit::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel) +bool ModeChannelLimit::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel) { /* When TS is equal, the higher channel limit wins */ return (atoi(their_param.c_str()) < atoi(our_param.c_str())); } -ModeAction ModeChannelLimit::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelLimit::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (adding) { diff --git a/src/modes/cmode_m.cpp b/src/modes/cmode_m.cpp index 520248fda..ad17d5d30 100644 --- a/src/modes/cmode_m.cpp +++ b/src/modes/cmode_m.cpp @@ -21,7 +21,7 @@ ModeChannelModerated::ModeChannelModerated(InspIRCd* Instance) : ModeHandler(Ins { } -ModeAction ModeChannelModerated::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelModerated::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (channel->modes[CM_MODERATED] != adding) { diff --git a/src/modes/cmode_n.cpp b/src/modes/cmode_n.cpp index ddc2e1bbd..1bad2f92f 100644 --- a/src/modes/cmode_n.cpp +++ b/src/modes/cmode_n.cpp @@ -21,7 +21,7 @@ ModeChannelNoExternal::ModeChannelNoExternal(InspIRCd* Instance) : ModeHandler(I { } -ModeAction ModeChannelNoExternal::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelNoExternal::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (channel->modes[CM_NOEXTERNAL] != adding) { diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp index 27bc62100..a43eaeac9 100644 --- a/src/modes/cmode_o.cpp +++ b/src/modes/cmode_o.cpp @@ -28,9 +28,9 @@ unsigned int ModeChannelOp::GetPrefixRank() return OP_VALUE; } -ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) +ModePair ModeChannelOp::ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { - userrec* x = ServerInstance->FindNick(parameter); + User* x = ServerInstance->FindNick(parameter); if (x) { if (channel->GetStatusFlags(x) & UCMODE_OP) @@ -46,7 +46,7 @@ ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel } -void ModeChannelOp::RemoveMode(chanrec* channel) +void ModeChannelOp::RemoveMode(Channel* channel) { CUList* list = channel->GetOppedUsers(); CUList copy; @@ -54,7 +54,7 @@ void ModeChannelOp::RemoveMode(chanrec* channel) for (CUList::iterator i = list->begin(); i != list->end(); i++) { - userrec* n = i->first; + User* n = i->first; copy.insert(std::make_pair(n,n->nick)); } @@ -66,11 +66,11 @@ void ModeChannelOp::RemoveMode(chanrec* channel) } } -void ModeChannelOp::RemoveMode(userrec* user) +void ModeChannelOp::RemoveMode(User* user) { } -ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelOp::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { int status = channel->GetStatus(source); @@ -94,9 +94,9 @@ ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec* return MODEACTION_DENY; } -std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,int status) +std::string ModeChannelOp::AddOp(User *user,const char* dest,Channel *chan,int status) { - userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status); + User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status); if (d) { @@ -122,9 +122,9 @@ std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,in return ""; } -std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,int status) +std::string ModeChannelOp::DelOp(User *user,const char *dest,Channel *chan,int status) { - userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status); + User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status); if (d) { diff --git a/src/modes/cmode_p.cpp b/src/modes/cmode_p.cpp index 15c33222e..c9749dc38 100644 --- a/src/modes/cmode_p.cpp +++ b/src/modes/cmode_p.cpp @@ -21,7 +21,7 @@ ModeChannelPrivate::ModeChannelPrivate(InspIRCd* Instance) : ModeHandler(Instanc { } -ModeAction ModeChannelPrivate::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelPrivate::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (channel->modes[CM_PRIVATE] != adding) { diff --git a/src/modes/cmode_s.cpp b/src/modes/cmode_s.cpp index 135291592..47e66d139 100644 --- a/src/modes/cmode_s.cpp +++ b/src/modes/cmode_s.cpp @@ -21,7 +21,7 @@ ModeChannelSecret::ModeChannelSecret(InspIRCd* Instance) : ModeHandler(Instance, { } -ModeAction ModeChannelSecret::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelSecret::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (channel->modes[CM_SECRET] != adding) { diff --git a/src/modes/cmode_t.cpp b/src/modes/cmode_t.cpp index 2a6c06b42..7124ecec4 100644 --- a/src/modes/cmode_t.cpp +++ b/src/modes/cmode_t.cpp @@ -21,7 +21,7 @@ ModeChannelTopicOps::ModeChannelTopicOps(InspIRCd* Instance) : ModeHandler(Insta { } -ModeAction ModeChannelTopicOps::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelTopicOps::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (channel->modes[CM_TOPICLOCK] != adding) { diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp index 0ea887073..b472cb1fc 100644 --- a/src/modes/cmode_v.cpp +++ b/src/modes/cmode_v.cpp @@ -28,9 +28,9 @@ unsigned int ModeChannelVoice::GetPrefixRank() return VOICE_VALUE; } -ModePair ModeChannelVoice::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) +ModePair ModeChannelVoice::ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { - userrec* x = ServerInstance->FindNick(parameter); + User* x = ServerInstance->FindNick(parameter); if (x) { if (channel->GetStatusFlags(x) & UCMODE_VOICE) @@ -45,7 +45,7 @@ ModePair ModeChannelVoice::ModeSet(userrec* source, userrec* dest, chanrec* chan return std::make_pair(false, parameter); } -void ModeChannelVoice::RemoveMode(chanrec* channel) +void ModeChannelVoice::RemoveMode(Channel* channel) { CUList* list = channel->GetVoicedUsers(); CUList copy; @@ -53,7 +53,7 @@ void ModeChannelVoice::RemoveMode(chanrec* channel) for (CUList::iterator i = list->begin(); i != list->end(); i++) { - userrec* n = i->first; + User* n = i->first; copy.insert(std::make_pair(n,n->nick)); } @@ -65,11 +65,11 @@ void ModeChannelVoice::RemoveMode(chanrec* channel) } } -void ModeChannelVoice::RemoveMode(userrec* user) +void ModeChannelVoice::RemoveMode(User* user) { } -ModeAction ModeChannelVoice::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelVoice::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { int status = channel->GetStatus(source); @@ -93,9 +93,9 @@ ModeAction ModeChannelVoice::OnModeChange(userrec* source, userrec* dest, chanre return MODEACTION_DENY; } -std::string ModeChannelVoice::AddVoice(userrec *user,const char* dest,chanrec *chan,int status) +std::string ModeChannelVoice::AddVoice(User *user,const char* dest,Channel *chan,int status) { - userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status); + User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status); if (d) { @@ -121,9 +121,9 @@ std::string ModeChannelVoice::AddVoice(userrec *user,const char* dest,chanrec *c return ""; } -std::string ModeChannelVoice::DelVoice(userrec *user,const char *dest,chanrec *chan,int status) +std::string ModeChannelVoice::DelVoice(User *user,const char *dest,Channel *chan,int status) { - userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status); + User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status); if (d) { diff --git a/src/modes/umode_i.cpp b/src/modes/umode_i.cpp index a599f8f6f..e6a142459 100644 --- a/src/modes/umode_i.cpp +++ b/src/modes/umode_i.cpp @@ -21,7 +21,7 @@ ModeUserInvisible::ModeUserInvisible(InspIRCd* Instance) : ModeHandler(Instance, { } -ModeAction ModeUserInvisible::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeUserInvisible::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { /* Only opers can change other users modes */ if ((source != dest) && (!*source->oper)) diff --git a/src/modes/umode_n.cpp b/src/modes/umode_n.cpp index c9c9e312e..0ffffac10 100644 --- a/src/modes/umode_n.cpp +++ b/src/modes/umode_n.cpp @@ -21,7 +21,7 @@ ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHan { } -ModeAction ModeUserServerNoticeMask::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { /* Only opers can change other users modes */ if ((source != dest) && (!*source->oper)) diff --git a/src/modes/umode_o.cpp b/src/modes/umode_o.cpp index 30ed089f6..2415a940a 100644 --- a/src/modes/umode_o.cpp +++ b/src/modes/umode_o.cpp @@ -21,7 +21,7 @@ ModeUserOperator::ModeUserOperator(InspIRCd* Instance) : ModeHandler(Instance, ' { } -ModeAction ModeUserOperator::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { /* Only opers can execute this class at all */ if (!*source->oper) @@ -35,7 +35,7 @@ ModeAction ModeUserOperator::OnModeChange(userrec* source, userrec* dest, chanre * Note that oper status is only given in cmd_oper.cpp * NOT here. It is impossible to directly set +o without * verifying as an oper and getting an opertype assigned - * to your userrec! + * to your User! */ ServerInstance->SNO->WriteToSnoMask('o', "User %s de-opered (by %s)", dest->nick, source->nick); dest->UnOper(); diff --git a/src/modes/umode_s.cpp b/src/modes/umode_s.cpp index faf6348de..01e57da5b 100644 --- a/src/modes/umode_s.cpp +++ b/src/modes/umode_s.cpp @@ -21,7 +21,7 @@ ModeUserServerNotice::ModeUserServerNotice(InspIRCd* Instance) : ModeHandler(Ins { } -ModeAction ModeUserServerNotice::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeUserServerNotice::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { /* Only opers can change other users modes */ if ((source != dest) && (!*source->oper)) diff --git a/src/modes/umode_w.cpp b/src/modes/umode_w.cpp index 3f1cd90c8..914327cbd 100644 --- a/src/modes/umode_w.cpp +++ b/src/modes/umode_w.cpp @@ -21,7 +21,7 @@ ModeUserWallops::ModeUserWallops(InspIRCd* Instance) : ModeHandler(Instance, 'w' { } -ModeAction ModeUserWallops::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +ModeAction ModeUserWallops::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { /* Only opers can change other users modes */ if ((source != dest) && (!*source->oper)) diff --git a/src/modules.cpp b/src/modules.cpp index b95dcd59d..8da123b05 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -104,96 +104,96 @@ std::string Event::GetEventID() Module::Module(InspIRCd* Me) : ServerInstance(Me) { } Module::~Module() { } -void Module::OnUserConnect(userrec* user) { } -void Module::OnUserQuit(userrec* user, const std::string& message, const std::string &oper_message) { } -void Module::OnUserDisconnect(userrec* user) { } -void Module::OnUserJoin(userrec* user, chanrec* channel, bool &silent) { } -void Module::OnPostJoin(userrec* user, chanrec* channel) { } -void Module::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) { } -void Module::OnRehash(userrec* user, const std::string ¶meter) { } -void Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { } -int Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) { return 0; } -void Module::OnMode(userrec* user, void* dest, int target_type, const std::string &text) { } +void Module::OnUserConnect(User* user) { } +void Module::OnUserQuit(User* user, const std::string& message, const std::string &oper_message) { } +void Module::OnUserDisconnect(User* user) { } +void Module::OnUserJoin(User* user, Channel* channel, bool &silent) { } +void Module::OnPostJoin(User* user, Channel* channel) { } +void Module::OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent) { } +void Module::OnRehash(User* user, const std::string ¶meter) { } +void Module::OnServerRaw(std::string &raw, bool inbound, User* user) { } +int Module::OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs) { return 0; } +void Module::OnMode(User* user, void* dest, int target_type, const std::string &text) { } Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR,-1); } -void Module::OnOper(userrec* user, const std::string &opertype) { } -void Module::OnPostOper(userrec* user, const std::string &opertype) { } -void Module::OnInfo(userrec* user) { } -void Module::OnWhois(userrec* source, userrec* dest) { } -int Module::OnUserPreInvite(userrec* source,userrec* dest,chanrec* channel) { return 0; } -int Module::OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; } -int Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; } -int Module::OnUserPreNick(userrec* user, const std::string &newnick) { return 0; } -void Module::OnUserPostNick(userrec* user, const std::string &oldnick) { } -int Module::OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) { return ACR_DEFAULT; } +void Module::OnOper(User* user, const std::string &opertype) { } +void Module::OnPostOper(User* user, const std::string &opertype) { } +void Module::OnInfo(User* user) { } +void Module::OnWhois(User* source, User* dest) { } +int Module::OnUserPreInvite(User* source,User* dest,Channel* channel) { return 0; } +int Module::OnUserPreMessage(User* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; } +int Module::OnUserPreNotice(User* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; } +int Module::OnUserPreNick(User* user, const std::string &newnick) { return 0; } +void Module::OnUserPostNick(User* user, const std::string &oldnick) { } +int Module::OnAccessCheck(User* source,User* dest,Channel* channel,int access_type) { return ACR_DEFAULT; } void Module::On005Numeric(std::string &output) { } -int Module::OnKill(userrec* source, userrec* dest, const std::string &reason) { return 0; } +int Module::OnKill(User* source, User* dest, const std::string &reason) { return 0; } void Module::OnLoadModule(Module* mod,const std::string &name) { } void Module::OnUnloadModule(Module* mod,const std::string &name) { } void Module::OnBackgroundTimer(time_t curtime) { } -int Module::OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) { return 0; } -void Module::OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line) { } -bool Module::OnCheckReady(userrec* user) { return true; } -int Module::OnUserRegister(userrec* user) { return 0; } -int Module::OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { return 0; } -void Module::OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent) { } -int Module::OnCheckInvite(userrec* user, chanrec* chan) { return 0; } -int Module::OnCheckKey(userrec* user, chanrec* chan, const std::string &keygiven) { return 0; } -int Module::OnCheckLimit(userrec* user, chanrec* chan) { return 0; } -int Module::OnCheckBan(userrec* user, chanrec* chan) { return 0; } -int Module::OnStats(char symbol, userrec* user, string_list &results) { return 0; } -int Module::OnChangeLocalUserHost(userrec* user, const std::string &newhost) { return 0; } -int Module::OnChangeLocalUserGECOS(userrec* user, const std::string &newhost) { return 0; } -int Module::OnLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { return 0; } +int Module::OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) { return 0; } +void Module::OnPostCommand(const std::string &command, const char** parameters, int pcnt, User *user, CmdResult result, const std::string &original_line) { } +bool Module::OnCheckReady(User* user) { return true; } +int Module::OnUserRegister(User* user) { return 0; } +int Module::OnUserPreKick(User* source, User* user, Channel* chan, const std::string &reason) { return 0; } +void Module::OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) { } +int Module::OnCheckInvite(User* user, Channel* chan) { return 0; } +int Module::OnCheckKey(User* user, Channel* chan, const std::string &keygiven) { return 0; } +int Module::OnCheckLimit(User* user, Channel* chan) { return 0; } +int Module::OnCheckBan(User* user, Channel* chan) { return 0; } +int Module::OnStats(char symbol, User* user, string_list &results) { return 0; } +int Module::OnChangeLocalUserHost(User* user, const std::string &newhost) { return 0; } +int Module::OnChangeLocalUserGECOS(User* user, const std::string &newhost) { return 0; } +int Module::OnLocalTopicChange(User* user, Channel* chan, const std::string &topic) { return 0; } void Module::OnEvent(Event* event) { return; } char* Module::OnRequest(Request* request) { return NULL; } int Module::OnOperCompare(const std::string &password, const std::string &input, int tagnumber) { return 0; } -void Module::OnGlobalOper(userrec* user) { } -void Module::OnPostConnect(userrec* user) { } -int Module::OnAddBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; } -int Module::OnDelBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; } +void Module::OnGlobalOper(User* user) { } +void Module::OnPostConnect(User* user) { } +int Module::OnAddBan(User* source, Channel* channel,const std::string &banmask) { return 0; } +int Module::OnDelBan(User* source, Channel* channel,const std::string &banmask) { return 0; } void Module::OnRawSocketAccept(int fd, const std::string &ip, int localport) { } int Module::OnRawSocketWrite(int fd, const char* buffer, int count) { return 0; } void Module::OnRawSocketClose(int fd) { } void Module::OnRawSocketConnect(int fd) { } int Module::OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult) { return 0; } -void Module::OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { } -void Module::OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { } -void Module::OnRemoteKill(userrec* source, userrec* dest, const std::string &reason, const std::string &operreason) { } -void Module::OnUserInvite(userrec* source,userrec* dest,chanrec* channel) { } -void Module::OnPostLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { } +void Module::OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { } +void Module::OnUserNotice(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { } +void Module::OnRemoteKill(User* source, User* dest, const std::string &reason, const std::string &operreason) { } +void Module::OnUserInvite(User* source,User* dest,Channel* channel) { } +void Module::OnPostLocalTopicChange(User* user, Channel* chan, const std::string &topic) { } void Module::OnGetServerDescription(const std::string &servername,std::string &description) { } -void Module::OnSyncUser(userrec* user, Module* proto, void* opaque) { } -void Module::OnSyncChannel(chanrec* chan, Module* proto, void* opaque) { } +void Module::OnSyncUser(User* user, Module* proto, void* opaque) { } +void Module::OnSyncChannel(Channel* chan, Module* proto, void* opaque) { } void Module::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline) { } -void Module::OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, const std::string &extname, bool displayable) { } -void Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable) { } +void Module::OnSyncChannelMetaData(Channel* chan, Module* proto,void* opaque, const std::string &extname, bool displayable) { } +void Module::OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable) { } void Module::OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable) { } void Module::OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) { } void Module::ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata) { } -void Module::OnWallops(userrec* user, const std::string &text) { } -void Module::OnChangeHost(userrec* user, const std::string &newhost) { } -void Module::OnChangeName(userrec* user, const std::string &gecos) { } -void Module::OnAddGLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { } -void Module::OnAddZLine(long duration, userrec* source, const std::string &reason, const std::string &ipmask) { } -void Module::OnAddKLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { } -void Module::OnAddQLine(long duration, userrec* source, const std::string &reason, const std::string &nickmask) { } -void Module::OnAddELine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { } -void Module::OnDelGLine(userrec* source, const std::string &hostmask) { } -void Module::OnDelZLine(userrec* source, const std::string &ipmask) { } -void Module::OnDelKLine(userrec* source, const std::string &hostmask) { } -void Module::OnDelQLine(userrec* source, const std::string &nickmask) { } -void Module::OnDelELine(userrec* source, const std::string &hostmask) { } +void Module::OnWallops(User* user, const std::string &text) { } +void Module::OnChangeHost(User* user, const std::string &newhost) { } +void Module::OnChangeName(User* user, const std::string &gecos) { } +void Module::OnAddGLine(long duration, User* source, const std::string &reason, const std::string &hostmask) { } +void Module::OnAddZLine(long duration, User* source, const std::string &reason, const std::string &ipmask) { } +void Module::OnAddKLine(long duration, User* source, const std::string &reason, const std::string &hostmask) { } +void Module::OnAddQLine(long duration, User* source, const std::string &reason, const std::string &nickmask) { } +void Module::OnAddELine(long duration, User* source, const std::string &reason, const std::string &hostmask) { } +void Module::OnDelGLine(User* source, const std::string &hostmask) { } +void Module::OnDelZLine(User* source, const std::string &ipmask) { } +void Module::OnDelKLine(User* source, const std::string &hostmask) { } +void Module::OnDelQLine(User* source, const std::string &nickmask) { } +void Module::OnDelELine(User* source, const std::string &hostmask) { } void Module::OnCleanup(int target_type, void* item) { } void Module::Implements(char* Implements) { for (int j = 0; j < 255; j++) Implements[j] = 0; } -void Module::OnChannelDelete(chanrec* chan) { } +void Module::OnChannelDelete(Channel* chan) { } Priority Module::Prioritize() { return PRIORITY_DONTCARE; } -void Module::OnSetAway(userrec* user) { } -void Module::OnCancelAway(userrec* user) { } -int Module::OnUserList(userrec* user, chanrec* Ptr, CUList* &userlist) { return 0; } -int Module::OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text) { return 0; } -void Module::OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list, const std::string &text) { } +void Module::OnSetAway(User* user) { } +void Module::OnCancelAway(User* user) { } +int Module::OnUserList(User* user, Channel* Ptr, CUList* &userlist) { return 0; } +int Module::OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) { return 0; } +void Module::OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text) { } void Module::OnGarbageCollect() { } -void Module::OnBufferFlushed(userrec* user) { } +void Module::OnBufferFlushed(User* user) { } ModuleManager::ModuleManager(InspIRCd* Ins) @@ -759,7 +759,7 @@ const std::string& ModuleManager::GetModuleName(Module* m) * m_safelist possible, initially). */ -chanrec* InspIRCd::GetChannelIndex(long index) +Channel* InspIRCd::GetChannelIndex(long index) { int target = 0; for (chan_hash::iterator n = this->chanlist->begin(); n != this->chanlist->end(); n++, target++) @@ -775,12 +775,12 @@ bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spatter return match(sliteral.c_str(),spattern.c_str()); } -CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user) +CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, User* user) { return this->Parser->CallHandler(commandname,parameters,pcnt,user); } -bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, userrec* user) +bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, User* user) { return this->Parser->IsValidCommand(commandname, pcnt, user); } @@ -794,12 +794,12 @@ void InspIRCd::AddCommand(Command *f) } } -void InspIRCd::SendMode(const char** parameters, int pcnt, userrec *user) +void InspIRCd::SendMode(const char** parameters, int pcnt, User *user) { this->Modes->Process(parameters,pcnt,user,true); } -void InspIRCd::DumpText(userrec* User, const std::string &LinePrefix, stringstream &TextStream) +void InspIRCd::DumpText(User* User, const std::string &LinePrefix, stringstream &TextStream) { std::string CompleteLine = LinePrefix; std::string Word; @@ -815,9 +815,9 @@ void InspIRCd::DumpText(userrec* User, const std::string &LinePrefix, stringstre User->WriteServ(CompleteLine); } -userrec* FindDescriptorHandler::Call(int socket) +User* FindDescriptorHandler::Call(int socket) { - return reinterpret_cast(Server->SE->GetRef(socket)); + return reinterpret_cast(Server->SE->GetRef(socket)); } bool InspIRCd::AddMode(ModeHandler* mh, const unsigned char mode) @@ -1044,7 +1044,7 @@ long ConfigReader::GetError() return olderr; } -void ConfigReader::DumpErrors(bool bail, userrec* user) +void ConfigReader::DumpErrors(bool bail, User* user) { ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user); } diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp index 6fe79a981..43a767a1c 100644 --- a/src/modules/extra/m_filter_pcre.cpp +++ b/src/modules/extra/m_filter_pcre.cpp @@ -61,7 +61,7 @@ class ModuleFilterPCRE : public FilterBase { } - virtual FilterResult* FilterMatch(userrec* user, const std::string &text, int flags) + virtual FilterResult* FilterMatch(User* user, const std::string &text, int flags) { for (std::vector::iterator index = filters.begin(); index != filters.end(); index++) { @@ -131,7 +131,7 @@ class ModuleFilterPCRE : public FilterBase } } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ConfigReader MyConf(ServerInstance); @@ -164,7 +164,7 @@ class ModuleFilterPCRE : public FilterBase } } - virtual int OnStats(char symbol, userrec* user, string_list &results) + virtual int OnStats(char symbol, User* user, string_list &results) { if (symbol == 's') { diff --git a/src/modules/extra/m_httpclienttest.cpp b/src/modules/extra/m_httpclienttest.cpp index 41a0b162e..e27f4dcf7 100644 --- a/src/modules/extra/m_httpclienttest.cpp +++ b/src/modules/extra/m_httpclienttest.cpp @@ -43,7 +43,7 @@ public: return Version(1,0,0,1,VF_VENDOR,API_VERSION); } - virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent) + virtual void OnUserJoin(User* user, Channel* channel, bool &silent) { // method called when a user joins a channel @@ -71,7 +71,7 @@ public: return NULL; } - virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) + virtual void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent) { } diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index a78e8c61b..53d852f72 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -796,7 +796,7 @@ class ModuleSQL : public Module return NULL; } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { rehashing = true; } diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index 0bc7dfd1c..afa32d3d8 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -755,7 +755,7 @@ class ModulePgSQL : public Module List[I_OnUnloadModule] = List[I_OnRequest] = List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = 1; } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ReadConf(); } diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp index 01d5733af..8eb451f47 100644 --- a/src/modules/extra/m_sqlauth.cpp +++ b/src/modules/extra/m_sqlauth.cpp @@ -65,7 +65,7 @@ public: List[I_OnUserDisconnect] = List[I_OnCheckReady] = List[I_OnRequest] = List[I_OnRehash] = List[I_OnUserRegister] = 1; } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ConfigReader Conf(ServerInstance); @@ -86,7 +86,7 @@ public: } } - virtual int OnUserRegister(userrec* user) + virtual int OnUserRegister(User* user) { if ((!allowpattern.empty()) && (ServerInstance->MatchText(user->nick,allowpattern))) { @@ -96,20 +96,20 @@ public: if (!CheckCredentials(user)) { - userrec::QuitUser(ServerInstance,user,killreason); + User::QuitUser(ServerInstance,user,killreason); return 1; } return 0; } - bool CheckCredentials(userrec* user) + bool CheckCredentials(User* user) { SQLrequest req = SQLreq(this, SQLprovider, databaseid, "SELECT ? FROM ? WHERE ? = '?' AND ? = ?'?')", userfield, usertable, userfield, user->nick, passfield, encryption, user->password); if(req.Send()) { /* When we get the query response from the service provider we will be given an ID to play with, - * just an ID number which is unique to this query. We need a way of associating that ID with a userrec + * just an ID number which is unique to this query. We need a way of associating that ID with a User * so we insert it into a map mapping the IDs to users. * Thankfully m_sqlutils provides this, it will associate a ID with a user or channel, and if the user quits it removes the * association. This means that if the user quits during a query we will just get a failed lookup from m_sqlutils - telling @@ -133,7 +133,7 @@ public: { SQLresult* res = static_cast(request); - userrec* user = GetAssocUser(this, SQLutils, res->id).S().user; + User* user = GetAssocUser(this, SQLutils, res->id).S().user; UnAssociate(this, SQLutils, res->id).S(); if(user) @@ -165,20 +165,20 @@ public: if (!user->GetExt("sqlauthed")) { - userrec::QuitUser(ServerInstance,user,killreason); + User::QuitUser(ServerInstance,user,killreason); } return SQLSUCCESS; } return NULL; } - virtual void OnUserDisconnect(userrec* user) + virtual void OnUserDisconnect(User* user) { user->Shrink("sqlauthed"); user->Shrink("sqlauth_failed"); } - virtual bool OnCheckReady(userrec* user) + virtual bool OnCheckReady(User* user) { return user->GetExt("sqlauthed"); } diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index f37e52324..9795e9f8b 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -610,7 +610,7 @@ class ModuleSQLite3 : public Module } } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ReadConf(); } diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp index fc929b94f..6194e502d 100644 --- a/src/modules/extra/m_sqllog.cpp +++ b/src/modules/extra/m_sqllog.cpp @@ -220,7 +220,7 @@ class ModuleSQLLog : public Module dbid = Conf.ReadValue("sqllog","dbid",0); // database id of a database configured in sql module } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ReadConfig(); } @@ -263,23 +263,23 @@ class ModuleSQLLog : public Module } } - virtual void OnOper(userrec* user, const std::string &opertype) + virtual void OnOper(User* user, const std::string &opertype) { AddLogEntry(LT_OPER,user->nick,user->host,user->server); } - virtual void OnGlobalOper(userrec* user) + virtual void OnGlobalOper(User* user) { AddLogEntry(LT_OPER,user->nick,user->host,user->server); } - virtual int OnKill(userrec* source, userrec* dest, const std::string &reason) + virtual int OnKill(User* source, User* dest, const std::string &reason) { AddLogEntry(LT_KILL,dest->nick,dest->host,source->nick); return 0; } - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) { if ((command == "GLINE" || command == "KLINE" || command == "ELINE" || command == "ZLINE") && validated) { @@ -288,12 +288,12 @@ class ModuleSQLLog : public Module return 0; } - virtual void OnUserConnect(userrec* user) + virtual void OnUserConnect(User* user) { AddLogEntry(LT_CONNECT,user->nick,user->host,user->server); } - virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message) + virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) { AddLogEntry(LT_DISCONNECT,user->nick,user->host,user->server); } diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp index d1bece343..c697d6a9b 100644 --- a/src/modules/extra/m_sqloper.cpp +++ b/src/modules/extra/m_sqloper.cpp @@ -63,14 +63,14 @@ public: List[I_OnRequest] = List[I_OnRehash] = List[I_OnPreCommand] = 1; } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ConfigReader Conf(ServerInstance); databaseid = Conf.ReadValue("sqloper", "dbid", 0); /* Database ID of a database configured for the service provider module */ } - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) { if ((validated) && (command == "OPER")) { @@ -87,7 +87,7 @@ public: return 0; } - bool LookupOper(userrec* user, const std::string &username, const std::string &password) + bool LookupOper(User* user, const std::string &username, const std::string &password) { Module* target; @@ -109,7 +109,7 @@ public: if (req.Send()) { /* When we get the query response from the service provider we will be given an ID to play with, - * just an ID number which is unique to this query. We need a way of associating that ID with a userrec + * just an ID number which is unique to this query. We need a way of associating that ID with a User * so we insert it into a map mapping the IDs to users. * Thankfully m_sqlutils provides this, it will associate a ID with a user or channel, and if the user quits it removes the * association. This means that if the user quits during a query we will just get a failed lookup from m_sqlutils - telling @@ -140,7 +140,7 @@ public: { SQLresult* res = static_cast(request); - userrec* user = GetAssocUser(this, SQLutils, res->id).S().user; + User* user = GetAssocUser(this, SQLutils, res->id).S().user; UnAssociate(this, SQLutils, res->id).S(); char* tried_user = NULL; @@ -225,7 +225,7 @@ public: return NULL; } - void LoginFail(userrec* user, const std::string &username, const std::string &pass) + void LoginFail(User* user, const std::string &username, const std::string &pass) { Command* oper_command = ServerInstance->Parser->GetHandler("OPER"); @@ -240,7 +240,7 @@ public: } } - bool OperUser(userrec* user, const std::string &username, const std::string &password, const std::string &pattern, const std::string &type) + bool OperUser(User* user, const std::string &username, const std::string &password, const std::string &pattern, const std::string &type) { ConfigReader Conf(ServerInstance); diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp index 2edf28263..b53186f71 100644 --- a/src/modules/extra/m_sqlutils.cpp +++ b/src/modules/extra/m_sqlutils.cpp @@ -23,8 +23,8 @@ /* $ModDesc: Provides some utilities to SQL client modules, such as mapping queries to users and channels */ /* $ModDep: m_sqlutils.h */ -typedef std::map IdUserMap; -typedef std::map IdChanMap; +typedef std::map IdUserMap; +typedef std::map IdChanMap; typedef std::list AssocIdList; class ModuleSQLutils : public Module @@ -105,7 +105,7 @@ public: return SQLUTILSUCCESS; } - virtual void OnUserDisconnect(userrec* user) + virtual void OnUserDisconnect(User* user) { /* A user is disconnecting, first we need to check if they have a list of queries associated with them. * Then, if they do, we need to erase each of them from our IdUserMap (iduser) so when the module that @@ -125,7 +125,7 @@ public: { if(iter->second != user) { - ServerInstance->Log(DEBUG, "BUG: ID associated with user %s doesn't have the same userrec* associated with it in the map (erasing anyway)", user->nick); + ServerInstance->Log(DEBUG, "BUG: ID associated with user %s doesn't have the same User* associated with it in the map (erasing anyway)", user->nick); } iduser.erase(iter); @@ -192,7 +192,7 @@ public: } } - virtual void OnChannelDelete(chanrec* chan) + virtual void OnChannelDelete(Channel* chan) { /* A channel is being destroyed, first we need to check if it has a list of queries associated with it. * Then, if it does, we need to erase each of them from our IdChanMap (idchan) so when the module that @@ -212,7 +212,7 @@ public: { if(iter->second != chan) { - ServerInstance->Log(DEBUG, "BUG: ID associated with channel %s doesn't have the same chanrec* associated with it in the map (erasing anyway)", chan->name); + ServerInstance->Log(DEBUG, "BUG: ID associated with channel %s doesn't have the same Channel* associated with it in the map (erasing anyway)", chan->name); } idchan.erase(iter); } diff --git a/src/modules/extra/m_sqlutils.h b/src/modules/extra/m_sqlutils.h index 92fbdf5c7..27433e254 100644 --- a/src/modules/extra/m_sqlutils.h +++ b/src/modules/extra/m_sqlutils.h @@ -33,9 +33,9 @@ public: unsigned long id; /** User */ - userrec* user; + User* user; - AssociateUser(Module* s, Module* d, unsigned long i, userrec* u) + AssociateUser(Module* s, Module* d, unsigned long i, User* u) : Request(s, d, SQLUTILAU), id(i), user(u) { } @@ -57,9 +57,9 @@ public: unsigned long id; /** Channel */ - chanrec* chan; + Channel* chan; - AssociateChan(Module* s, Module* d, unsigned long i, chanrec* u) + AssociateChan(Module* s, Module* d, unsigned long i, Channel* u) : Request(s, d, SQLUTILAC), id(i), chan(u) { } @@ -102,7 +102,7 @@ public: unsigned long id; /** The user */ - userrec* user; + User* user; GetAssocUser(Module* s, Module* d, unsigned long i) : Request(s, d, SQLUTILGU), id(i), user(NULL) @@ -126,7 +126,7 @@ public: unsigned long id; /** The channel */ - chanrec* chan; + Channel* chan; GetAssocChan(Module* s, Module* d, unsigned long i) : Request(s, d, SQLUTILGC), id(i), chan(NULL) diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 4af425e0b..a7a52d910 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -111,7 +111,7 @@ class ModuleSSLGnuTLS : public Module gnutls_certificate_set_dh_params(x509_cred, dh_params); } - virtual void OnRehash(userrec* user, const std::string ¶m) + virtual void OnRehash(User* user, const std::string ¶m) { if(param != "ssl") return; @@ -247,13 +247,13 @@ class ModuleSSLGnuTLS : public Module { if(target_type == TYPE_USER) { - userrec* user = (userrec*)item; + User* user = (User*)item; if(user->GetExt("ssl", dummy) && isin(user->GetPort(), listenports)) { // User is using SSL, they're a local user, and they're using one of *our* SSL ports. // Potentially there could be multiple SSL modules loaded at once on different ports. - userrec::QuitUser(ServerInstance, user, "SSL module unloading"); + User::QuitUser(ServerInstance, user, "SSL module unloading"); } if (user->GetExt("ssl_cert", dummy) && isin(user->GetPort(), listenports)) { @@ -578,7 +578,7 @@ class ModuleSSLGnuTLS : public Module } // :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection - virtual void OnWhois(userrec* source, userrec* dest) + virtual void OnWhois(User* source, User* dest) { if (!clientactive) return; @@ -590,7 +590,7 @@ class ModuleSSLGnuTLS : public Module } } - virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable) + virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable) { // check if the linking module wants to know about OUR metadata if(extname == "ssl") @@ -610,7 +610,7 @@ class ModuleSSLGnuTLS : public Module // check if its our metadata key, and its associated with a user if ((target_type == TYPE_USER) && (extname == "ssl")) { - userrec* dest = (userrec*)target; + User* dest = (User*)target; // if they dont already have an ssl flag, accept the remote server's if (!dest->GetExt(extname, dummy)) { @@ -654,7 +654,7 @@ class ModuleSSLGnuTLS : public Module { // Handshake complete. // This will do for setting the ssl flag...it could be done earlier if it's needed. But this seems neater. - userrec* extendme = ServerInstance->FindDescriptor(session->fd); + User* extendme = ServerInstance->FindDescriptor(session->fd); if (extendme) { if (!extendme->GetExt("ssl", dummy)) @@ -671,7 +671,7 @@ class ModuleSSLGnuTLS : public Module } } - virtual void OnPostConnect(userrec* user) + virtual void OnPostConnect(User* user) { // This occurs AFTER OnUserConnect so we can be sure the // protocol module has propagated the NICK message. @@ -706,7 +706,7 @@ class ModuleSSLGnuTLS : public Module ServerInstance->SE->WantWrite(eh); } - virtual void OnBufferFlushed(userrec* user) + virtual void OnBufferFlushed(User* user) { if (user->GetExt("ssl")) { diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 76270c650..4ce21c805 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -152,7 +152,7 @@ class ModuleSSLOpenSSL : public Module OnRehash(NULL,"ssl"); } - virtual void OnRehash(userrec* user, const std::string ¶m) + virtual void OnRehash(User* user, const std::string ¶m) { if (param != "ssl") return; @@ -301,13 +301,13 @@ class ModuleSSLOpenSSL : public Module { if (target_type == TYPE_USER) { - userrec* user = (userrec*)item; + User* user = (User*)item; if (user->GetExt("ssl", dummy) && IS_LOCAL(user) && isin(user->GetPort(), listenports)) { // User is using SSL, they're a local user, and they're using one of *our* SSL ports. // Potentially there could be multiple SSL modules loaded at once on different ports. - userrec::QuitUser(ServerInstance, user, "SSL module unloading"); + User::QuitUser(ServerInstance, user, "SSL module unloading"); } if (user->GetExt("ssl_cert", dummy) && isin(user->GetPort(), listenports)) { @@ -676,7 +676,7 @@ class ModuleSSLOpenSSL : public Module } // :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection - virtual void OnWhois(userrec* source, userrec* dest) + virtual void OnWhois(User* source, User* dest) { if (!clientactive) return; @@ -688,7 +688,7 @@ class ModuleSSLOpenSSL : public Module } } - virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable) + virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable) { // check if the linking module wants to know about OUR metadata if (extname == "ssl") @@ -708,7 +708,7 @@ class ModuleSSLOpenSSL : public Module // check if its our metadata key, and its associated with a user if ((target_type == TYPE_USER) && (extname == "ssl")) { - userrec* dest = (userrec*)target; + User* dest = (User*)target; // if they dont already have an ssl flag, accept the remote server's if (!dest->GetExt(extname, dummy)) { @@ -756,7 +756,7 @@ class ModuleSSLOpenSSL : public Module { // Handshake complete. // This will do for setting the ssl flag...it could be done earlier if it's needed. But this seems neater. - userrec* u = ServerInstance->FindDescriptor(session->fd); + User* u = ServerInstance->FindDescriptor(session->fd); if (u) { if (!u->GetExt("ssl", dummy)) @@ -782,7 +782,7 @@ class ModuleSSLOpenSSL : public Module return true; } - virtual void OnPostConnect(userrec* user) + virtual void OnPostConnect(User* user) { // This occurs AFTER OnUserConnect so we can be sure the // protocol module has propagated the NICK message. @@ -812,7 +812,7 @@ class ModuleSSLOpenSSL : public Module ServerInstance->SE->WantWrite(eh); } - virtual void OnBufferFlushed(userrec* user) + virtual void OnBufferFlushed(User* user) { if (user->GetExt("ssl")) { diff --git a/src/modules/extra/m_ssl_oper_cert.cpp b/src/modules/extra/m_ssl_oper_cert.cpp index e95447b6d..3d0e81928 100644 --- a/src/modules/extra/m_ssl_oper_cert.cpp +++ b/src/modules/extra/m_ssl_oper_cert.cpp @@ -33,9 +33,9 @@ class cmd_fingerprint : public Command syntax = ""; } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const char** parameters, int pcnt, User *user) { - userrec* target = ServerInstance->FindNick(parameters[0]); + User* target = ServerInstance->FindNick(parameters[0]); if (target) { ssl_cert* cert; @@ -94,7 +94,7 @@ class ModuleOperSSLCert : public Module List[I_OnPreCommand] = List[I_OnRehash] = 1; } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { delete cf; cf = new ConfigReader(ServerInstance); @@ -115,7 +115,7 @@ class ModuleOperSSLCert : public Module } - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) { irc::string cmd = command.c_str(); diff --git a/src/modules/extra/m_sslinfo.cpp b/src/modules/extra/m_sslinfo.cpp index 008608f03..0d3dce2eb 100644 --- a/src/modules/extra/m_sslinfo.cpp +++ b/src/modules/extra/m_sslinfo.cpp @@ -33,9 +33,9 @@ class cmd_sslinfo : public Command this->syntax = ""; } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const char** parameters, int pcnt, User *user) { - userrec* target = ServerInstance->FindNick(parameters[0]); + User* target = ServerInstance->FindNick(parameters[0]); ssl_cert* cert; if (target) diff --git a/src/modules/extra/m_ziplink.cpp b/src/modules/extra/m_ziplink.cpp index 7f7453240..90da97856 100644 --- a/src/modules/extra/m_ziplink.cpp +++ b/src/modules/extra/m_ziplink.cpp @@ -218,7 +218,7 @@ class ModuleZLib : public Module } /* Handle stats z (misc stats) */ - virtual int OnStats(char symbol, userrec* user, string_list &results) + virtual int OnStats(char symbol, User* user, string_list &results) { if (symbol == 'z') { diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 7f09de134..90517255e 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -127,9 +127,9 @@ class ModuleAlias : public Module } } - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) { - userrec *u = NULL; + User *u = NULL; /* If theyre not registered yet, we dont want * to know. @@ -210,7 +210,7 @@ class ModuleAlias : public Module return 0; } - void DoCommand(std::string newline, userrec* user, const std::string &original_line) + void DoCommand(std::string newline, User* user, const std::string &original_line) { for (int v = 1; v < 10; v++) { @@ -260,7 +260,7 @@ class ModuleAlias : public Module ServerInstance->Parser->CallHandler(parv[0], &parv[1], x-1, user); } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ReadAliases(); } diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp index 7afa71803..1b48c237f 100644 --- a/src/modules/m_alltime.cpp +++ b/src/modules/m_alltime.cpp @@ -25,7 +25,7 @@ class cmd_alltime : public Command translation.push_back(TR_END); } - CmdResult Handle(const char **parameters, int pcnt, userrec *user) + CmdResult Handle(const char **parameters, int pcnt, User *user) { char fmtdate[64]; char fmtdate2[64]; diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp index 0e254d00c..5690572ce 100644 --- a/src/modules/m_antibear.cpp +++ b/src/modules/m_antibear.cpp @@ -40,7 +40,7 @@ class ModuleAntiBear : public Module List[I_OnUserRegister] = List[I_OnPreCommand] = 1; } - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) { if (command == "NOTICE" && !validated && pcnt > 1 && user->GetExt("antibear_timewait")) { @@ -62,7 +62,7 @@ class ModuleAntiBear : public Module return 0; } - virtual int OnUserRegister(userrec* user) + virtual int OnUserRegister(User* user) { user->WriteServ("439 %s :This server has anti-spambot mechanisms enabled.", user->nick); user->WriteServ("931 %s :Malicious bots, spammers, and other automated systems of dubious origin are NOT welcome here.", user->nick); diff --git a/src/modules/m_antibottler.cpp b/src/modules/m_antibottler.cpp index 56ad9da05..cef990a71 100644 --- a/src/modules/m_antibottler.cpp +++ b/src/modules/m_antibottler.cpp @@ -39,7 +39,7 @@ class ModuleAntiBottler : public Module return Version(1,1,0,1,VF_VENDOR,API_VERSION); } - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) { char data[MAXBUF]; strlcpy(data,original_line.c_str(),MAXBUF); diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp index aa5e18438..b91538ace 100644 --- a/src/modules/m_auditorium.cpp +++ b/src/modules/m_auditorium.cpp @@ -20,7 +20,7 @@ class AuditoriumMode : public ModeHandler public: AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 0, 0, false, MODETYPE_CHANNEL, false) { } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (channel->IsModeSet('u') != adding) { @@ -65,7 +65,7 @@ class ModuleAuditorium : public Module DELETE(aum); } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ConfigReader conf(ServerInstance); ShowOps = conf.ReadFlag("auditorium", "showops", 0); @@ -87,7 +87,7 @@ class ModuleAuditorium : public Module List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = List[I_OnRehash] = 1; } - virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &nameslist) + virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist) { if (Ptr->IsModeSet('u')) { @@ -119,7 +119,7 @@ class ModuleAuditorium : public Module return 0; } - virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent) + virtual void OnUserJoin(User* user, Channel* channel, bool &silent) { if (channel->IsModeSet('u')) { @@ -131,7 +131,7 @@ class ModuleAuditorium : public Module } } - void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) + void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent) { if (channel->IsModeSet('u')) { @@ -148,7 +148,7 @@ class ModuleAuditorium : public Module } } - void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent) + void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) { if (chan->IsModeSet('u')) { @@ -162,7 +162,7 @@ class ModuleAuditorium : public Module } } - void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message) + void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) { Command* parthandler = ServerInstance->Parser->GetHandler("PART"); std::vector to_leave; diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp index 4f36fb8c9..4c0e93dea 100644 --- a/src/modules/m_banexception.cpp +++ b/src/modules/m_banexception.cpp @@ -62,7 +62,7 @@ public: output.append(" EXCEPTS=e"); } - virtual int OnCheckBan(userrec* user, chanrec* chan) + virtual int OnCheckBan(User* user, Channel* chan) { if (chan != NULL) { @@ -93,17 +93,17 @@ public: be->DoCleanup(target_type, item); } - virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque) + virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque) { be->DoSyncChannel(chan, proto, opaque); } - virtual void OnChannelDelete(chanrec* chan) + virtual void OnChannelDelete(Channel* chan) { be->DoChannelDelete(chan); } - virtual void OnRehash(userrec* user, const std::string ¶m) + virtual void OnRehash(User* user, const std::string ¶m) { be->DoRehash(); } diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index 9ac440d5e..60bd1bba4 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -44,7 +44,7 @@ class BanRedirect : public ModeWatcher { } - bool BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string ¶m, bool adding, ModeType type) + bool BeforeMode(User* source, User* dest, Channel* channel, std::string ¶m, bool adding, ModeType type) { /* nick!ident@host -> nick!ident@host * nick!ident@host#chan -> nick!ident@host#chan @@ -204,7 +204,7 @@ class ModuleBanRedirect : public Module List[I_OnRehash] = List[I_OnUserPreJoin] = List[I_OnChannelDelete] = List[I_OnCleanup] = 1; } - virtual void OnChannelDelete(chanrec* chan) + virtual void OnChannelDelete(Channel* chan) { OnCleanup(TYPE_CHANNEL, chan); } @@ -213,7 +213,7 @@ class ModuleBanRedirect : public Module { if(target_type == TYPE_CHANNEL) { - chanrec* chan = static_cast(item); + Channel* chan = static_cast(item); BanRedirectList* redirects; if(chan->GetExt("banredirects", redirects)) @@ -251,12 +251,12 @@ class ModuleBanRedirect : public Module } } - virtual void OnRehash(userrec* user, const std::string ¶m) + virtual void OnRehash(User* user, const std::string ¶m) { ExceptionModule = ServerInstance->Modules->Find("m_banexception.so"); } - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) + virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs) { /* This prevents recursion when a user sets multiple ban redirects in a chain * (thanks Potter) @@ -293,7 +293,7 @@ class ModuleBanRedirect : public Module if(ServerInstance->MatchText(user->GetFullRealHost(), redir->banmask) || ServerInstance->MatchText(user->GetFullHost(), redir->banmask) || ServerInstance->MatchText(ipmask, redir->banmask)) { /* tell them they're banned and are being transferred */ - chanrec* destchan = ServerInstance->FindChan(redir->targetchan); + Channel* destchan = ServerInstance->FindChan(redir->targetchan); if(destchan && ServerInstance->Modules->Find("m_redirect.so") && destchan->IsModeSet('L') && destchan->limit && (destchan->GetUserCounter() >= destchan->limit)) { @@ -305,7 +305,7 @@ class ModuleBanRedirect : public Module user->WriteServ("474 %s %s :Cannot join channel (You are banned)", user->nick, chan->name); user->WriteServ("470 %s :You are being automatically redirected to %s", user->nick, redir->targetchan.c_str()); nofollow = true; - chanrec::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", ServerInstance->Time(true)); + Channel::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", ServerInstance->Time(true)); nofollow = false; return 1; } diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp index bcef01fd2..44f59f347 100644 --- a/src/modules/m_blockamsg.cpp +++ b/src/modules/m_blockamsg.cpp @@ -65,7 +65,7 @@ class ModuleBlockAmsg : public Module return Version(1,1,0,0,VF_VENDOR,API_VERSION); } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ConfigReader Conf(ServerInstance); @@ -88,7 +88,7 @@ class ModuleBlockAmsg : public Module action = IBLOCK_KILLOPERS; } - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) { // Don't do anything with unregistered users, or remote ones. if(!user || (user->registered != REG_ALL) || !IS_LOCAL(user)) @@ -144,7 +144,7 @@ class ModuleBlockAmsg : public Module ServerInstance->WriteOpers("*** %s had an /amsg or /ame denied", user->nick); if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS) - userrec::QuitUser(ServerInstance, user, "Global message (/amsg or /ame) detected"); + User::QuitUser(ServerInstance, user, "Global message (/amsg or /ame) detected"); else if(action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS) user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) detected", user->nick); @@ -171,7 +171,7 @@ class ModuleBlockAmsg : public Module { if(target_type == TYPE_USER) { - userrec* user = (userrec*)item; + User* user = (User*)item; BlockedMessage* m; user->GetExt("amsgblock", m); if(m) diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp index 893981283..167a12bec 100644 --- a/src/modules/m_blockcaps.cpp +++ b/src/modules/m_blockcaps.cpp @@ -23,7 +23,7 @@ class BlockCaps : public ModeHandler public: BlockCaps(InspIRCd* Instance) : ModeHandler(Instance, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (adding) { @@ -67,19 +67,19 @@ public: List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1; } - virtual void OnRehash(userrec* user, const std::string ¶m) + virtual void OnRehash(User* user, const std::string ¶m) { ReadConf(); } - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { if (target_type == TYPE_CHANNEL) { if ((!IS_LOCAL(user)) || (text.length() < minlen)) return 0; - chanrec* c = (chanrec*)dest; + Channel* c = (Channel*)dest; if (c->IsModeSet('P')) { @@ -96,7 +96,7 @@ public: return 0; } - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { return OnUserPreMessage(user,dest,target_type,text,status,exempt_list); } diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp index d46e5a9d6..1635815ce 100644 --- a/src/modules/m_blockcolor.cpp +++ b/src/modules/m_blockcolor.cpp @@ -22,7 +22,7 @@ class BlockColor : public ModeHandler public: BlockColor(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_CHANNEL, false) { } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (adding) { @@ -64,11 +64,11 @@ class ModuleBlockColour : public Module } - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user))) { - chanrec* c = (chanrec*)dest; + Channel* c = (Channel*)dest; if(c->IsModeSet('c')) { @@ -95,7 +95,7 @@ class ModuleBlockColour : public Module return 0; } - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { return OnUserPreMessage(user,dest,target_type,text,status,exempt_list); } diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp index 86dc9ea00..b055c83ee 100644 --- a/src/modules/m_botmode.cpp +++ b/src/modules/m_botmode.cpp @@ -22,7 +22,7 @@ class BotMode : public ModeHandler public: BotMode(InspIRCd* Instance) : ModeHandler(Instance, 'B', 0, 0, false, MODETYPE_USER, false) { } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (adding) { @@ -75,7 +75,7 @@ class ModuleBotMode : public Module return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION); } - virtual void OnWhois(userrec* src, userrec* dst) + virtual void OnWhois(User* src, User* dst) { if (dst->IsModeSet('B')) { diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 6d56b62bc..b02e892d3 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -54,7 +54,7 @@ class cmd_cban : public Command TRANSLATE4(TR_TEXT,TR_TEXT,TR_TEXT,TR_END); } - CmdResult Handle(const char** parameters, int pcnt, userrec *user) + CmdResult Handle(const char** parameters, int pcnt, User *user) { /* syntax: CBAN #channel time :reason goes here */ /* 'time' is a human-readable timestring, like 2d3h2s. */ @@ -134,7 +134,7 @@ class ModuleCBan : public Module List[I_OnUserPreJoin] = List[I_OnSyncOtherMetaData] = List[I_OnDecodeMetaData] = List[I_OnStats] = 1; } - virtual int OnStats(char symbol, userrec* user, string_list &results) + virtual int OnStats(char symbol, User* user, string_list &results) { ExpireBans(); @@ -150,7 +150,7 @@ class ModuleCBan : public Module return 0; } - virtual int OnUserPreJoin(userrec *user, chanrec *chan, const char *cname, std::string &privs) + virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs) { ExpireBans(); diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index 1159febf8..f220b0710 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -27,7 +27,7 @@ class CensorUser : public ModeHandler public: CensorUser(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_USER, false) { } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (adding) { @@ -57,7 +57,7 @@ class CensorChannel : public ModeHandler public: CensorChannel(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_CHANNEL, false) { } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (adding) { @@ -128,7 +128,7 @@ class ModuleCensor : public Module } // format of a config entry is - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { if (!IS_LOCAL(user)) return 0; @@ -136,9 +136,9 @@ class ModuleCensor : public Module bool active = false; if (target_type == TYPE_USER) - active = ((userrec*)dest)->IsModeSet('G'); + active = ((User*)dest)->IsModeSet('G'); else if (target_type == TYPE_CHANNEL) - active = ((chanrec*)dest)->IsModeSet('G'); + active = ((Channel*)dest)->IsModeSet('G'); if (!active) return 0; @@ -150,7 +150,7 @@ class ModuleCensor : public Module { if (index->second.empty()) { - user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked", user->nick, ((chanrec*)dest)->name, index->first.c_str()); + user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked", user->nick, ((Channel*)dest)->name, index->first.c_str()); return 1; } @@ -161,12 +161,12 @@ class ModuleCensor : public Module return 0; } - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { return OnUserPreMessage(user,dest,target_type,text,status,exempt_list); } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { /* * reload our config file on rehash - we must destroy and re-allocate the classes diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index eb497dea4..b30b9316b 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -51,7 +51,7 @@ class cmd_webirc : public Command this->source = "m_cgiirc.so"; this->syntax = "password client hostname ip"; } - CmdResult Handle(const char** parameters, int pcnt, userrec *user) + CmdResult Handle(const char** parameters, int pcnt, User *user) { if(user->registered == REG_ALL) return CMD_FAILURE; @@ -83,10 +83,10 @@ class CGIResolver : public Resolver { std::string typ; int theirfd; - userrec* them; + User* them; bool notify; public: - CGIResolver(Module* me, InspIRCd* ServerInstance, bool NotifyOpers, const std::string &source, bool forward, userrec* u, int userfd, const std::string &type, bool &cached) + CGIResolver(Module* me, InspIRCd* ServerInstance, bool NotifyOpers, const std::string &source, bool forward, User* u, int userfd, const std::string &type, bool &cached) : Resolver(ServerInstance, source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { } virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0) @@ -146,7 +146,7 @@ public: return PRIORITY_FIRST; } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ConfigReader Conf(ServerInstance); @@ -198,7 +198,7 @@ public: { if(target_type == TYPE_USER) { - userrec* user = (userrec*)item; + User* user = (User*)item; std::string* realhost; std::string* realip; @@ -216,7 +216,7 @@ public: } } - virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable) + virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable) { if((extname == "cgiirc_realhost") || (extname == "cgiirc_realip")) { @@ -233,7 +233,7 @@ public: { if(target_type == TYPE_USER) { - userrec* dest = (userrec*)target; + User* dest = (User*)target; std::string* bleh; if(((extname == "cgiirc_realhost") || (extname == "cgiirc_realip")) && (!dest->GetExt(extname, bleh))) { @@ -242,13 +242,13 @@ public: } } - virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message) + virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message) { OnCleanup(TYPE_USER, user); } - virtual int OnUserRegister(userrec* user) + virtual int OnUserRegister(User* user) { for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++) { @@ -283,7 +283,7 @@ public: return 0; } - virtual void OnUserConnect(userrec* user) + virtual void OnUserConnect(User* user) { std::string *webirc_hostname, *webirc_ip; if(user->GetExt("cgiirc_webirc_hostname", webirc_hostname)) @@ -317,7 +317,7 @@ public: } } - bool CheckPass(userrec* user) + bool CheckPass(User* user) { if(IsValidHost(user->password)) { @@ -376,7 +376,7 @@ public: return false; } - bool CheckIdent(userrec* user) + bool CheckIdent(User* user) { int ip[4]; char* ident; diff --git a/src/modules/m_chancreate.cpp b/src/modules/m_chancreate.cpp index 232d55314..d2b0b4e45 100644 --- a/src/modules/m_chancreate.cpp +++ b/src/modules/m_chancreate.cpp @@ -40,7 +40,7 @@ class ModuleChanCreate : public Module List[I_OnUserJoin] = 1; } - virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent) + virtual void OnUserJoin(User* user, Channel* channel, bool &silent) { if (channel->GetUserCounter() == 1) { diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp index 19e1fe3d9..994c71a2a 100644 --- a/src/modules/m_chanfilter.cpp +++ b/src/modules/m_chanfilter.cpp @@ -27,7 +27,7 @@ class ChanFilter : public ListModeBase public: ChanFilter(InspIRCd* Instance) : ListModeBase(Instance, 'g', "End of channel spamfilter list", "941", "940", false, "chanfilter") { } - virtual bool ValidateParam(userrec* user, chanrec* chan, std::string &word) + virtual bool ValidateParam(User* user, Channel* chan, std::string &word) { if ((word.length() > 35) || (word.empty())) { @@ -38,18 +38,18 @@ class ChanFilter : public ListModeBase return true; } - virtual bool TellListTooLong(userrec* user, chanrec* chan, std::string &word) + virtual bool TellListTooLong(User* user, Channel* chan, std::string &word) { user->WriteServ("939 %s %s %s :Channel spamfilter list is full",user->nick, chan->name, word.c_str()); return true; } - virtual void TellAlreadyOnList(userrec* user, chanrec* chan, std::string &word) + virtual void TellAlreadyOnList(User* user, Channel* chan, std::string &word) { user->WriteServ("937 %s %s :The word %s is already on the spamfilter list",user->nick, chan->name,word.c_str()); } - virtual void TellNotSet(userrec* user, chanrec* chan, std::string &word) + virtual void TellNotSet(User* user, Channel* chan, std::string &word) { user->WriteServ("938 %s %s :No such spamfilter word is set",user->nick, chan->name); } @@ -76,17 +76,17 @@ class ModuleChanFilter : public Module List[I_OnCleanup] = List[I_OnChannelDelete] = List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnSyncChannel] = 1; } - virtual void OnChannelDelete(chanrec* chan) + virtual void OnChannelDelete(Channel* chan) { cf->DoChannelDelete(chan); } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { cf->DoRehash(); } - virtual int ProcessMessages(userrec* user,chanrec* chan,std::string &text) + virtual int ProcessMessages(User* user,Channel* chan,std::string &text) { if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetStatus(user) == STATUS_OP) return 0; @@ -112,11 +112,11 @@ class ModuleChanFilter : public Module return 0; } - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { if (target_type == TYPE_CHANNEL) { - return ProcessMessages(user,(chanrec*)dest,text); + return ProcessMessages(user,(Channel*)dest,text); } else return 0; } @@ -126,12 +126,12 @@ class ModuleChanFilter : public Module cf->DoCleanup(target_type, item); } - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { return OnUserPreMessage(user,dest,target_type,text,status,exempt_list); } - virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque) + virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque) { cf->DoSyncChannel(chan, proto, opaque); } diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index fb545f58f..325069d0b 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -47,9 +47,9 @@ class FounderProtectBase { } - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { - userrec* x = MyInstance->FindNick(parameter); + User* x = MyInstance->FindNick(parameter); if (x) { if (!channel->HasUser(x)) @@ -72,7 +72,7 @@ class FounderProtectBase return std::make_pair(false, parameter); } - void RemoveMode(chanrec* channel, char mc) + void RemoveMode(Channel* channel, char mc) { unload_kludge = true; CUList* cl = channel->GetUsers(); @@ -102,7 +102,7 @@ class FounderProtectBase unload_kludge = false; } - void DisplayList(userrec* user, chanrec* channel) + void DisplayList(User* user, Channel* channel) { CUList* cl = channel->GetUsers(); std::string item = extend+std::string(channel->name); @@ -116,9 +116,9 @@ class FounderProtectBase user->WriteServ("%d %s %s :End of channel %s list", end, user->nick, channel->name, type.c_str()); } - userrec* FindAndVerify(std::string ¶meter, chanrec* channel) + User* FindAndVerify(std::string ¶meter, Channel* channel) { - userrec* theuser = MyInstance->FindNick(parameter); + User* theuser = MyInstance->FindNick(parameter); if ((!theuser) || (!channel->HasUser(theuser))) { parameter.clear(); @@ -127,13 +127,13 @@ class FounderProtectBase return theuser; } - bool CanRemoveOthers(userrec* u1, userrec* u2, chanrec* c) + bool CanRemoveOthers(User* u1, User* u2, Channel* c) { std::string item = extend+std::string(c->name); return (u1->GetExt(item, dummyptr) && u2->GetExt(item, dummyptr)); } - ModeAction HandleChange(userrec* source, userrec* theuser, bool adding, chanrec* channel, std::string ¶meter) + ModeAction HandleChange(User* source, User* theuser, bool adding, Channel* channel, std::string ¶meter) { std::string item = extend+std::string(channel->name); @@ -174,23 +174,23 @@ class ChanFounder : public ModeHandler, public FounderProtectBase return FOUNDER_VALUE; } - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { return FounderProtectBase::ModeSet(source, dest, channel, parameter); } - void RemoveMode(chanrec* channel) + void RemoveMode(Channel* channel) { FounderProtectBase::RemoveMode(channel, this->GetModeChar()); } - void RemoveMode(userrec* user) + void RemoveMode(User* user) { } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - userrec* theuser = FounderProtectBase::FindAndVerify(parameter, channel); + User* theuser = FounderProtectBase::FindAndVerify(parameter, channel); if (!theuser) { @@ -215,7 +215,7 @@ class ChanFounder : public ModeHandler, public FounderProtectBase } } - void DisplayList(userrec* user, chanrec* channel) + void DisplayList(User* user, Channel* channel) { FounderProtectBase::DisplayList(user,channel); } @@ -236,23 +236,23 @@ class ChanProtect : public ModeHandler, public FounderProtectBase return PROTECT_VALUE; } - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { return FounderProtectBase::ModeSet(source, dest, channel, parameter); } - void RemoveMode(chanrec* channel) + void RemoveMode(Channel* channel) { FounderProtectBase::RemoveMode(channel, this->GetModeChar()); } - void RemoveMode(userrec* user) + void RemoveMode(User* user) { } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - userrec* theuser = FounderProtectBase::FindAndVerify(parameter, channel); + User* theuser = FounderProtectBase::FindAndVerify(parameter, channel); if (!theuser) return MODEACTION_DENY; @@ -276,7 +276,7 @@ class ChanProtect : public ModeHandler, public FounderProtectBase } } - virtual void DisplayList(userrec* user, chanrec* channel) + virtual void DisplayList(User* user, Channel* channel) { FounderProtectBase::DisplayList(user, channel); } @@ -318,21 +318,21 @@ class ModuleChanProtect : public Module List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserPreJoin] = List[I_OnPostJoin] = List[I_OnAccessCheck] = List[I_OnSyncChannel] = 1; } - virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent) + virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) { // FIX: when someone gets kicked from a channel we must remove their Extensibles! user->Shrink("cm_founder_"+std::string(chan->name)); user->Shrink("cm_protect_"+std::string(chan->name)); } - virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partreason, bool &silent) + virtual void OnUserPart(User* user, Channel* channel, const std::string &partreason, bool &silent) { // FIX: when someone parts a channel we must remove their Extensibles! user->Shrink("cm_founder_"+std::string(channel->name)); user->Shrink("cm_protect_"+std::string(channel->name)); } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { /* Create a configreader class and read our flag, * in old versions this was heap-allocated and the @@ -367,7 +367,7 @@ class ModuleChanProtect : public Module } } - virtual int OnUserPreJoin(userrec *user, chanrec *chan, const char *cname, std::string &privs) + virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs) { // if the user is the first user into the channel, mark them as the founder, but only if // the config option for it is set @@ -378,7 +378,7 @@ class ModuleChanProtect : public Module return 0; } - virtual void OnPostJoin(userrec *user, chanrec *channel) + virtual void OnPostJoin(User *user, Channel *channel) { // This *must* be in PostJoin, not UserJoin - the former will make it appear to happen // before the client is in the channel @@ -392,7 +392,7 @@ class ModuleChanProtect : public Module user->WriteServ("MODE %s +q %s", channel->name, user->nick); } - virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) + virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type) { // here we perform access checks, this is the important bit that actually stops kicking/deopping // etc of protected users. There are many types of access check, we're going to handle @@ -488,7 +488,7 @@ class ModuleChanProtect : public Module return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque) + virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque) { /* NOTE: If +qa prefix is on, this is propagated by the channel join, * so we dont need to propagate it manually diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 7a48a3d45..24024e2f9 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -27,10 +27,10 @@ class cmd_check : public Command syntax = "|||"; } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const char** parameters, int pcnt, User *user) { - userrec *targuser; - chanrec *targchan; + User *targuser; + Channel *targchan; std::string checkstr; std::string chliststr; diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp index db8094aa2..4b53e7c12 100644 --- a/src/modules/m_chghost.cpp +++ b/src/modules/m_chghost.cpp @@ -29,7 +29,7 @@ class cmd_chghost : public Command TRANSLATE3(TR_NICK, TR_TEXT, TR_END); } - CmdResult Handle(const char** parameters, int pcnt, userrec *user) + CmdResult Handle(const char** parameters, int pcnt, User *user) { const char * x = parameters[1]; @@ -52,7 +52,7 @@ class cmd_chghost : public Command user->WriteServ("NOTICE %s :*** CHGHOST: Host too long", user->nick); return CMD_FAILURE; } - userrec* dest = ServerInstance->FindNick(parameters[0]); + User* dest = ServerInstance->FindNick(parameters[0]); if (!dest) { @@ -91,7 +91,7 @@ class ModuleChgHost : public Module List[I_OnRehash] = 1; } - void OnRehash(userrec* user, const std::string ¶meter) + void OnRehash(User* user, const std::string ¶meter) { ConfigReader Conf(ServerInstance); std::string hmap = Conf.ReadValue("hostname", "charmap", 0); diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp index 0561c5156..7ae98b37d 100644 --- a/src/modules/m_chgident.cpp +++ b/src/modules/m_chgident.cpp @@ -27,9 +27,9 @@ class cmd_chgident : public Command TRANSLATE3(TR_NICK, TR_TEXT, TR_END); } - CmdResult Handle(const char** parameters, int pcnt, userrec *user) + CmdResult Handle(const char** parameters, int pcnt, User *user) { - userrec* dest = ServerInstance->FindNick(parameters[0]); + User* dest = ServerInstance->FindNick(parameters[0]); if (!dest) { diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp index 31467459c..987678b5b 100644 --- a/src/modules/m_chgname.cpp +++ b/src/modules/m_chgname.cpp @@ -27,9 +27,9 @@ class cmd_chgname : public Command TRANSLATE3(TR_NICK, TR_TEXT, TR_END); } - CmdResult Handle(const char** parameters, int pcnt, userrec *user) + CmdResult Handle(const char** parameters, int pcnt, User *user) { - userrec* dest = ServerInstance->FindNick(parameters[0]); + User* dest = ServerInstance->FindNick(parameters[0]); if (!dest) { diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp index d10f02ce4..86f120d20 100644 --- a/src/modules/m_cloaking.cpp +++ b/src/modules/m_cloaking.cpp @@ -67,7 +67,7 @@ class CloakUser : public ModeHandler { } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (source != dest) return MODEACTION_DENY; @@ -347,7 +347,7 @@ class ModuleCloaking : public Module return Version(1,1,0,2,VF_COMMON|VF_VENDOR,API_VERSION); } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { cu->DoRehash(); } diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp index a8644f6ed..82fdf535f 100644 --- a/src/modules/m_clones.cpp +++ b/src/modules/m_clones.cpp @@ -36,7 +36,7 @@ class cmd_clones : public Command return ""; } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const char** parameters, int pcnt, User *user) { std::string clonesstr = "304 " + std::string(user->nick) + " :CLONES"; diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp index da52dd7d9..4b91ca789 100644 --- a/src/modules/m_close.cpp +++ b/src/modules/m_close.cpp @@ -24,15 +24,15 @@ class cmd_close : public Command this->source = "m_close.so"; } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const char** parameters, int pcnt, User *user) { std::map closed; - for (std::vector::iterator u = ServerInstance->local_users.begin(); u != ServerInstance->local_users.end(); u++) + for (std::vector::iterator u = ServerInstance->local_users.begin(); u != ServerInstance->local_users.end(); u++) { if ((*u)->registered != REG_ALL) { - userrec::QuitUser(ServerInstance, *u, "Closing all unknown connections per request"); + User::QuitUser(ServerInstance, *u, "Closing all unknown connections per request"); std::string key = ConvToStr((*u)->GetIPString())+"."+ConvToStr((*u)->GetPort()); closed[key]++; } diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp index e9af24ad0..4cc11b725 100644 --- a/src/modules/m_commonchans.cpp +++ b/src/modules/m_commonchans.cpp @@ -22,7 +22,7 @@ class PrivacyMode : public ModeHandler public: PrivacyMode(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_USER, false) { } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (adding) { @@ -72,11 +72,11 @@ class ModulePrivacyMode : public Module return Version(1,1,0,0, VF_COMMON|VF_VENDOR, API_VERSION); } - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { if (target_type == TYPE_USER) { - userrec* t = (userrec*)dest; + User* t = (User*)dest; if (!IS_OPER(user) && (t->IsModeSet('c')) && (!ServerInstance->ULine(user->server)) && !user->SharesChannelWith(t)) { user->WriteServ("531 %s %s :You are not permitted to send private messages to this user (+c set)", user->nick, t->nick); @@ -86,7 +86,7 @@ class ModulePrivacyMode : public Module return 0; } - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { return OnUserPreMessage(user, dest, target_type, text, status, exempt_list); } diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp index d65fdf7e0..5abee8303 100644 --- a/src/modules/m_conn_join.cpp +++ b/src/modules/m_conn_join.cpp @@ -58,7 +58,7 @@ class ModuleConnJoin : public Module List[I_OnPostConnect] = List[I_OnRehash] = 1; } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ConfigReader* conf = new ConfigReader(ServerInstance); JoinChan = conf->ReadValue("autojoin", "channel", 0); @@ -77,14 +77,14 @@ class ModuleConnJoin : public Module return Version(1,1,0,1,VF_VENDOR,API_VERSION); } - virtual void OnPostConnect(userrec* user) + virtual void OnPostConnect(User* user) { if (!IS_LOCAL(user)) return; for(std::vector::iterator it = Joinchans.begin(); it != Joinchans.end(); it++) if (ServerInstance->IsChannel(it->c_str())) - chanrec::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true)); + Channel::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true)); } }; diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp index 23b5d8280..34e1fd34d 100644 --- a/src/modules/m_conn_umodes.cpp +++ b/src/modules/m_conn_umodes.cpp @@ -35,7 +35,7 @@ class ModuleModesOnConnect : public Module List[I_OnPostConnect] = List[I_OnRehash] = 1; } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { DELETE(Conf); Conf = new ConfigReader(ServerInstance); @@ -51,7 +51,7 @@ class ModuleModesOnConnect : public Module return Version(1,1,0,1,VF_VENDOR,API_VERSION); } - virtual void OnPostConnect(userrec* user) + virtual void OnPostConnect(User* user) { if (!IS_LOCAL(user)) return; diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp index 11e55cf68..4ab3ed793 100644 --- a/src/modules/m_conn_waitpong.cpp +++ b/src/modules/m_conn_waitpong.cpp @@ -28,7 +28,7 @@ class ModuleWaitPong : public Module OnRehash(NULL,""); } - virtual void OnRehash(userrec* user, const std::string ¶m) + virtual void OnRehash(User* user, const std::string ¶m) { ConfigReader Conf(ServerInstance); @@ -58,7 +58,7 @@ class ModuleWaitPong : public Module return (char*)out; } - virtual int OnUserRegister(userrec* user) + virtual int OnUserRegister(User* user) { char* pingrpl = RandString(10); @@ -71,7 +71,7 @@ class ModuleWaitPong : public Module return 0; } - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec* user, bool validated, const std::string &original_line) + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User* user, bool validated, const std::string &original_line) { if (command == "PONG") { @@ -89,7 +89,7 @@ class ModuleWaitPong : public Module else { if(killonbadreply) - userrec::QuitUser(ServerInstance, user, "Incorrect ping reply for registration"); + User::QuitUser(ServerInstance, user, "Incorrect ping reply for registration"); return 1; } } @@ -97,13 +97,13 @@ class ModuleWaitPong : public Module return 0; } - virtual bool OnCheckReady(userrec* user) + virtual bool OnCheckReady(User* user) { char* pingrpl; return (!user->GetExt(extenstr, pingrpl)); } - virtual void OnUserDisconnect(userrec* user) + virtual void OnUserDisconnect(User* user) { char* pingrpl; user->GetExt(extenstr, pingrpl); @@ -119,7 +119,7 @@ class ModuleWaitPong : public Module { if (target_type == TYPE_USER) { - userrec* user = (userrec*)item; + User* user = (User*)item; char* pingrpl; user->GetExt(extenstr, pingrpl); diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp index e3fea0521..d6d9eee0f 100644 --- a/src/modules/m_connflood.cpp +++ b/src/modules/m_connflood.cpp @@ -64,7 +64,7 @@ public: first = ServerInstance->Time(); } - virtual int OnUserRegister(userrec* user) + virtual int OnUserRegister(User* user) { time_t next = ServerInstance->Time(); @@ -86,7 +86,7 @@ public: ServerInstance->WriteOpers("*** Connection throttle deactivated"); return 0; } - userrec::QuitUser(ServerInstance, user, quitmsg); + User::QuitUser(ServerInstance, user, quitmsg); return 1; } @@ -96,7 +96,7 @@ public: { throttled = 1; ServerInstance->WriteOpers("*** Connection throttle activated"); - userrec::QuitUser(ServerInstance, user, quitmsg); + User::QuitUser(ServerInstance, user, quitmsg); return 1; } } @@ -108,7 +108,7 @@ public: return 0; } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { InitConf(); } diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp index ca277c3ae..bd165034f 100644 --- a/src/modules/m_customtitle.cpp +++ b/src/modules/m_customtitle.cpp @@ -43,7 +43,7 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist) return false; } - CmdResult Handle(const char** parameters, int pcnt, userrec* user) + CmdResult Handle(const char** parameters, int pcnt, User* user) { if (!IS_LOCAL(user)) return CMD_LOCALONLY; @@ -126,7 +126,7 @@ class ModuleCustomTitle : public Module } // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games. - int OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text) + int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) { /* We use this and not OnWhois because this triggers for remote, too */ if (numeric == 312) @@ -144,11 +144,11 @@ class ModuleCustomTitle : public Module } // Whenever the linking module wants to send out data, but doesnt know what the data - // represents (e.g. it is metadata, added to a userrec or chanrec by a module) then + // represents (e.g. it is metadata, added to a User or Channel by a module) then // this method is called. We should use the ProtoSendMetaData function after we've // corrected decided how the data should look, to send the metadata on its way if // it is ours. - virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable) + virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable) { // check if the linking module wants to know about OUR metadata if (extname == "ctitle") @@ -166,7 +166,7 @@ class ModuleCustomTitle : public Module } // when a user quits, tidy up their metadata - virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message) + virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message) { std::string* ctitle; user->GetExt("ctitle", ctitle); @@ -182,7 +182,7 @@ class ModuleCustomTitle : public Module { if (target_type == TYPE_USER) { - userrec* user = (userrec*)item; + User* user = (User*)item; std::string* ctitle; user->GetExt("ctitle", ctitle); if (ctitle) @@ -205,7 +205,7 @@ class ModuleCustomTitle : public Module // check if its our metadata key, and its associated with a user if ((target_type == TYPE_USER) && (extname == "ctitle")) { - userrec* dest = (userrec*)target; + User* dest = (User*)target; // if they dont already have an ctitle field, accept the remote server's std::string* text; if (!dest->GetExt("ctitle", text)) diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp index 06361c692..554bcd17d 100644 --- a/src/modules/m_cycle.cpp +++ b/src/modules/m_cycle.cpp @@ -27,9 +27,9 @@ class cmd_cycle : public Command TRANSLATE3(TR_TEXT, TR_TEXT, TR_END); } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const char** parameters, int pcnt, User *user) { - chanrec* channel = ServerInstance->FindChan(parameters[0]); + Channel* channel = ServerInstance->FindChan(parameters[0]); std::string reason = ConvToStr("Cycling"); if (pcnt > 1) @@ -58,11 +58,11 @@ class cmd_cycle : public Command return CMD_FAILURE; } - /* XXX in the future, this may move to a static chanrec method (the delete.) -- w00t */ + /* XXX in the future, this may move to a static Channel method (the delete.) -- w00t */ if (!channel->PartUser(user, reason.c_str())) delete channel; - chanrec::JoinUser(ServerInstance, user, parameters[0], true, "", ServerInstance->Time(true)); + Channel::JoinUser(ServerInstance, user, parameters[0], true, "", ServerInstance->Time(true)); } return CMD_LOCALONLY; diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp index 7ddce8ab0..ebd3b8630 100644 --- a/src/modules/m_dccallow.cpp +++ b/src/modules/m_dccallow.cpp @@ -37,7 +37,7 @@ class DCCAllow DCCAllow(const std::string &nick, const std::string &hm, const time_t so, const long ln) : nickname(nick), hostmask(hm), set_on(so), length(ln) { } }; -typedef std::vector userlist; +typedef std::vector userlist; userlist ul; typedef std::vector dccallowlist; dccallowlist* dl; @@ -54,7 +54,7 @@ class cmd_dccallow : public Command /* XXX we need to fix this so it can work with translation stuff (i.e. move +- into a seperate param */ } - CmdResult Handle(const char **parameters, int pcnt, userrec *user) + CmdResult Handle(const char **parameters, int pcnt, User *user) { /* syntax: DCCALLOW [+|-] (