X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=bd8a9719c5f8e17dbb2291342232191530dff718;hb=cf4439ac5c5e5f57aba2c998ee63b9b27ec17d69;hp=df1f779766cf34254411de135b502468512d28b3;hpb=6fff3c54be91dbbfe5e3ffca4204ad0378d70b7d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/channels.cpp b/src/channels.cpp index df1f77976..bd8a9719c 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -11,9 +11,9 @@ * --------------------------------------------------- */ +#include "inspircd.h" #include #include "configreader.h" -#include "inspircd.h" #include "users.h" #include "modules.h" #include "wildcard.h" @@ -22,7 +22,7 @@ chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance) { *name = *topic = *setby = *key = 0; - created = topicset = limit = 0; + maxbans = created = topicset = limit = 0; memset(&modes,0,64); age = ServerInstance->Time(true); } @@ -37,21 +37,12 @@ void chanrec::SetMode(char mode,bool mode_on) void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on) { - ServerInstance->Log(DEBUG,"SetModeParam called"); - CustomModeList::iterator n = custom_mode_params.find(mode); if (mode_on) { if (n == custom_mode_params.end()) - { custom_mode_params[mode] = strdup(parameter); - ServerInstance->Log(DEBUG,"Custom mode parameter %c %s added",mode,parameter); - } - else - { - ServerInstance->Log(DEBUG, "Tried to set custom mode parameter for %c '%s' when it was already '%s'", mode, parameter, n->second); - } } else { @@ -70,22 +61,18 @@ bool chanrec::IsModeSet(char mode) std::string chanrec::GetModeParameter(char mode) { - if (mode == 'k') - { - return this->key; - } - else if (mode == 'l') - { - return ConvToStr(this->limit); - } - else + switch (mode) { - CustomModeList::iterator n = custom_mode_params.find(mode); - if (n != custom_mode_params.end()) - { - return n->second; - } - return ""; + case 'k': + return this->key; + case 'l': + return ConvToStr(this->limit); + default: + CustomModeList::iterator n = custom_mode_params.find(mode); + if (n != custom_mode_params.end()) + return n->second; + return ""; + break; } } @@ -96,7 +83,7 @@ long chanrec::GetUserCounter() void chanrec::AddUser(userrec* user) { - internal_userlist[user] = user; + internal_userlist[user] = user->nick; } unsigned long chanrec::DelUser(userrec* user) @@ -122,7 +109,7 @@ bool chanrec::HasUser(userrec* user) void chanrec::AddOppedUser(userrec* user) { - internal_op_userlist[user] = user; + internal_op_userlist[user] = user->nick; } void chanrec::DelOppedUser(userrec* user) @@ -137,7 +124,7 @@ void chanrec::DelOppedUser(userrec* user) void chanrec::AddHalfoppedUser(userrec* user) { - internal_halfop_userlist[user] = user; + internal_halfop_userlist[user] = user->nick; } void chanrec::DelHalfoppedUser(userrec* user) @@ -152,7 +139,7 @@ void chanrec::DelHalfoppedUser(userrec* user) void chanrec::AddVoicedUser(userrec* user) { - internal_voice_userlist[user] = user; + internal_voice_userlist[user] = user->nick; } void chanrec::DelVoicedUser(userrec* user) @@ -185,27 +172,99 @@ CUList* chanrec::GetVoicedUsers() return &internal_voice_userlist; } +void chanrec::SetDefaultModes() +{ + irc::spacesepstream list(ServerInstance->Config->DefaultModes); + std::string modeseq = list.GetToken(); + std::string parameter; + userrec* dummyuser = new userrec(ServerInstance); + dummyuser->SetFd(FD_MAGIC_NUMBER); + + for (std::string::iterator n = modeseq.begin(); n != modeseq.end(); ++n) + { + ModeHandler* mode = ServerInstance->Modes->FindMode(*n, MODETYPE_CHANNEL); + if (mode) + { + if (mode->GetNumParams(true)) + parameter = list.GetToken().c_str(); + else + parameter.clear(); + + mode->OnModeChange(dummyuser, dummyuser, this, parameter, true); + } + } + + delete dummyuser; +} + /* * 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) +chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bool override, const char* key, time_t TS) { if (!user || !cn) return NULL; - bool new_channel = false; char cname[MAXBUF]; int MOD_RESULT = 0; - strlcpy(cname,cn,CHANMAX); - std::string privs; + chanrec *Ptr; + + /* + * We don't restrict the number of channels that remote users or users that are override-joining may be in. + * We restrict local users to MaxChans channels. + * We restrict local operators to OperMaxChans channels. + * This is a lot more logical than how it was formerly. -- w00t + */ + if (IS_LOCAL(user) && !override) + { + if (user->GetMaxChans()) + { + if (user->chans.size() >= user->GetMaxChans()) + { + user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn); + return NULL; + } + } + else + { + if (IS_OPER(user)) + { + if (user->chans.size() >= Instance->Config->OperMaxChans) + { + user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn); + return NULL; + } + } + else + { + if (user->chans.size() >= Instance->Config->MaxChans) + { + user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn); + return NULL; + } + } + } + } - chanrec* Ptr = Instance->FindChan(cname); + strlcpy(cname, cn, CHANMAX); + Ptr = Instance->FindChan(cname); if (!Ptr) { - privs = "@"; + /* + * Fix: desync bug was here, don't set @ on remote users - spanningtree handles their permissions. bug #358. -- w00t + */ + 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); + } + else + { + privs = "@"; + } if (IS_LOCAL(user) && override == false) { @@ -223,14 +282,13 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo /* As spotted by jilles, dont bother to set this on remote users */ if (IS_LOCAL(user)) - Ptr->modes[CM_TOPICLOCK] = Ptr->modes[CM_NOEXTERNAL] = 1; + Ptr->SetDefaultModes(); - Ptr->created = Instance->Time(); + Ptr->created = TS ? TS : Instance->Time(); + Ptr->age = Ptr->created; *Ptr->topic = 0; *Ptr->setby = 0; Ptr->topicset = 0; - Instance->Log(DEBUG,"chanrec::JoinUser(): created: %s",cname); - new_channel = true; } else { @@ -265,18 +323,13 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo } } } - if (Ptr->modes[CM_INVITEONLY]) + if (Ptr->IsModeSet('i')) { MOD_RESULT = 0; FOREACH_RESULT_I(Instance,I_OnCheckInvite,OnCheckInvite(user, Ptr)); if (!MOD_RESULT) { - if (user->IsInvited(Ptr->name)) - { - /* user was invited to channel */ - /* there may be an optional channel NOTICE here */ - } - else + if (!user->IsInvited(Ptr->name)) { user->WriteServ("473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name); return NULL; @@ -307,56 +360,16 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo } } } - else - { - Instance->Log(DEBUG,"chanrec::JoinUser(): Overridden checks"); - } - } - - /* NOTE: If the user is an oper here, we can extend their user->chans by up to - * OPERMAXCHANS. For remote users which are not bound by the channel limits, - * we can extend infinitely. Otherwise, nope, youre restricted to MAXCHANS. - */ - if (!IS_LOCAL(user) || override == true) /* was a check on fd < 0 */ - { - return chanrec::ForceChan(Instance, Ptr, user, privs); - } - else if (*user->oper) - { - /* Oper allows extension up to the OPERMAXCHANS value */ - if (user->chans.size() < OPERMAXCHANS) - { - return chanrec::ForceChan(Instance, Ptr, user, privs); - } - } - else if (user->chans.size() < MAXCHANS) - { - return chanrec::ForceChan(Instance, Ptr, user, privs); - } - - - user->WriteServ("405 %s %s :You are on too many channels",user->nick, cname); - - if (new_channel) - { - Instance->Log(DEBUG,"BLAMMO, Whacking channel."); - /* Things went seriously pear shaped, so take this away. bwahaha. */ - chan_hash::iterator n = Instance->chanlist->find(cname); - if (n != Instance->chanlist->end()) - { - Ptr->DelUser(user); - DELETE(Ptr); - Instance->chanlist->erase(n); - } } - return NULL; + return chanrec::ForceChan(Instance, Ptr, user, privs); } chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, const std::string &privs) { userrec* dummyuser = new userrec(Instance); std::string nick = user->nick; + bool silent = false; dummyuser->SetFd(FD_MAGIC_NUMBER); Ptr->AddUser(user); @@ -385,13 +398,13 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con * must stick to ::find(). */ case '@': - user->chans[Ptr] |= STATUS_OP; + user->chans[Ptr] |= UCMODE_OP; break; case '%': - user->chans[Ptr] |= STATUS_HOP; + user->chans[Ptr] |= UCMODE_HOP; break; case '+': - user->chans[Ptr] |= STATUS_VOICE; + user->chans[Ptr] |= UCMODE_VOICE; break; } } @@ -399,7 +412,10 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con delete dummyuser; - Ptr->WriteChannel(user,"JOIN :%s",Ptr->name); + FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user, Ptr, silent)); + + if (!silent) + Ptr->WriteChannel(user,"JOIN :%s",Ptr->name); /* 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); @@ -416,8 +432,7 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con } Ptr->UserList(user); } - FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user,Ptr)); - FOREACH_MOD_I(Instance,I_OnPostJoin,OnPostJoin(user,Ptr)); + FOREACH_MOD_I(Instance,I_OnPostJoin,OnPostJoin(user, Ptr)); return Ptr; } @@ -450,14 +465,19 @@ bool chanrec::IsBanned(userrec* user) */ long chanrec::PartUser(userrec *user, const char* reason) { + bool silent = false; + if (!user) return this->GetUserCounter(); UCListIter i = user->chans.find(this); if (i != user->chans.end()) { - FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason ? reason : "")); - this->WriteChannel(user, "PART %s%s%s", this->name, reason ? " :" : "", reason ? reason : ""); + FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason ? reason : "", silent)); + + if (!silent) + this->WriteChannel(user, "PART %s%s%s", this->name, reason ? " :" : "", reason ? reason : ""); + user->chans.erase(i); this->RemoveAllPrefixes(user); } @@ -468,7 +488,6 @@ long chanrec::PartUser(userrec *user, const char* reason) /* kill the record */ if (iter != ServerInstance->chanlist->end()) { - ServerInstance->Log(DEBUG,"del_channel: destroyed: %s", this->name); FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this)); ServerInstance->chanlist->erase(iter); } @@ -480,6 +499,8 @@ long chanrec::PartUser(userrec *user, const char* reason) long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggerevents) { + bool silent = false; + if (!user || !reason) return this->GetUserCounter(); @@ -494,13 +515,15 @@ long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggereven if (triggerevents) { - FOREACH_MOD(I_OnUserKick,OnUserKick(NULL,user,this,reason)); + FOREACH_MOD(I_OnUserKick,OnUserKick(NULL, user, this, reason, silent)); } UCListIter i = user->chans.find(this); if (i != user->chans.end()) { - this->WriteChannelWithServ(ServerInstance->Config->ServerName, "KICK %s %s :%s", this->name, user->nick, reason); + if (!silent) + this->WriteChannelWithServ(ServerInstance->Config->ServerName, "KICK %s %s :%s", this->name, user->nick, reason); + user->chans.erase(i); this->RemoveAllPrefixes(user); } @@ -522,6 +545,8 @@ long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggereven long chanrec::KickUser(userrec *src, userrec *user, const char* reason) { + bool silent = false; + if (!src || !user || !reason) return this->GetUserCounter(); @@ -566,13 +591,15 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason) } } - FOREACH_MOD(I_OnUserKick,OnUserKick(src,user,this,reason)); + FOREACH_MOD(I_OnUserKick,OnUserKick(src, user, this, reason, silent)); UCListIter i = user->chans.find(this); if (i != user->chans.end()) { /* zap it from the channel list of the user */ - this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason); + if (!silent) + this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason); + user->chans.erase(i); this->RemoveAllPrefixes(user); } @@ -618,11 +645,12 @@ void chanrec::WriteChannel(userrec* user, const std::string &text) return; snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),text.c_str()); + std::string out = tb; for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if (IS_LOCAL(i->second)) - i->second->Write(std::string(tb)); + if (IS_LOCAL(i->first)) + i->first->Write(out); } } @@ -644,11 +672,15 @@ void chanrec::WriteChannelWithServ(const char* ServName, const char* text, ...) void chanrec::WriteChannelWithServ(const char* 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()); + std::string out = tb; for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if (IS_LOCAL(i->second)) - i->second->WriteServ(text); + if (IS_LOCAL(i->first)) + i->first->Write(out); } } @@ -706,15 +738,16 @@ void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CULi } snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),text.c_str()); + std::string out = tb; for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if ((IS_LOCAL(i->second)) && (except_list.find(i->second) == except_list.end())) + if ((IS_LOCAL(i->first)) && (except_list.find(i->first) == except_list.end())) { if (serversource) - i->second->WriteServ(text); + i->first->WriteServ(text); else - i->second->Write(std::string(tb)); + i->first->Write(out); } } } @@ -722,7 +755,7 @@ void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CULi void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, const std::string& text) { CUList except_list; - except_list[user] = user; + except_list[user] = user->nick; this->WriteAllExcept(user, serversource, status, except_list, std::string(text)); } @@ -736,7 +769,7 @@ int chanrec::CountInvisible() CUList *ulist= this->GetUsers(); for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if (!(i->second->modes[UM_INVISIBLE])) + if (!(i->first->IsModeSet('i'))) count++; } @@ -748,7 +781,7 @@ char* chanrec::ChanModes(bool showkey) static char scratch[MAXBUF]; static char sparam[MAXBUF]; char* offset = scratch; - std::string extparam = ""; + std::string extparam; *scratch = '\0'; *sparam = '\0'; @@ -759,7 +792,7 @@ char* chanrec::ChanModes(bool showkey) if(this->modes[n]) { *offset++ = n + 65; - extparam = ""; + extparam.clear(); switch (n) { case CM_KEY: @@ -780,7 +813,7 @@ char* chanrec::ChanModes(bool showkey) extparam = this->GetModeParameter(n + 65); break; } - if (extparam != "") + if (!extparam.empty()) { charlcat(sparam,' ',MAXBUF); strlcat(sparam,extparam.c_str(),MAXBUF); @@ -797,7 +830,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) +void chanrec::UserList(userrec *user, CUList *ulist) { char list[MAXBUF]; size_t dlen, curlen; @@ -806,19 +839,17 @@ void chanrec::UserList(userrec *user) if (!IS_LOCAL(user)) return; - FOREACH_RESULT(I_OnUserList,OnUserList(user, this)); - ServerInstance->Log(DEBUG,"MOD_RESULT for UserList = %d",MOD_RESULT); + FOREACH_RESULT(I_OnUserList,OnUserList(user, this, ulist)); if (MOD_RESULT == 1) return; - ServerInstance->Log(DEBUG,"Using builtin NAMES list generation"); - dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name); int numusers = 0; char* ptr = list + dlen; - CUList *ulist= this->GetUsers(); + if (!ulist) + ulist = this->GetUsers(); /* Improvement by Brain - this doesnt change in value, so why was it inside * the loop? @@ -827,7 +858,7 @@ void chanrec::UserList(userrec *user) for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if ((!has_user) && (i->second->modes[UM_INVISIBLE])) + if ((!has_user) && (i->first->IsModeSet('i'))) { /* * user is +i, and source not on the channel, does not show @@ -836,7 +867,12 @@ void chanrec::UserList(userrec *user) continue; } - size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->second), i->second->nick); + if (i->first->Visibility && !i->first->Visibility->VisibleTo(user)) + continue; + + size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->first), i->second.c_str()); + /* OnUserList can change this - reset it back to normal */ + i->second = i->first->nick; curlen += ptrlen; ptr += ptrlen; @@ -868,16 +904,29 @@ void chanrec::UserList(userrec *user) long chanrec::GetMaxBans() { + /* Return the cached value if there is one */ + if (this->maxbans) + return this->maxbans; + + /* If there isnt one, we have to do some O(n) hax to find it the first time. (ick) */ for (std::map::iterator n = ServerInstance->Config->maxbans.begin(); n != ServerInstance->Config->maxbans.end(); n++) { if (match(this->name,n->first.c_str())) { + this->maxbans = n->second; return n->second; } } - return 64; + + /* Screw it, just return the default of 64 */ + this->maxbans = 64; + return this->maxbans; } +void chanrec::ResetMaxBans() +{ + this->maxbans = 0; +} /* returns the status character for a given user on a channel, e.g. @ for op, * % for halfop etc. If the user has several modes set, the highest mode @@ -1007,7 +1056,6 @@ void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, b n->second.erase(x); } } - ServerInstance->Log(DEBUG,"Added prefix %c to %s for %s, prefixlist size is now %d", prefix, this->name, user->nick, prefixes.size()); } void chanrec::RemoveAllPrefixes(userrec* user) @@ -1015,7 +1063,6 @@ void chanrec::RemoveAllPrefixes(userrec* user) prefixlist::iterator n = prefixes.find(user); if (n != prefixes.end()) { - ServerInstance->Log(DEBUG,"Removed prefixes from %s for %s, prefixlist size is now %d", this->name, user->nick, prefixes.size()); prefixes.erase(n); } }