X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=838013c4c808d4b62c284496565b1a7aacb03abe;hb=2fe61d7d9519056705f1eeb2842a2a0042010172;hp=c03a69ace9222a66d3a95cd8b42859069c69e21e;hpb=369aef56c68aecccac7c3c30108fd958cfdc62f0;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/channels.cpp b/src/channels.cpp index c03a69ace..838013c4c 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -20,7 +20,7 @@ Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts) : ServerInstance(Instance) { - chan_hash::iterator findchan = ServerInstance->chanlist->find(name); + chan_hash::iterator findchan = ServerInstance->chanlist->find(cname); if (findchan != Instance->chanlist->end()) throw CoreException("Cannot create duplicate channel " + cname); @@ -184,6 +184,7 @@ CUList* Channel::GetVoicedUsers() void Channel::SetDefaultModes() { + ServerInstance->Logs->Log("CHANNELS", DEBUG, "SetDefaultModes %s", ServerInstance->Config->DefaultModes); irc::spacesepstream list(ServerInstance->Config->DefaultModes); std::string modeseq; std::string parameter; @@ -357,7 +358,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool } /* As spotted by jilles, dont bother to set this on remote users */ - if (IS_LOCAL(user) && Ptr->GetUserCounter() == 1) + if (IS_LOCAL(user) && Ptr->GetUserCounter() == 0) Ptr->SetDefaultModes(); return Channel::ForceChan(Instance, Ptr, user, privs, bursting); @@ -432,7 +433,10 @@ bool Channel::IsBanned(User* user) char mask[MAXBUF]; int MOD_RESULT = 0; FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, this)); - if (!MOD_RESULT) + + if (MOD_RESULT == -1) + return true; + else if (MOD_RESULT == 0) { snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString()); for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++) @@ -450,6 +454,37 @@ bool Channel::IsBanned(User* user) return false; } +bool Channel::IsExtBanned(User *user, char type) +{ + // XXX. do we need events? + char mask[MAXBUF]; + char *maskptr; + + snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString()); + + for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++) + { + if (i->data[0] != type || i->data[1] != ':') + continue; + + // Iterate past char and : to get to the mask without doing a data copy(!) + maskptr = i->data; + maskptr++; // past the char + maskptr++; // past the : + + /* This allows CIDR ban matching + * + * Full masked host Full unmasked host IP with/without CIDR + */ + if ((match(user->GetFullHost(), maskptr)) || (match(user->GetFullRealHost(), maskptr)) || (match(mask, maskptr, true))) + { + return true; + } + } + + return false; +} + /* Channel::PartUser * remove a channel from a users record, and return the number of users left. * Therefore, if this function returns 0 the caller should delete the Channel. @@ -492,7 +527,7 @@ long Channel::PartUser(User *user, const char* reason) return this->GetUserCounter(); } -long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents) +long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents, const char* servername) { bool silent = false; @@ -508,6 +543,9 @@ long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents) } } + if (servername == NULL || *ServerInstance->Config->HideWhoisServer) + servername = ServerInstance->Config->ServerName; + if (triggerevents) { FOREACH_MOD(I_OnUserKick,OnUserKick(NULL, user, this, reason, silent)); @@ -517,7 +555,7 @@ long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents) if (i != user->chans.end()) { if (!silent) - this->WriteChannelWithServ(ServerInstance->Config->ServerName, "KICK %s %s :%s", this->name, user->nick, reason); + this->WriteChannelWithServ(servername, "KICK %s %s :%s", this->name, user->nick, reason); user->chans.erase(i); this->RemoveAllPrefixes(user);