X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=1c13ac4efcf3fe7e5dedcb3ba0a882d1bd9dd016;hb=146d85b5dea9ecb803a9a47c68b5489905634125;hp=fa4bb7a4226b4d8f4d52fcff7209f41f4a7cc6dc;hpb=d736eba00b274c87662bd73a3acf8288135643d6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/users.cpp b/src/users.cpp index fa4bb7a42..1c13ac4ef 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -40,9 +40,8 @@ bool User::IsNoticeMaskSet(unsigned char sm) bool User::IsModeSet(unsigned char m) { - if (!isalpha(m)) - return false; - return (modes[m-65]); + ModeHandler* mh = ServerInstance->Modes->FindMode(m, MODETYPE_USER); + return (mh && modes[mh->GetId()]); } const char* User::FormatModes(bool showparameters) @@ -53,11 +52,11 @@ const char* User::FormatModes(bool showparameters) for (unsigned char n = 0; n < 64; n++) { - if (modes[n]) + ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_USER); + if (mh && IsModeSet(mh)) { data.push_back(n + 65); - ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_USER); - if (showparameters && mh && mh->GetNumParams(true)) + if (showparameters && mh->GetNumParams(true)) { std::string p = mh->GetUserParameter(this); if (p.length()) @@ -69,8 +68,8 @@ const char* User::FormatModes(bool showparameters) return data.c_str(); } -User::User(const std::string &uid, const std::string& sid, int type) - : uuid(uid), server(sid), usertype(type) +User::User(const std::string& uid, Server* srv, int type) + : uuid(uid), server(srv), usertype(type) { age = ServerInstance->Time(); signon = 0; @@ -85,8 +84,7 @@ User::User(const std::string &uid, const std::string& sid, int type) } LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* servaddr) - : User(ServerInstance->UIDGen.GetUID(), ServerInstance->Config->ServerName, USERTYPE_LOCAL), eh(this), - localuseriter(ServerInstance->Users->local_users.end()), + : User(ServerInstance->UIDGen.GetUID(), ServerInstance->FakeClient->server, USERTYPE_LOCAL), eh(this), bytes_in(0), bytes_out(0), cmds_in(0), cmds_out(0), nping(0), CommandFloodPenalty(0), already_sent(0) { @@ -157,7 +155,6 @@ bool LocalUser::RemoveInvite(Channel* chan) Invitation* inv = Invitation::Find(chan, this); if (inv) { - inv->cull(); delete inv; return true; } @@ -327,7 +324,6 @@ CullResult User::cull() { if (!quitting) ServerInstance->Users->QuitUser(this, "Culled without QuitUser"); - PurgeEmptyChannels(); if (client_sa.sa.sa_family != AF_UNSPEC) ServerInstance->Users->RemoveCloneCounts(this); @@ -337,17 +333,7 @@ CullResult User::cull() CullResult LocalUser::cull() { - // The iterator is initialized to local_users.end() in the constructor. It is - // overwritten in UserManager::AddUser() with the real iterator so this check - // is only a precaution currently. - if (localuseriter != ServerInstance->Users->local_users.end()) - { - ServerInstance->Users->local_count--; - ServerInstance->Users->local_users.erase(localuseriter); - } - else - ServerInstance->Logs->Log("USERS", LOG_DEFAULT, "ERROR: LocalUserIter does not point to a valid entry for " + this->nick); - + ServerInstance->Users->local_users.erase(this); ClearInvites(); eh.cull(); return User::cull(); @@ -370,7 +356,7 @@ void User::Oper(OperInfo* info) this->SetMode(opermh, true); this->oper = info; - this->WriteServ("MODE %s :+o", this->nick.c_str()); + this->WriteCommand("MODE", "+o"); FOREACH_MOD(OnOper, (this, info->name)); std::string opername; @@ -578,7 +564,6 @@ void LocalUser::FullConnect() this->WriteNumeric(RPL_SERVERVERSION, "%s %s %s", ServerInstance->Config->ServerName.c_str(), BRANCH, modelist.c_str()); ServerInstance->ISupport.SendTo(this); - this->WriteNumeric(RPL_YOURUUID, "%s :your unique ID", this->uuid.c_str()); /* Now registered */ if (ServerInstance->Users->unregistered_count) @@ -628,7 +613,7 @@ void User::InvalidateCache() cached_fullrealhost.clear(); } -bool User::ChangeNick(const std::string& newnick, bool force) +bool User::ChangeNick(const std::string& newnick, bool force, time_t newts) { if (quitting) { @@ -652,6 +637,7 @@ bool User::ChangeNick(const std::string& newnick, bool force) { // case change, don't need to check Q:lines and such // and, if it's identical including case, we can leave right now + // We also don't update the nick TS if it's a case change, either if (newnick == nick) return true; } @@ -683,7 +669,7 @@ bool User::ChangeNick(const std::string& newnick, bool force) { for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++) { - Channel *chan = *i; + Channel* chan = (*i)->chan; if (chan->GetPrefixValue(this) < VOICE_VALUE && chan->IsBanned(this)) { this->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s :Cannot send to channel (you're banned)", chan->name.c_str()); @@ -725,6 +711,8 @@ bool User::ChangeNick(const std::string& newnick, bool force) return false; } } + + age = newts ? newts : ServerInstance->Time(); } if (this->registered == REG_ALL) @@ -762,7 +750,7 @@ const std::string& User::GetIPString() irc::sockets::satoap(client_sa, cachedip, port); /* IP addresses starting with a : on irc are a Bad Thing (tm) */ if (cachedip[0] == ':') - cachedip.insert(0,1,'0'); + cachedip.insert(cachedip.begin(),1,'0'); } return cachedip; @@ -832,7 +820,7 @@ void User::Write(const char *text, ...) void LocalUser::Write(const std::string& text) { - if (!ServerInstance->SE->BoundsCheckFd(&eh)) + if (!SocketEngine::BoundsCheckFd(&eh)) return; if (text.length() > ServerInstance->Config->Limits.MaxLine - 2) @@ -877,9 +865,9 @@ void User::WriteServ(const char* text, ...) this->WriteServ(textbuffer); } -void User::WriteNotice(const std::string& text) +void User::WriteCommand(const char* command, const std::string& text) { - this->WriteServ("NOTICE " + (this->registered == REG_ALL ? this->nick : "*") + " :" + text); + this->WriteServ(command + (this->registered & REG_NICK ? " " + this->nick : " *") + " " + text); } void User::WriteNumeric(unsigned int numeric, const char* text, ...) @@ -897,9 +885,9 @@ void User::WriteNumeric(unsigned int numeric, const std::string &text) if (MOD_RESULT == MOD_RES_DENY) return; - + const std::string message = InspIRCd::Format(":%s %03u %s %s", ServerInstance->Config->ServerName.c_str(), - numeric, !this->nick.empty() ? this->nick.c_str() : "*", text.c_str()); + numeric, this->registered & REG_NICK ? this->nick.c_str() : "*", text.c_str()); this->Write(message); } @@ -963,7 +951,7 @@ void User::WriteCommonRaw(const std::string &line, bool include_self) LocalUser::already_sent_id++; - UserChanList include_c(chans); + IncludeChanList include_c(chans.begin(), chans.end()); std::map exceptions; exceptions[this] = include_self; @@ -980,14 +968,14 @@ void User::WriteCommonRaw(const std::string &line, bool include_self) u->Write(line); } } - for (UCListIter v = include_c.begin(); v != include_c.end(); ++v) + for (IncludeChanList::const_iterator v = include_c.begin(); v != include_c.end(); ++v) { - Channel* c = *v; + Channel* c = (*v)->chan; const UserMembList* ulist = c->GetUsers(); for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++) { LocalUser* u = IS_LOCAL(i->first); - if (u && !u->quitting && u->already_sent != LocalUser::already_sent_id) + if (u && u->already_sent != LocalUser::already_sent_id) { u->already_sent = LocalUser::already_sent_id; u->Write(line); @@ -1006,7 +994,7 @@ void User::WriteCommonQuit(const std::string &normal_text, const std::string &op const std::string normalMessage = ":" + this->GetFullHost() + " QUIT :" + normal_text; const std::string operMessage = ":" + this->GetFullHost() + " QUIT :" + oper_text; - UserChanList include_c(chans); + IncludeChanList include_c(chans.begin(), chans.end()); std::map exceptions; FOREACH_MOD(OnBuildNeighborList, (this, include_c, exceptions)); @@ -1021,13 +1009,13 @@ void User::WriteCommonQuit(const std::string &normal_text, const std::string &op u->Write(u->IsOper() ? operMessage : normalMessage); } } - for (UCListIter v = include_c.begin(); v != include_c.end(); ++v) + for (IncludeChanList::const_iterator v = include_c.begin(); v != include_c.end(); ++v) { - const UserMembList* ulist = (*v)->GetUsers(); + const UserMembList* ulist = (*v)->chan->GetUsers(); for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++) { LocalUser* u = IS_LOCAL(i->first); - if (u && !u->quitting && (u->already_sent != uniq_id)) + if (u && (u->already_sent != uniq_id)) { u->already_sent = uniq_id; u->Write(u->IsOper() ? operMessage : normalMessage); @@ -1088,16 +1076,13 @@ void User::SendText(const std::string& linePrefix, std::stringstream& textStream */ bool User::SharesChannelWith(User *other) { - if ((!other) || (this->registered != REG_ALL) || (other->registered != REG_ALL)) - return false; - /* Outer loop */ for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++) { /* Eliminate the inner loop (which used to be ~equal in size to the outer loop) * by replacing it with a map::find which *should* be more efficient */ - if ((*i)->HasUser(other)) + if ((*i)->chan->HasUser(other)) return true; } return false; @@ -1136,7 +1121,7 @@ bool User::ChangeDisplayedHost(const std::string& shost) FOREACH_MOD(OnChangeHost, (this,shost)); - this->dhost.assign(shost, 0, 64); + this->dhost.assign(shost, 0, ServerInstance->Config->Limits.MaxHost); this->InvalidateCache(); if (IS_LOCAL(this)) @@ -1253,7 +1238,7 @@ void LocalUser::SetClass(const std::string &explicit_name) if (regdone && !c->config->getString("password").empty()) { - if (ServerInstance->PassCompare(this, c->config->getString("password"), password, c->config->getString("hash"))) + if (!ServerInstance->PassCompare(this, c->config->getString("password"), password, c->config->getString("hash"))) { ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Bad password, skipping"); continue; @@ -1278,9 +1263,10 @@ void LocalUser::SetClass(const std::string &explicit_name) void User::PurgeEmptyChannels() { // firstly decrement the count on each channel - for (UCListIter f = this->chans.begin(); f != this->chans.end(); f++) + for (UCListIter i = this->chans.begin(); i != this->chans.end(); ) { - Channel* c = *f; + Channel* c = (*i)->chan; + ++i; c->DelUser(this); } @@ -1291,14 +1277,14 @@ const std::string& FakeUser::GetFullHost() { if (!ServerInstance->Config->HideWhoisServer.empty()) return ServerInstance->Config->HideWhoisServer; - return server; + return server->GetName(); } const std::string& FakeUser::GetFullRealHost() { if (!ServerInstance->Config->HideWhoisServer.empty()) return ServerInstance->Config->HideWhoisServer; - return server; + return server->GetName(); } ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask)