X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=21079f0cc2e7adc12b114e404ae8ed8138a6314b;hb=03a623a284b6c9f2f11f549c55333c45c4d91eab;hp=f4055d464dc6769472c99f5b5284ffb39164b242;hpb=fd1d19d6345943ecdb5ce4ef947f9b3c5c8bca86;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/users.cpp b/src/users.cpp index f4055d464..21079f0cc 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -360,20 +360,21 @@ CullResult FakeUser::cull() { // Fake users don't quit, they just get culled. quitting = true; - ServerInstance->Users->clientlist->erase(nick); + // Fake users are not inserted into UserManager::clientlist, they're only in the uuidlist ServerInstance->Users->uuidlist->erase(uuid); return User::cull(); } void User::Oper(OperInfo* info) { - if (this->IsModeSet('o')) + ModeHandler* opermh = ServerInstance->Modes->FindMode('o', MODETYPE_USER); + if (this->IsModeSet(opermh)) this->UnOper(); - this->modes[UM_OPERATOR] = 1; + this->SetMode(opermh, true); this->oper = info; this->WriteServ("MODE %s :+o", this->nick.c_str()); - FOREACH_MOD(I_OnOper, OnOper(this, info->name)); + FOREACH_MOD(OnOper, (this, info->name)); std::string opername; if (info->oper_block) @@ -401,7 +402,7 @@ void User::Oper(OperInfo* info) if (IS_LOCAL(this)) oper->init(); - FOREACH_MOD(I_OnPostOper,OnPostOper(this, oper->name, opername)); + FOREACH_MOD(OnPostOper, (this, oper->name, opername)); } void OperInfo::init() @@ -485,12 +486,13 @@ void User::UnOper() parameters.push_back(this->nick); parameters.push_back(moderemove); - ServerInstance->Parser->CallHandler("MODE", parameters, this); + ServerInstance->Modes->Process(parameters, this); /* remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404 */ ServerInstance->Users->all_opers.remove(this); - this->modes[UM_OPERATOR] = 0; + ModeHandler* opermh = ServerInstance->Modes->FindMode('o', MODETYPE_USER); + this->SetMode(opermh, false); } /* @@ -606,11 +608,11 @@ void LocalUser::FullConnect() * We don't set REG_ALL until triggering OnUserConnect, so some module events don't spew out stuff * for a user that doesn't exist yet. */ - FOREACH_MOD(I_OnUserConnect,OnUserConnect(this)); + FOREACH_MOD(OnUserConnect, (this)); this->registered = REG_ALL; - FOREACH_MOD(I_OnPostConnect,OnPostConnect(this)); + FOREACH_MOD(OnPostConnect, (this)); ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d (class %s): %s (%s) [%s]", this->GetServerPort(), this->MyClass->name.c_str(), GetFullRealHost().c_str(), this->GetIPString().c_str(), this->fullname.c_str()); @@ -738,7 +740,7 @@ bool User::ChangeNick(const std::string& newnick, bool force) (*(ServerInstance->Users->clientlist))[newnick] = this; if (registered == REG_ALL) - FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(this,oldnick)); + FOREACH_MOD(OnUserPostNick, (this,oldnick)); return true; } @@ -817,7 +819,7 @@ void LocalUser::SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_elin if (recheck_eline) this->exempt = (ServerInstance->XLines->MatchesLine("E", this) != NULL); - FOREACH_MOD(I_OnSetUserIP,OnSetUserIP(this)); + FOREACH_MOD(OnSetUserIP, (this)); } } @@ -969,7 +971,7 @@ void User::WriteCommonRaw(const std::string &line, bool include_self) exceptions[this] = include_self; - FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions)); + FOREACH_MOD(OnBuildNeighborList, (this, include_c, exceptions)); for (std::map::iterator i = exceptions.begin(); i != exceptions.end(); ++i) { @@ -1010,7 +1012,7 @@ void User::WriteCommonQuit(const std::string &normal_text, const std::string &op UserChanList include_c(chans); std::map exceptions; - FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions)); + FOREACH_MOD(OnBuildNeighborList, (this, include_c, exceptions)); for (std::map::iterator i = exceptions.begin(); i != exceptions.end(); ++i) { @@ -1104,7 +1106,7 @@ bool User::SharesChannelWith(User *other) return false; } -bool User::ChangeName(const char* gecos) +bool User::ChangeName(const std::string& gecos) { if (!this->fullname.compare(gecos)) return true; @@ -1115,80 +1117,14 @@ bool User::ChangeName(const char* gecos) FIRST_MOD_RESULT(OnChangeLocalUserGECOS, MOD_RESULT, (IS_LOCAL(this),gecos)); if (MOD_RESULT == MOD_RES_DENY) return false; - FOREACH_MOD(I_OnChangeName,OnChangeName(this,gecos)); + FOREACH_MOD(OnChangeName, (this,gecos)); } this->fullname.assign(gecos, 0, ServerInstance->Config->Limits.MaxGecos); return true; } -void User::DoHostCycle(const std::string &quitline) -{ - if (!ServerInstance->Config->CycleHosts) - return; - - already_sent_t silent_id = ++LocalUser::already_sent_id; - already_sent_t seen_id = ++LocalUser::already_sent_id; - - UserChanList include_c(chans); - std::map exceptions; - - FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions)); - - for (std::map::iterator i = exceptions.begin(); i != exceptions.end(); ++i) - { - LocalUser* u = IS_LOCAL(i->first); - if (u && !u->quitting) - { - if (i->second) - { - u->already_sent = seen_id; - u->Write(quitline); - } - else - { - u->already_sent = silent_id; - } - } - } - for (UCListIter v = include_c.begin(); v != include_c.end(); ++v) - { - Channel* c = *v; - Membership* memb = c->GetUser(this); - const std::string joinline = ":" + GetFullHost() + " JOIN " + c->name; - std::string modeline; - - if (!memb->modes.empty()) - { - modeline = ":" + (ServerInstance->Config->CycleHostsFromUser ? GetFullHost() : ServerInstance->Config->ServerName) - + " MODE " + c->name + " +" + memb->modes; - - for (size_t i = 0; i < memb->modes.length(); i++) - modeline.append(" ").append(nick); - } - - const UserMembList *ulist = c->GetUsers(); - for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++) - { - LocalUser* u = IS_LOCAL(i->first); - if (u == NULL || u == this) - continue; - if (u->already_sent == silent_id) - continue; - - if (u->already_sent != seen_id) - { - u->Write(quitline); - u->already_sent = seen_id; - } - u->Write(joinline); - if (!memb->modes.empty()) - u->Write(modeline); - } - } -} - -bool User::ChangeDisplayedHost(const char* shost) +bool User::ChangeDisplayedHost(const std::string& shost) { if (dhost == shost) return true; @@ -1201,38 +1137,27 @@ bool User::ChangeDisplayedHost(const char* shost) return false; } - FOREACH_MOD(I_OnChangeHost, OnChangeHost(this,shost)); - - std::string quitstr = ":" + GetFullHost() + " QUIT :Changing host"; + FOREACH_MOD(OnChangeHost, (this,shost)); - /* Fix by Om: User::dhost is 65 long, this was truncating some long hosts */ this->dhost.assign(shost, 0, 64); - this->InvalidateCache(); - this->DoHostCycle(quitstr); - if (IS_LOCAL(this)) this->WriteNumeric(RPL_YOURDISPLAYEDHOST, "%s %s :is now your displayed host",this->nick.c_str(),this->dhost.c_str()); return true; } -bool User::ChangeIdent(const char* newident) +bool User::ChangeIdent(const std::string& newident) { if (this->ident == newident) return true; - FOREACH_MOD(I_OnChangeIdent, OnChangeIdent(this,newident)); - - std::string quitstr = ":" + GetFullHost() + " QUIT :Changing ident"; + FOREACH_MOD(OnChangeIdent, (this,newident)); this->ident.assign(newident, 0, ServerInstance->Config->Limits.IdentMax); - this->InvalidateCache(); - this->DoHostCycle(quitstr); - return true; } @@ -1353,21 +1278,6 @@ void LocalUser::SetClass(const std::string &explicit_name) } } -/* looks up a users password for their connection class (/ tags) - * NOTE: If the or tag specifies an ip, and this user resolves, - * then their ip will be taken as 'priority' anyway, so for example, - * will match joe!bloggs@localhost - */ -ConnectClass* LocalUser::GetClass() -{ - return MyClass; -} - -ConnectClass* User::GetClass() -{ - return NULL; -} - void User::PurgeEmptyChannels() { // firstly decrement the count on each channel @@ -1398,7 +1308,7 @@ ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask) : config(tag), type(t), fakelag(true), name("unnamed"), registration_timeout(0), host(mask), pingtime(0), softsendqmax(0), hardsendqmax(0), recvqmax(0), penaltythreshold(0), commandrate(0), maxlocal(0), maxglobal(0), maxconnwarn(true), maxchans(0), - limit(0), nouserdns(false) + limit(0), resolvehostnames(true) { } @@ -1408,7 +1318,7 @@ ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask, cons softsendqmax(parent.softsendqmax), hardsendqmax(parent.hardsendqmax), recvqmax(parent.recvqmax), penaltythreshold(parent.penaltythreshold), commandrate(parent.commandrate), maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), maxconnwarn(parent.maxconnwarn), maxchans(parent.maxchans), - limit(parent.limit), nouserdns(parent.nouserdns) + limit(parent.limit), resolvehostnames(parent.resolvehostnames) { } @@ -1431,5 +1341,5 @@ void ConnectClass::Update(const ConnectClass* src) maxconnwarn = src->maxconnwarn; maxchans = src->maxchans; limit = src->limit; - nouserdns = src->nouserdns; + resolvehostnames = src->resolvehostnames; }