X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=5169fbf6372161a77b83541393fe0a05d14ac519;hb=4c83624ed825ca123401a45c8d2844ba6453a85b;hp=dec68341ee79e3b74d69c174b7ae3fcc8d019814;hpb=46121d8880ab48d9a925f5b046216016d290b356;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/channels.cpp b/src/channels.cpp index dec68341e..5169fbf63 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -13,9 +13,6 @@ #include "inspircd.h" #include -#include "configreader.h" -#include "users.h" -#include "modules.h" #include "wildcard.h" #include "mode.h" @@ -43,12 +40,6 @@ void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on) { if (n == custom_mode_params.end()) custom_mode_params[mode] = strdup(parameter); - - /* TODO: We really need to do away with this in 1.2 */ - if (mode == 'l') - this->limit = atoi(parameter); - else if (mode == 'k') - strlcpy(this->key, parameter, sizeof(this->key)); } else { @@ -57,12 +48,6 @@ void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on) free(n->second); custom_mode_params.erase(n); } - - /* TODO: See above */ - if (mode == 'l') - this->limit = 0; - else if (mode == 'k') - *this->key = 0; } } @@ -187,16 +172,22 @@ CUList* chanrec::GetVoicedUsers() void chanrec::SetDefaultModes() { irc::spacesepstream list(ServerInstance->Config->DefaultModes); - std::string modeseq = list.GetToken(); + std::string modeseq; + std::string parameter; + + list.GetToken(modeseq); for (std::string::iterator n = modeseq.begin(); n != modeseq.end(); ++n) { ModeHandler* mode = ServerInstance->Modes->FindMode(*n, MODETYPE_CHANNEL); if (mode) { - this->SetMode(*n, true); if (mode->GetNumParams(true)) - this->SetModeParam(*n, list.GetToken().c_str(), true); + list.GetToken(parameter); + else + parameter.clear(); + + mode->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, this, parameter, true); } } } @@ -210,21 +201,65 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo 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) { - if ((!IS_LOCAL(user)) && (!TS)) - Instance->Log(DEBUG,"*** BUG *** chanrec::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick, cn); - - 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) { @@ -249,7 +284,6 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo *Ptr->topic = 0; *Ptr->setby = 0; Ptr->topicset = 0; - new_channel = true; } else { @@ -284,18 +318,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; @@ -328,52 +357,14 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo } } - /* 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) - { - return chanrec::ForceChan(Instance, Ptr, user, privs); - } - else if (IS_OPER(user)) - { - /* Oper allows extension up to the OperMaxchans value */ - if (user->chans.size() < Instance->Config->OperMaxChans) - { - return chanrec::ForceChan(Instance, Ptr, user, privs); - } - } - else if (user->chans.size() < Instance->Config->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) - { - /* 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); /* Just in case they have no permissions */ @@ -387,7 +378,7 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con { Ptr->SetPrefix(user, status, mh->GetPrefixRank(), true); /* Make sure that the mode handler knows this mode was now set */ - mh->OnModeChange(dummyuser, dummyuser, Ptr, nick, true); + mh->OnModeChange(Instance->FakeClient, Instance->FakeClient, Ptr, nick, true); switch (mh->GetPrefix()) { @@ -412,8 +403,6 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con } } - delete dummyuser; - FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user, Ptr, silent)); if (!silent) @@ -794,7 +783,7 @@ char* chanrec::ChanModes(bool showkey) if(this->modes[n]) { *offset++ = n + 65; - extparam = ""; + extparam.clear(); switch (n) { case CM_KEY: @@ -815,7 +804,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); @@ -845,7 +834,7 @@ void chanrec::UserList(userrec *user, CUList *ulist) if (MOD_RESULT == 1) return; - dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name); + dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name); int numusers = 0; char* ptr = list + dlen; @@ -860,7 +849,7 @@ void chanrec::UserList(userrec *user, CUList *ulist) for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if ((!has_user) && (i->first->modes[UM_INVISIBLE])) + if ((!has_user) && (i->first->IsModeSet('i'))) { /* * user is +i, and source not on the channel, does not show @@ -887,7 +876,7 @@ void chanrec::UserList(userrec *user, CUList *ulist) user->WriteServ(std::string(list)); /* reset our lengths */ - dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name); + dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name); ptr = list + dlen; ptrlen = 0;