X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=22ec6e4d9f394015c78c9fc2f02d41b31109be35;hb=1312f2db8ed90464e73acdcc07bb1aae92964345;hp=15c2c56b16ad4f7ac306e09d5da752a2347a9e30;hpb=86775e2e98f55b3b88befe2daff0ca23f02f3155;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/channels.cpp b/src/channels.cpp index 15c2c56b1..22ec6e4d9 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -17,10 +17,10 @@ #include #include "mode.h" -Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts) : ServerInstance(Instance) +Channel::Channel(const std::string &cname, time_t ts) { chan_hash::iterator findchan = ServerInstance->chanlist->find(cname); - if (findchan != Instance->chanlist->end()) + if (findchan != ServerInstance->chanlist->end()) throw CoreException("Cannot create duplicate channel " + cname); (*(ServerInstance->chanlist))[cname.c_str()] = this; @@ -53,11 +53,6 @@ void Channel::SetModeParam(char mode, std::string parameter) } } -bool Channel::IsModeSet(char mode) -{ - return modes[mode-65]; -} - std::string Channel::GetModeParameter(char mode) { CustomModeList::iterator n = custom_mode_params.find(mode); @@ -68,14 +63,14 @@ std::string Channel::GetModeParameter(char mode) int Channel::SetTopic(User *u, std::string &ntopic, bool forceset) { - if (u && IS_LOCAL(u)) + if (u) { if(!forceset) { ModResult res; /* 0: check status, 1: don't, -1: disallow change silently */ - FIRST_MOD_RESULT(ServerInstance, OnLocalTopicChange, res, (u,this,ntopic)); + FIRST_MOD_RESULT(OnPreTopicChange, res, (u,this,ntopic)); if (res == MOD_RES_DENY) return CMD_FAILURE; @@ -86,7 +81,7 @@ int Channel::SetTopic(User *u, std::string &ntopic, bool forceset) u->WriteNumeric(442, "%s %s :You're not on that channel!",u->nick.c_str(), this->name.c_str()); return CMD_FAILURE; } - if ((this->IsModeSet('t')) && (this->GetStatus(u) < STATUS_HOP)) + if ((this->IsModeSet('t')) && (this->GetPrefixValue(u) < HALFOP_VALUE)) { u->WriteNumeric(482, "%s %s :You must be at least a half-operator to change the topic on this channel", u->nick.c_str(), this->name.c_str()); return CMD_FAILURE; @@ -109,9 +104,10 @@ int Channel::SetTopic(User *u, std::string &ntopic, bool forceset) this->topicset = ServerInstance->Time(); - if (u && IS_LOCAL(u)) + // XXX: this check for 'u' is probably pre-fake-user, and it fucking sucks anyway. we need to change this. + if (u) { - FOREACH_MOD(I_OnPostLocalTopicChange,OnPostLocalTopicChange(u, this, this->topic)); + FOREACH_MOD(I_OnPostTopicChange,OnPostTopicChange(u, this, this->topic)); } return CMD_SUCCESS; @@ -119,103 +115,51 @@ int Channel::SetTopic(User *u, std::string &ntopic, bool forceset) long Channel::GetUserCounter() { - return (this->internal_userlist.size()); + return userlist.size(); } -void Channel::AddUser(User* user) +Membership* Channel::AddUser(User* user) { - internal_userlist[user] = user->nick; + Membership* memb = new Membership(user, this); + userlist[user] = memb; + return memb; } unsigned long Channel::DelUser(User* user) { - CUListIter a = internal_userlist.find(user); + UserMembIter a = userlist.find(user); - if (a != internal_userlist.end()) + if (a != userlist.end()) { - internal_userlist.erase(a); - /* And tidy any others... */ - DelOppedUser(user); - DelHalfoppedUser(user); - DelVoicedUser(user); + delete a->second; + userlist.erase(a); } - return internal_userlist.size(); + return userlist.size(); } bool Channel::HasUser(User* user) { - return (internal_userlist.find(user) != internal_userlist.end()); -} - -void Channel::AddOppedUser(User* user) -{ - internal_op_userlist[user] = user->nick; -} - -void Channel::DelOppedUser(User* user) -{ - CUListIter a = internal_op_userlist.find(user); - if (a != internal_op_userlist.end()) - { - internal_op_userlist.erase(a); - return; - } -} - -void Channel::AddHalfoppedUser(User* user) -{ - internal_halfop_userlist[user] = user->nick; -} - -void Channel::DelHalfoppedUser(User* user) -{ - CUListIter a = internal_halfop_userlist.find(user); - - if (a != internal_halfop_userlist.end()) - { - internal_halfop_userlist.erase(a); - } -} - -void Channel::AddVoicedUser(User* user) -{ - internal_voice_userlist[user] = user->nick; -} - -void Channel::DelVoicedUser(User* user) -{ - CUListIter a = internal_voice_userlist.find(user); - - if (a != internal_voice_userlist.end()) - { - internal_voice_userlist.erase(a); - } -} - -CUList* Channel::GetUsers() -{ - return &internal_userlist; + return (userlist.find(user) != userlist.end()); } -CUList* Channel::GetOppedUsers() +Membership* Channel::GetUser(User* user) { - return &internal_op_userlist; -} - -CUList* Channel::GetHalfoppedUsers() -{ - return &internal_halfop_userlist; + UserMembIter i = userlist.find(user); + if (i == userlist.end()) + return NULL; + return i->second; } -CUList* Channel::GetVoicedUsers() +const UserMembList* Channel::GetUsers() { - return &internal_voice_userlist; + return &userlist; } void Channel::SetDefaultModes() { - ServerInstance->Logs->Log("CHANNELS", DEBUG, "SetDefaultModes %s", ServerInstance->Config->DefaultModes); + ServerInstance->Logs->Log("CHANNELS", DEBUG, "SetDefaultModes %s", + ServerInstance->Config->DefaultModes.c_str()); irc::spacesepstream list(ServerInstance->Config->DefaultModes); std::string modeseq; std::string parameter; @@ -241,7 +185,7 @@ void Channel::SetDefaultModes() * add a channel to a user, creating the record for it if needed and linking * it to the user record */ -Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool override, const char* key, bool bursting, time_t TS) +Channel* Channel::JoinUser(User *user, const char* cn, bool override, const char* key, bool bursting, time_t TS) { // Fix: unregistered users could be joined using /SAJOIN if (!user || !cn || user->registered != REG_ALL) @@ -264,7 +208,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool { if (user->HasPrivPermission("channels/high-join-limit")) { - if (user->chans.size() >= Instance->Config->OperMaxChans) + if (user->chans.size() >= ServerInstance->Config->OperMaxChans) { user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn); return NULL; @@ -281,8 +225,8 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool } } - strlcpy(cname, cn, Instance->Config->Limits.ChanMax); - Ptr = Instance->FindChan(cname); + strlcpy(cname, cn, ServerInstance->Config->Limits.ChanMax); + Ptr = ServerInstance->FindChan(cname); bool created_by_local = false; if (!Ptr) @@ -293,23 +237,23 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool if (!IS_LOCAL(user)) { if (!TS) - Instance->Logs->Log("CHANNEL",DEBUG,"*** BUG *** Channel::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick.c_str(), cn); + ServerInstance->Logs->Log("CHANNEL",DEBUG,"*** BUG *** Channel::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick.c_str(), cn); } else { - privs = "@"; + privs = "o"; created_by_local = true; } if (IS_LOCAL(user) && override == false) { ModResult MOD_RESULT; - FIRST_MOD_RESULT(Instance, OnUserPreJoin, MOD_RESULT, (user, NULL, cname, privs, key ? key : "")); + FIRST_MOD_RESULT(OnUserPreJoin, MOD_RESULT, (user, NULL, cname, privs, key ? key : "")); if (MOD_RESULT == MOD_RES_DENY) return NULL; } - Ptr = new Channel(Instance, cname, TS); + Ptr = new Channel(cname, TS); } else { @@ -324,7 +268,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool if (IS_LOCAL(user) && override == false) { ModResult MOD_RESULT; - FIRST_MOD_RESULT(Instance, OnUserPreJoin, MOD_RESULT, (user, Ptr, cname, privs, key ? key : "")); + FIRST_MOD_RESULT(OnUserPreJoin, MOD_RESULT, (user, Ptr, cname, privs, key ? key : "")); if (MOD_RESULT == MOD_RES_DENY) { return NULL; @@ -333,11 +277,11 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool { std::string ckey = Ptr->GetModeParameter('k'); bool invited = user->IsInvited(Ptr->name.c_str()); - bool can_bypass = Instance->Config->InvBypassModes && invited; + bool can_bypass = ServerInstance->Config->InvBypassModes && invited; if (!ckey.empty()) { - FIRST_MOD_RESULT(Instance, OnCheckKey, MOD_RESULT, (user, Ptr, key ? key : "")); + FIRST_MOD_RESULT(OnCheckKey, MOD_RESULT, (user, Ptr, key ? key : "")); if (!MOD_RESULT.check((key && ckey == key) || can_bypass)) { // If no key provided, or key is not the right one, and can't bypass +k (not invited or option not enabled) @@ -348,7 +292,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool if (Ptr->IsModeSet('i')) { - FIRST_MOD_RESULT(Instance, OnCheckInvite, MOD_RESULT, (user, Ptr)); + FIRST_MOD_RESULT(OnCheckInvite, MOD_RESULT, (user, Ptr)); if (!MOD_RESULT.check(invited)) { user->WriteNumeric(ERR_INVITEONLYCHAN, "%s %s :Cannot join channel (Invite only)",user->nick.c_str(), Ptr->name.c_str()); @@ -359,7 +303,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool std::string limit = Ptr->GetModeParameter('l'); if (!limit.empty()) { - FIRST_MOD_RESULT(Instance, OnCheckLimit, MOD_RESULT, (user, Ptr)); + FIRST_MOD_RESULT(OnCheckLimit, MOD_RESULT, (user, Ptr)); if (!MOD_RESULT.check((Ptr->GetUserCounter() < atol(limit.c_str()) || can_bypass))) { user->WriteNumeric(ERR_CHANNELISFULL, "%s %s :Cannot join channel (Channel is full)",user->nick.c_str(), Ptr->name.c_str()); @@ -391,56 +335,35 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool Ptr->SetDefaultModes(); } - return Channel::ForceChan(Instance, Ptr, user, privs, bursting, created_by_local); + return Channel::ForceChan(Ptr, user, privs, bursting, created_by_local); } -Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting, bool created) +Channel* Channel::ForceChan(Channel* Ptr, User* user, const std::string &privs, bool bursting, bool created) { std::string nick = user->nick; - bool silent = false; - - Ptr->AddUser(user); - /* Just in case they have no permissions */ - user->chans[Ptr] = 0; + Membership* memb = Ptr->AddUser(user); + user->chans.insert(Ptr); for (std::string::const_iterator x = privs.begin(); x != privs.end(); x++) { const char status = *x; - ModeHandler* mh = Instance->Modes->FindPrefix(status); + ModeHandler* mh = ServerInstance->Modes->FindMode(status, MODETYPE_CHANNEL); if (mh) { /* Set, and make sure that the mode handler knows this mode was now set */ - Ptr->SetPrefix(user, status, mh->GetPrefixRank(), true); - mh->OnModeChange(Instance->FakeClient, Instance->FakeClient, Ptr, nick, true); - - switch (mh->GetPrefix()) - { - /* These logic ops are SAFE IN THIS CASE because if the entry doesnt exist, - * addressing operator[] creates it. If they do exist, it points to it. - * At all other times where we dont want to create an item if it doesnt exist, we - * must stick to ::find(). - */ - case '@': - user->chans[Ptr] |= UCMODE_OP; - break; - case '%': - user->chans[Ptr] |= UCMODE_HOP; - break; - case '+': - user->chans[Ptr] |= UCMODE_VOICE; - break; - } + Ptr->SetPrefix(user, mh->GetModeChar(), true); + mh->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, Ptr, nick, true); } } - FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user, Ptr, bursting, silent, created)); + CUList except_list; + FOREACH_MOD(I_OnUserJoin,OnUserJoin(memb, bursting, created, except_list)); - if (!silent) - Ptr->WriteChannel(user,"JOIN :%s",Ptr->name.c_str()); + Ptr->WriteAllExcept(user, false, 0, except_list, "JOIN :%s", Ptr->name.c_str()); /* Theyre not the first ones in here, make sure everyone else sees the modes we gave the user */ - std::string ms = Instance->Modes->ModeString(user, Ptr); + std::string ms = ServerInstance->Modes->ModeString(user, Ptr); if ((Ptr->GetUserCounter() > 1) && (ms.length())) Ptr->WriteAllExceptSender(user, true, 0, "MODE %s +%s", Ptr->name.c_str(), ms.c_str()); @@ -454,83 +377,71 @@ Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const } Ptr->UserList(user); } - FOREACH_MOD_I(Instance,I_OnPostJoin,OnPostJoin(user, Ptr)); + FOREACH_MOD(I_OnPostJoin,OnPostJoin(memb)); return Ptr; } bool Channel::IsBanned(User* user) { ModResult result; - DO_EACH_HOOK(ServerInstance, OnCheckBan, ModResult modresult, (user, this)) - { - result = result + modresult; - } - WHILE_EACH_HOOK(ServerInstance, OnCheckBan); + FIRST_MOD_RESULT(OnCheckChannelBan, result, (user, this)); if (result != MOD_RES_PASSTHRU) return (result == MOD_RES_DENY); - char mask[MAXBUF]; - snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString()); for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++) { - if ((InspIRCd::Match(user->GetFullHost(),i->data, NULL)) || // host - (InspIRCd::Match(user->GetFullRealHost(),i->data, NULL)) || // uncloaked host - (InspIRCd::MatchCIDR(mask, i->data, NULL))) // ip - { + if (CheckBan(user, i->data)) return true; - } } return false; } -ModResult Channel::GetExtBanStatus(const std::string &str, char type) +bool Channel::CheckBan(User* user, const std::string& mask) { ModResult result; - DO_EACH_HOOK(ServerInstance, OnCheckStringExtBan, ModResult modresult, (str, this, type)) - { - result = result + modresult; - } - WHILE_EACH_HOOK(ServerInstance, OnCheckStringExtBan); - + FIRST_MOD_RESULT(OnCheckBan, result, (user, this, mask)); if (result != MOD_RES_PASSTHRU) - return result; + return (result == MOD_RES_DENY); - // nobody decided for us, check the ban list - for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++) - { - if (i->data[0] != type || i->data[1] != ':') - continue; + // extbans were handled above, if this is one it obviously didn't match + if (mask[1] == ':') + return false; - std::string maskptr = i->data.substr(2); - ServerInstance->Logs->Log("EXTBANS", DEBUG, "Checking %s against %s, type is %c", str.c_str(), maskptr.c_str(), type); + std::string::size_type at = mask.find('@'); + if (at == std::string::npos) + return false; - if (InspIRCd::Match(str, maskptr, NULL)) - return MOD_RES_DENY; + char tomatch[MAXBUF]; + snprintf(tomatch, MAXBUF, "%s!%s", user->nick.c_str(), user->ident.c_str()); + std::string prefix = mask.substr(0, at); + if (InspIRCd::Match(tomatch, prefix, NULL)) + { + std::string suffix = mask.substr(at + 1); + if (InspIRCd::Match(user->host, suffix, NULL) || + InspIRCd::Match(user->dhost, suffix, NULL) || + InspIRCd::MatchCIDR(user->GetIPString(), suffix, NULL)) + return true; } - - return MOD_RES_PASSTHRU; + return false; } ModResult Channel::GetExtBanStatus(User *user, char type) { ModResult rv; - DO_EACH_HOOK(ServerInstance, OnCheckExtBan, ModResult modresult, (user, this, type)) - { - rv = rv + modresult; - } - WHILE_EACH_HOOK(ServerInstance, OnCheckExtBan); - + FIRST_MOD_RESULT(OnExtBanCheck, rv, (user, this, type)); if (rv != MOD_RES_PASSTHRU) return rv; - - char mask[MAXBUF]; - snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString()); - - rv = rv + this->GetExtBanStatus(mask, type); - rv = rv + this->GetExtBanStatus(user->GetFullHost(), type); - rv = rv + this->GetExtBanStatus(user->GetFullRealHost(), type); - return rv; + for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++) + { + if (i->data[0] == type && i->data[1] == ':') + { + std::string val = i->data.substr(2); + if (CheckBan(user, val)) + return MOD_RES_DENY; + } + } + return MOD_RES_PASSTHRU; } /* Channel::PartUser @@ -539,20 +450,19 @@ ModResult Channel::GetExtBanStatus(User *user, char type) */ long Channel::PartUser(User *user, std::string &reason) { - bool silent = false; - if (!user) return this->GetUserCounter(); - UCListIter i = user->chans.find(this); - if (i != user->chans.end()) + Membership* memb = GetUser(user); + + if (memb) { - FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason, silent)); + CUList except_list; + FOREACH_MOD(I_OnUserPart,OnUserPart(memb, reason, except_list)); - if (!silent) - this->WriteChannel(user, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : " :", reason.c_str()); + WriteAllExcept(user, false, 0, except_list, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : " :", reason.c_str()); - user->chans.erase(i); + user->chans.erase(this); this->RemoveAllPrefixes(user); } @@ -563,7 +473,7 @@ long Channel::PartUser(User *user, std::string &reason) if (iter != ServerInstance->chanlist->end()) { ModResult res; - FIRST_MOD_RESULT(ServerInstance, OnChannelPreDelete, res, (this)); + FIRST_MOD_RESULT(OnChannelPreDelete, res, (this)); if (res == MOD_RES_DENY) return 1; // delete halted by module FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this)); @@ -575,25 +485,25 @@ long Channel::PartUser(User *user, std::string &reason) return this->GetUserCounter(); } -long Channel::ServerKickUser(User* user, const char* reason, const char* servername) +long Channel::ServerKickUser(User* user, const char* reason, const std::string& servername) { - if (servername == NULL || *ServerInstance->Config->HideWhoisServer) - servername = ServerInstance->Config->ServerName; + if (servername.empty() || !ServerInstance->Config->HideWhoisServer.empty()) + ServerInstance->FakeClient->server = ServerInstance->Config->ServerName; + else + ServerInstance->FakeClient->server = servername; - ServerInstance->FakeClient->server = servername; return this->KickUser(ServerInstance->FakeClient, user, reason); } long Channel::KickUser(User *src, User *user, const char* reason) { - bool silent = false; - if (!src || !user || !reason) return this->GetUserCounter(); + Membership* memb = GetUser(user); if (IS_LOCAL(src)) { - if (!this->HasUser(user)) + if (!memb) { src->WriteNumeric(ERR_USERNOTINCHANNEL, "%s %s %s :They are not on that channel",src->nick.c_str(), user->nick.c_str(), this->name.c_str()); return this->GetUserCounter(); @@ -607,36 +517,32 @@ long Channel::KickUser(User *src, User *user, const char* reason) ModResult res; if (ServerInstance->ULine(src->server)) res = MOD_RES_ALLOW; - if (res == MOD_RES_PASSTHRU) - FIRST_MOD_RESULT(ServerInstance, OnUserPreKick, res, (src,user,this,reason)); - if (res == MOD_RES_PASSTHRU) - FIRST_MOD_RESULT(ServerInstance, OnAccessCheck, res, (src,user,this,AC_KICK)); + else + FIRST_MOD_RESULT(OnUserPreKick, res, (src,memb,reason)); if (res == MOD_RES_DENY) return this->GetUserCounter(); if (res == MOD_RES_PASSTHRU) { - int them = this->GetStatus(src); - int us = this->GetStatus(user); - if ((them < STATUS_HOP) || (them < us)) + int them = this->GetPrefixValue(src); + int us = this->GetPrefixValue(user); + if ((them < HALFOP_VALUE) || (them < us)) { - src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator",src->nick.c_str(), this->name.c_str(), them == STATUS_HOP ? "" : "half-"); + src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator",src->nick.c_str(), this->name.c_str(), them >= HALFOP_VALUE ? "" : "half-"); return this->GetUserCounter(); } } } - FOREACH_MOD(I_OnUserKick,OnUserKick(src, user, this, reason, silent)); - - UCListIter i = user->chans.find(this); - if (i != user->chans.end()) + if (memb) { - /* zap it from the channel list of the user */ - if (!silent) - this->WriteChannel(src, "KICK %s %s :%s", this->name.c_str(), user->nick.c_str(), reason); + CUList except_list; + FOREACH_MOD(I_OnUserKick,OnUserKick(src, memb, reason, except_list)); + + WriteAllExcept(src, false, 0, except_list, "KICK %s %s :%s", name.c_str(), user->nick.c_str(), reason); - user->chans.erase(i); + user->chans.erase(this); this->RemoveAllPrefixes(user); } @@ -649,7 +555,7 @@ long Channel::KickUser(User *src, User *user, const char* reason) if (iter != ServerInstance->chanlist->end()) { ModResult res; - FIRST_MOD_RESULT(ServerInstance, OnChannelPreDelete, res, (this)); + FIRST_MOD_RESULT(OnChannelPreDelete, res, (this)); if (res == MOD_RES_DENY) return 1; // delete halted by module FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this)); @@ -678,7 +584,6 @@ void Channel::WriteChannel(User* user, const char* text, ...) void Channel::WriteChannel(User* user, const std::string &text) { - CUList *ulist = this->GetUsers(); char tb[MAXBUF]; if (!user) @@ -687,14 +592,14 @@ void Channel::WriteChannel(User* user, const std::string &text) snprintf(tb,MAXBUF,":%s %s", user->GetFullHost().c_str(), text.c_str()); std::string out = tb; - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + for (UserMembIter i = userlist.begin(); i != userlist.end(); i++) { if (IS_LOCAL(i->first)) i->first->Write(out); } } -void Channel::WriteChannelWithServ(const char* ServName, const char* text, ...) +void Channel::WriteChannelWithServ(const std::string& ServName, const char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -709,15 +614,14 @@ void Channel::WriteChannelWithServ(const char* ServName, const char* text, ...) this->WriteChannelWithServ(ServName, std::string(textbuffer)); } -void Channel::WriteChannelWithServ(const char* ServName, const std::string &text) +void Channel::WriteChannelWithServ(const std::string& ServName, const std::string &text) { - CUList *ulist = this->GetUsers(); char tb[MAXBUF]; - snprintf(tb,MAXBUF,":%s %s", ServName ? ServName : ServerInstance->Config->ServerName, text.c_str()); + snprintf(tb,MAXBUF,":%s %s", ServName.empty() ? ServerInstance->Config->ServerName.c_str() : ServName.c_str(), text.c_str()); std::string out = tb; - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + for (UserMembIter i = userlist.begin(); i != userlist.end(); i++) { if (IS_LOCAL(i->first)) i->first->Write(out); @@ -762,7 +666,7 @@ void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList { char tb[MAXBUF]; - snprintf(tb,MAXBUF,":%s %s", serversource ? ServerInstance->Config->ServerName : user->GetFullHost().c_str(), text.c_str()); + snprintf(tb,MAXBUF,":%s %s", serversource ? ServerInstance->Config->ServerName.c_str() : user->GetFullHost().c_str(), text.c_str()); std::string out = tb; this->RawWriteAllExcept(user, serversource, status, except_list, std::string(tb)); @@ -770,13 +674,19 @@ void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList void Channel::RawWriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const std::string &out) { - CUList *ulist = this->GetUsers(); - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + char statmode = 0; + if (status) + { + ModeHandler* mh = ServerInstance->Modes->FindPrefix(status); + if (mh) + statmode = mh->GetModeChar(); + } + for (UserMembIter i = userlist.begin(); i != userlist.end(); i++) { if ((IS_LOCAL(i->first)) && (except_list.find(i->first) == except_list.end())) { /* User doesnt have the status we're after */ - if (status && !strchr(this->GetAllPrefixChars(i->first), status)) + if (statmode && !i->second->hasMode(statmode)) continue; i->first->Write(out); @@ -787,7 +697,7 @@ void Channel::RawWriteAllExcept(User* user, bool serversource, char status, CULi void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const std::string& text) { CUList except_list; - except_list[user] = user->nick; + except_list.insert(user); this->WriteAllExcept(user, serversource, status, except_list, std::string(text)); } @@ -798,8 +708,7 @@ void Channel::WriteAllExceptSender(User* user, bool serversource, char status, c int Channel::CountInvisible() { int count = 0; - CUList *ulist= this->GetUsers(); - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + for (UserMembIter i = userlist.begin(); i != userlist.end(); i++) { if (!(i->first->IsModeSet('i'))) count++; @@ -867,7 +776,7 @@ char* Channel::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 Channel::UserList(User *user, CUList *ulist) +void Channel::UserList(User *user) { char list[MAXBUF]; size_t dlen, curlen; @@ -876,7 +785,7 @@ void Channel::UserList(User *user, CUList *ulist) if (!IS_LOCAL(user)) return; - FIRST_MOD_RESULT(ServerInstance, OnUserList, call_modules, (user, this, ulist)); + FIRST_MOD_RESULT(OnUserList, call_modules, (user, this)); if (call_modules != MOD_RES_ALLOW) { @@ -892,15 +801,12 @@ void Channel::UserList(User *user, CUList *ulist) int numusers = 0; char* ptr = list + dlen; - if (!ulist) - ulist = this->GetUsers(); - /* Improvement by Brain - this doesnt change in value, so why was it inside * the loop? */ bool has_user = this->HasUser(user); - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + for (UserMembIter i = userlist.begin(); i != userlist.end(); i++) { if ((!has_user) && (i->first->IsModeSet('i'))) { @@ -911,15 +817,12 @@ void Channel::UserList(User *user, CUList *ulist) continue; } - if (i->first->Visibility && !i->first->Visibility->VisibleTo(user)) - continue; - std::string prefixlist = this->GetPrefixChar(i->first); std::string nick = i->first->nick; if (call_modules != MOD_RES_DENY) { - FOREACH_MOD(I_OnNamesListItem, OnNamesListItem(user, i->first, this, prefixlist, nick)); + FOREACH_MOD(I_OnNamesListItem, OnNamesListItem(user, i->second, prefixlist, nick)); /* Nick was nuked, a module wants us to skip it */ if (nick.empty()) @@ -991,42 +894,55 @@ void Channel::ResetMaxBans() const char* Channel::GetPrefixChar(User *user) { static char pf[2] = {0, 0}; + *pf = 0; + unsigned int bestrank = 0; - prefixlist::iterator n = prefixes.find(user); - if (n != prefixes.end()) + UserMembIter m = userlist.find(user); + if (m != userlist.end()) { - if (n->second.size()) + for(unsigned int i=0; i < m->second->modes.length(); i++) { - /* If the user has any prefixes, their highest prefix - * will always be at the head of the list, as the list is - * sorted in rank order highest first (see SetPrefix() - * for reasons why) - */ - *pf = n->second.begin()->first; - return pf; + char mchar = m->second->modes[i]; + ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL); + if (mh && mh->GetPrefixRank() > bestrank && mh->GetPrefix()) + { + bestrank = mh->GetPrefixRank(); + pf[0] = mh->GetPrefix(); + } } } - - *pf = 0; return pf; } +unsigned int Membership::getRank() +{ + char mchar = modes.c_str()[0]; + unsigned int rv = 0; + if (mchar) + { + ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL); + if (mh) + rv = mh->GetPrefixRank(); + } + return rv; +} const char* Channel::GetAllPrefixChars(User* user) { - static char prefix[MAXBUF]; + static char prefix[64]; int ctr = 0; - *prefix = 0; - prefixlist::iterator n = prefixes.find(user); - if (n != prefixes.end()) + UserMembIter m = userlist.find(user); + if (m != userlist.end()) { - for (std::vector::iterator x = n->second.begin(); x != n->second.end(); x++) + for(unsigned int i=0; i < m->second->modes.length(); i++) { - prefix[ctr++] = x->first; + char mchar = m->second->modes[i]; + ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL); + if (mh && mh->GetPrefix()) + prefix[ctr++] = mh->GetPrefix(); } } - prefix[ctr] = 0; return prefix; @@ -1034,92 +950,42 @@ const char* Channel::GetAllPrefixChars(User* user) unsigned int Channel::GetPrefixValue(User* user) { - prefixlist::iterator n = prefixes.find(user); - if (n != prefixes.end()) - { - if (n->second.size()) - return n->second.begin()->second; - } - return 0; -} - -int Channel::GetStatusFlags(User *user) -{ - UCListIter i = user->chans.find(this); - if (i != user->chans.end()) - { - return i->second; - } - return 0; + UserMembIter m = userlist.find(user); + if (m == userlist.end()) + return 0; + return m->second->getRank(); } -int Channel::GetStatus(User *user) +void Channel::SetPrefix(User* user, char prefix, bool adding) { - if (ServerInstance->ULine(user->server)) - return STATUS_OP; - - UCListIter i = user->chans.find(this); - if (i != user->chans.end()) + ModeHandler* delta_mh = ServerInstance->Modes->FindMode(prefix, MODETYPE_CHANNEL); + if (!delta_mh) + return; + UserMembIter m = userlist.find(user); + if (m == userlist.end()) + return; + for(unsigned int i=0; i < m->second->modes.length(); i++) { - if ((i->second & UCMODE_OP) > 0) - { - return STATUS_OP; - } - if ((i->second & UCMODE_HOP) > 0) + char mchar = m->second->modes[i]; + ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL); + if (mh && mh->GetPrefixRank() <= delta_mh->GetPrefixRank()) { - return STATUS_HOP; - } - if ((i->second & UCMODE_VOICE) > 0) - { - return STATUS_VOICE; + m->second->modes = + m->second->modes.substr(0,i) + + (adding ? std::string(1, prefix) : "") + + m->second->modes.substr(mchar == prefix ? i+1 : i); + return; } - return STATUS_NORMAL; } - return STATUS_NORMAL; -} - -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); if (adding) - { - if (n != prefixes.end()) - { - if (std::find(n->second.begin(), n->second.end(), pfx) == n->second.end()) - { - n->second.push_back(pfx); - /* We must keep prefixes in rank order, largest first. - * This is for two reasons, firstly because x-chat *ass-u-me's* this - * state, and secondly it turns out to be a benefit to us later. - * See above in GetPrefix(). - */ - std::sort(n->second.begin(), n->second.end(), ModeParser::PrefixComparison); - } - } - else - { - pfxcontainer one; - one.push_back(pfx); - prefixes.insert(std::make_pair(user, one)); - } - } - else - { - if (n != prefixes.end()) - { - pfxcontainer::iterator x = std::find(n->second.begin(), n->second.end(), pfx); - if (x != n->second.end()) - n->second.erase(x); - } - } + m->second->modes += std::string(1, prefix); } void Channel::RemoveAllPrefixes(User* user) { - prefixlist::iterator n = prefixes.find(user); - if (n != prefixes.end()) + UserMembIter m = userlist.find(user); + if (m != userlist.end()) { - prefixes.erase(n); + m->second->modes.clear(); } }