adding = false;
break;
case '*':
- for (unsigned char d = 'A'; d <= 'z'; d++)
+ for (unsigned char d = 'a'; d <= 'z'; d++)
{
- if (ServerInstance->SNO->IsEnabled(d))
+ if (!ServerInstance->SNO->masks[d - 'a'].Description.empty())
{
if ((!IsNoticeMaskSet(d) && adding) || (IsNoticeMaskSet(d) && !adding))
{
output += d;
}
+ oldadding = adding;
+ char u = toupper(d);
+ if ((!IsNoticeMaskSet(u) && adding) || (IsNoticeMaskSet(u) && !adding))
+ {
+ if ((oldadding != adding) || (!output.length()))
+ output += (adding ? '+' : '-');
+
+ this->SetNoticeMask(u, adding);
+
+ output += u;
+ }
+ oldadding = adding;
}
- oldadding = adding;
}
break;
default:
- if ((*c >= 'A') && (*c <= 'z') && (ServerInstance->SNO->IsEnabled(*c)))
+ if (isalpha(*c))
{
if ((!IsNoticeMaskSet(*c) && adding) || (IsNoticeMaskSet(*c) && !adding))
{
catch (CoreException& e)
{
ServerInstance->Logs->Log("USERS", DEBUG,"Error in resolver: %s",e.GetReason());
+ dns_done = true;
+ ServerInstance->stats->statsDnsBad++;
}
}
if (user->quitting)
return;
}
- // Add pseudo-penalty so that we continue processing after sendq recedes
- if (user->CommandFloodPenalty == 0 && getSendQSize() >= sendqmax)
- user->CommandFloodPenalty++;
if (user->CommandFloodPenalty >= penaltymax && !user->MyClass->fakelag)
ServerInstance->Users->QuitUser(user, "Excess Flood");
}
{
this->AllowedUserModes.set();
}
- else
+ else if (*c >= 'A' && *c < 'z')
{
this->AllowedUserModes[*c - 'A'] = true;
}
{
this->AllowedChanModes.set();
}
- else
+ else if (*c >= 'A' && *c < 'z')
{
this->AllowedChanModes[*c - 'A'] = true;
}
if (!a)
{
ServerInstance->Users->QuitUser(this, "Access denied by configuration");
+ return;
}
else if (a->type == CC_DENY)
{
- ServerInstance->Users->QuitUser(this, "Unauthorised connection");
+ ServerInstance->Users->QuitUser(this, a->config->getString("reason", "Unauthorised connection"));
return;
}
else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal()))
* may put the user into a totally seperate class with different restrictions! so we *must* check again.
* Don't remove this! -- w00t
*/
+ MyClass = NULL;
SetClass();
CheckClass();
CheckLines();
if (!MOD_RESULT)
ServerInstance->CallCommandHandler(command, parameters, this);
+ if (ServerInstance->Config->RawLog)
+ WriteServ("PRIVMSG %s :*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.", nick.c_str());
+
/*
* 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.
this->GetServerPort(), this->nick.c_str(), this->ident.c_str(), this->host.c_str(), this->GetIPString(), this->fullname.c_str());
ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding NEGATIVE hit for %s", this->GetIPString());
ServerInstance->BanCache->AddHit(this->GetIPString(), "", "");
+ // reset the flood penalty (which could have been raised due to things like auto +x)
+ CommandFloodPenalty = 0;
}
void User::InvalidateCache()
return;
}
- ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%s] O %s", uuid.c_str(), text.c_str());
+ ServerInstance->Logs->Log("USEROUTPUT", RAWIO, "C[%s] O %s", uuid.c_str(), text.c_str());
eh.AddWriteBuf(text);
eh.AddWriteBuf(wide_newline);
{
for(unsigned int i=0; i < memb->modes.length(); i++)
modeline.append(" ").append(nick);
- snprintf(buffer, MAXBUF, ":%s MODE %s +%s", GetFullHost().c_str(), c->name.c_str(), modeline.c_str());
+ snprintf(buffer, MAXBUF, ":%s MODE %s +%s",
+ ServerInstance->Config->CycleHostsFromUser ? GetFullHost().c_str() : ServerInstance->Config->ServerName.c_str(),
+ c->name.c_str(), modeline.c_str());
modeline = buffer;
}
continue;
}
- if (!c->config->getString("pass").empty())
+ if (regdone && !c->config->getString("password").empty())
{
- if (ServerInstance->PassCompare(this, c->config->getString("pass"), password, c->config->getString("hash")))
+ if (ServerInstance->PassCompare(this, c->config->getString("password"), password, c->config->getString("hash")))
{
ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Bad password, skipping");
continue;
void ConnectClass::Update(const ConnectClass* src)
{
+ config = src->config;
+ type = src->type;
+ fakelag = src->fakelag;
name = src->name;
registration_timeout = src->registration_timeout;
host = src->host;
hardsendqmax = src->hardsendqmax;
recvqmax = src->recvqmax;
penaltythreshold = src->penaltythreshold;
+ commandrate = src->commandrate;
maxlocal = src->maxlocal;
maxglobal = src->maxglobal;
+ maxchans = src->maxchans;
limit = src->limit;
}