#include <cstdarg>
#include "mode.h"
-Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts)
+Channel::Channel(const std::string &cname, time_t ts)
{
chan_hash::iterator findchan = ServerInstance->chanlist->find(cname);
- if (findchan != Instance->chanlist->end())
+ if (findchan != ServerInstance->chanlist->end())
throw CoreException("Cannot create duplicate channel " + cname);
(*(ServerInstance->chanlist))[cname.c_str()] = this;
ModResult res;
/* 0: check status, 1: don't, -1: disallow change silently */
- FIRST_MOD_RESULT(ServerInstance, OnPreTopicChange, res, (u,this,ntopic));
+ FIRST_MOD_RESULT(OnPreTopicChange, res, (u,this,ntopic));
if (res == MOD_RES_DENY)
return CMD_FAILURE;
void Channel::SetDefaultModes()
{
- ServerInstance->Logs->Log("CHANNELS", DEBUG, "SetDefaultModes %s", ServerInstance->Config->DefaultModes);
+ ServerInstance->Logs->Log("CHANNELS", DEBUG, "SetDefaultModes %s",
+ ServerInstance->Config->DefaultModes.c_str());
irc::spacesepstream list(ServerInstance->Config->DefaultModes);
std::string modeseq;
std::string parameter;
* add a channel to a user, creating the record for it if needed and linking
* it to the user record
*/
-Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool override, const char* key, bool bursting, time_t TS)
+Channel* Channel::JoinUser(User *user, const char* cn, bool override, const char* key, bool bursting, time_t TS)
{
// Fix: unregistered users could be joined using /SAJOIN
if (!user || !cn || user->registered != REG_ALL)
{
if (user->HasPrivPermission("channels/high-join-limit"))
{
- if (user->chans.size() >= Instance->Config->OperMaxChans)
+ if (user->chans.size() >= ServerInstance->Config->OperMaxChans)
{
user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn);
return NULL;
}
}
- strlcpy(cname, cn, Instance->Config->Limits.ChanMax);
- Ptr = Instance->FindChan(cname);
+ strlcpy(cname, cn, ServerInstance->Config->Limits.ChanMax);
+ Ptr = ServerInstance->FindChan(cname);
bool created_by_local = false;
if (!Ptr)
if (!IS_LOCAL(user))
{
if (!TS)
- Instance->Logs->Log("CHANNEL",DEBUG,"*** BUG *** Channel::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick.c_str(), cn);
+ ServerInstance->Logs->Log("CHANNEL",DEBUG,"*** BUG *** Channel::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick.c_str(), cn);
}
else
{
if (IS_LOCAL(user) && override == false)
{
ModResult MOD_RESULT;
- FIRST_MOD_RESULT(Instance, OnUserPreJoin, MOD_RESULT, (user, NULL, cname, privs, key ? key : ""));
+ FIRST_MOD_RESULT(OnUserPreJoin, MOD_RESULT, (user, NULL, cname, privs, key ? key : ""));
if (MOD_RESULT == MOD_RES_DENY)
return NULL;
}
- Ptr = new Channel(Instance, cname, TS);
+ Ptr = new Channel(cname, TS);
}
else
{
if (IS_LOCAL(user) && override == false)
{
ModResult MOD_RESULT;
- FIRST_MOD_RESULT(Instance, OnUserPreJoin, MOD_RESULT, (user, Ptr, cname, privs, key ? key : ""));
+ FIRST_MOD_RESULT(OnUserPreJoin, MOD_RESULT, (user, Ptr, cname, privs, key ? key : ""));
if (MOD_RESULT == MOD_RES_DENY)
{
return NULL;
{
std::string ckey = Ptr->GetModeParameter('k');
bool invited = user->IsInvited(Ptr->name.c_str());
- bool can_bypass = Instance->Config->InvBypassModes && invited;
+ bool can_bypass = ServerInstance->Config->InvBypassModes && invited;
if (!ckey.empty())
{
- FIRST_MOD_RESULT(Instance, OnCheckKey, MOD_RESULT, (user, Ptr, key ? key : ""));
+ FIRST_MOD_RESULT(OnCheckKey, MOD_RESULT, (user, Ptr, key ? key : ""));
if (!MOD_RESULT.check((key && ckey == key) || can_bypass))
{
// If no key provided, or key is not the right one, and can't bypass +k (not invited or option not enabled)
if (Ptr->IsModeSet('i'))
{
- FIRST_MOD_RESULT(Instance, OnCheckInvite, MOD_RESULT, (user, Ptr));
+ FIRST_MOD_RESULT(OnCheckInvite, MOD_RESULT, (user, Ptr));
if (!MOD_RESULT.check(invited))
{
user->WriteNumeric(ERR_INVITEONLYCHAN, "%s %s :Cannot join channel (Invite only)",user->nick.c_str(), Ptr->name.c_str());
std::string limit = Ptr->GetModeParameter('l');
if (!limit.empty())
{
- FIRST_MOD_RESULT(Instance, OnCheckLimit, MOD_RESULT, (user, Ptr));
+ FIRST_MOD_RESULT(OnCheckLimit, MOD_RESULT, (user, Ptr));
if (!MOD_RESULT.check((Ptr->GetUserCounter() < atol(limit.c_str()) || can_bypass)))
{
user->WriteNumeric(ERR_CHANNELISFULL, "%s %s :Cannot join channel (Channel is full)",user->nick.c_str(), Ptr->name.c_str());
Ptr->SetDefaultModes();
}
- return Channel::ForceChan(Instance, Ptr, user, privs, bursting, created_by_local);
+ return Channel::ForceChan(Ptr, user, privs, bursting, created_by_local);
}
-Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting, bool created)
+Channel* Channel::ForceChan(Channel* Ptr, User* user, const std::string &privs, bool bursting, bool created)
{
std::string nick = user->nick;
for (std::string::const_iterator x = privs.begin(); x != privs.end(); x++)
{
const char status = *x;
- ModeHandler* mh = Instance->Modes->FindMode(status, MODETYPE_CHANNEL);
+ ModeHandler* mh = ServerInstance->Modes->FindMode(status, MODETYPE_CHANNEL);
if (mh)
{
/* Set, and make sure that the mode handler knows this mode was now set */
Ptr->SetPrefix(user, mh->GetModeChar(), true);
- mh->OnModeChange(Instance->FakeClient, Instance->FakeClient, Ptr, nick, true);
+ mh->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, Ptr, nick, true);
}
}
CUList except_list;
- FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(memb, bursting, created, except_list));
+ FOREACH_MOD(I_OnUserJoin,OnUserJoin(memb, bursting, created, except_list));
Ptr->WriteAllExcept(user, false, 0, except_list, "JOIN :%s", Ptr->name.c_str());
/* 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);
+ std::string ms = ServerInstance->Modes->ModeString(user, Ptr);
if ((Ptr->GetUserCounter() > 1) && (ms.length()))
Ptr->WriteAllExceptSender(user, true, 0, "MODE %s +%s", Ptr->name.c_str(), ms.c_str());
}
Ptr->UserList(user);
}
- FOREACH_MOD_I(Instance,I_OnPostJoin,OnPostJoin(memb));
+ FOREACH_MOD(I_OnPostJoin,OnPostJoin(memb));
return Ptr;
}
bool Channel::IsBanned(User* user)
{
ModResult result;
- DO_EACH_HOOK(ServerInstance, OnCheckBan, ModResult modresult, (user, this))
- {
- result = result + modresult;
- }
- WHILE_EACH_HOOK(ServerInstance, OnCheckBan);
+ FIRST_MOD_RESULT(OnCheckChannelBan, result, (user, this));
if (result != MOD_RES_PASSTHRU)
return (result == MOD_RES_DENY);
- char mask[MAXBUF];
- snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
{
- if ((InspIRCd::Match(user->GetFullHost(),i->data, NULL)) || // host
- (InspIRCd::Match(user->GetFullRealHost(),i->data, NULL)) || // uncloaked host
- (InspIRCd::MatchCIDR(mask, i->data, NULL))) // ip
- {
+ if (CheckBan(user, i->data))
return true;
- }
}
return false;
}
-ModResult Channel::GetExtBanStatus(const std::string &str, char type)
+bool Channel::CheckBan(User* user, const std::string& mask)
{
ModResult result;
- DO_EACH_HOOK(ServerInstance, OnCheckStringExtBan, ModResult modresult, (str, this, type))
- {
- result = result + modresult;
- }
- WHILE_EACH_HOOK(ServerInstance, OnCheckStringExtBan);
-
+ FIRST_MOD_RESULT(OnCheckBan, result, (user, this, mask));
if (result != MOD_RES_PASSTHRU)
- return result;
+ return (result == MOD_RES_DENY);
- // nobody decided for us, check the ban list
- for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
- {
- if (i->data[0] != type || i->data[1] != ':')
- continue;
+ // extbans were handled above, if this is one it obviously didn't match
+ if (mask[1] == ':')
+ return false;
- std::string maskptr = i->data.substr(2);
- ServerInstance->Logs->Log("EXTBANS", DEBUG, "Checking %s against %s, type is %c", str.c_str(), maskptr.c_str(), type);
+ std::string::size_type at = mask.find('@');
+ if (at == std::string::npos)
+ return false;
- if (InspIRCd::Match(str, maskptr, NULL))
- return MOD_RES_DENY;
+ char tomatch[MAXBUF];
+ snprintf(tomatch, MAXBUF, "%s!%s", user->nick.c_str(), user->ident.c_str());
+ std::string prefix = mask.substr(0, at);
+ if (InspIRCd::Match(tomatch, prefix, NULL))
+ {
+ std::string suffix = mask.substr(at + 1);
+ if (InspIRCd::Match(user->host, suffix, NULL) ||
+ InspIRCd::Match(user->dhost, suffix, NULL) ||
+ InspIRCd::MatchCIDR(user->GetIPString(), suffix, NULL))
+ return true;
}
-
- return MOD_RES_PASSTHRU;
+ return false;
}
ModResult Channel::GetExtBanStatus(User *user, char type)
{
ModResult rv;
- DO_EACH_HOOK(ServerInstance, OnCheckExtBan, ModResult modresult, (user, this, type))
- {
- rv = rv + modresult;
- }
- WHILE_EACH_HOOK(ServerInstance, OnCheckExtBan);
-
+ FIRST_MOD_RESULT(OnExtBanCheck, rv, (user, this, type));
if (rv != MOD_RES_PASSTHRU)
return rv;
-
- char mask[MAXBUF];
- snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
-
- rv = rv + this->GetExtBanStatus(mask, type);
- rv = rv + this->GetExtBanStatus(user->GetFullHost(), type);
- rv = rv + this->GetExtBanStatus(user->GetFullRealHost(), type);
- return rv;
+ for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
+ {
+ if (i->data[0] == type && i->data[1] == ':')
+ {
+ std::string val = i->data.substr(2);
+ if (CheckBan(user, val))
+ return MOD_RES_DENY;
+ }
+ }
+ return MOD_RES_PASSTHRU;
}
/* Channel::PartUser
if (iter != ServerInstance->chanlist->end())
{
ModResult res;
- FIRST_MOD_RESULT(ServerInstance, OnChannelPreDelete, res, (this));
+ FIRST_MOD_RESULT(OnChannelPreDelete, res, (this));
if (res == MOD_RES_DENY)
return 1; // delete halted by module
FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
return this->GetUserCounter();
}
-long Channel::ServerKickUser(User* user, const char* reason, const char* servername)
+long Channel::ServerKickUser(User* user, const char* reason, const std::string& servername)
{
- if (servername == NULL || *ServerInstance->Config->HideWhoisServer)
- servername = ServerInstance->Config->ServerName;
+ if (servername.empty() || !ServerInstance->Config->HideWhoisServer.empty())
+ ServerInstance->FakeClient->server = ServerInstance->Config->ServerName;
+ else
+ ServerInstance->FakeClient->server = servername;
- ServerInstance->FakeClient->server = servername;
return this->KickUser(ServerInstance->FakeClient, user, reason);
}
if (ServerInstance->ULine(src->server))
res = MOD_RES_ALLOW;
else
- FIRST_MOD_RESULT(ServerInstance, OnUserPreKick, res, (src,memb,reason));
+ FIRST_MOD_RESULT(OnUserPreKick, res, (src,memb,reason));
if (res == MOD_RES_DENY)
return this->GetUserCounter();
if (iter != ServerInstance->chanlist->end())
{
ModResult res;
- FIRST_MOD_RESULT(ServerInstance, OnChannelPreDelete, res, (this));
+ FIRST_MOD_RESULT(OnChannelPreDelete, res, (this));
if (res == MOD_RES_DENY)
return 1; // delete halted by module
FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
}
}
-void Channel::WriteChannelWithServ(const char* ServName, const char* text, ...)
+void Channel::WriteChannelWithServ(const std::string& ServName, const char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
this->WriteChannelWithServ(ServName, std::string(textbuffer));
}
-void Channel::WriteChannelWithServ(const char* ServName, const std::string &text)
+void Channel::WriteChannelWithServ(const std::string& ServName, const std::string &text)
{
char tb[MAXBUF];
- snprintf(tb,MAXBUF,":%s %s", ServName ? ServName : ServerInstance->Config->ServerName, text.c_str());
+ snprintf(tb,MAXBUF,":%s %s", ServName.empty() ? ServerInstance->Config->ServerName.c_str() : ServName.c_str(), text.c_str());
std::string out = tb;
for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
{
char tb[MAXBUF];
- snprintf(tb,MAXBUF,":%s %s", serversource ? ServerInstance->Config->ServerName : user->GetFullHost().c_str(), text.c_str());
+ snprintf(tb,MAXBUF,":%s %s", serversource ? ServerInstance->Config->ServerName.c_str() : user->GetFullHost().c_str(), text.c_str());
std::string out = tb;
this->RawWriteAllExcept(user, serversource, status, except_list, std::string(tb));
if (!IS_LOCAL(user))
return;
- FIRST_MOD_RESULT(ServerInstance, OnUserList, call_modules, (user, this));
+ FIRST_MOD_RESULT(OnUserList, call_modules, (user, this));
if (call_modules != MOD_RES_ALLOW)
{
projects / user / henk / code / inspircd.git / blobdiff