*c++;
}
+ std::string s = this->FormatNoticeMasks();
+ if (s.length() == 0)
+ {
+ this->modes[UM_SNOMASK] = false;
+ }
+
return output;
}
try
{
bool cached = false;
- const char* sip = this->GetIPString(false);
+ const char* sip = this->GetIPString();
UserResolver *res_reverse;
- /* Special case for 4in6 (Have i mentioned i HATE 4in6?) */
- if (!strncmp(sip, "0::ffff:", 8))
- res_reverse = new UserResolver(this->ServerInstance, this, sip + 8, DNS_QUERY_PTR4, cached);
- else
- res_reverse = new UserResolver(this->ServerInstance, this, sip, this->GetProtocolFamily() == AF_INET ? DNS_QUERY_PTR4 : DNS_QUERY_PTR6, cached);
+ QueryType resolvtype = strchr(sip, ':') ? DNS_QUERY_PTR6 : DNS_QUERY_PTR4;
+ // when GetProtocolFamily() works correctly with 4in6, this can be replaced by
+ // this->GetProtocolFamily() == AF_INET ? DNS_QUERY_PTR4 : DNS_QUERY_PTR6;
+ res_reverse = new UserResolver(this->ServerInstance, this, sip, resolvtype, cached);
this->ServerInstance->AddResolver(res_reverse, cached);
}
User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance)
{
server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
- reset_due = ServerInstance->Time();
age = ServerInstance->Time();
Penalty = 0;
- lines_in = lastping = signon = idle_lastmsg = nping = registered = 0;
+ lastping = signon = idle_lastmsg = nping = registered = 0;
bytes_in = bytes_out = cmds_in = cmds_out = 0;
- quietquit = OverPenalty = ExemptFromPenalty = quitting = exempt = haspassed = dns_done = false;
+ quietquit = quitting = exempt = haspassed = dns_done = false;
fd = -1;
recvq.clear();
sendq.clear();
bool User::IsInvited(const irc::string &channel)
{
- time_t now = time(NULL);
+ time_t now = ServerInstance->Time();
InvitedList::iterator safei;
for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
{
InvitedList* User::GetInviteList()
{
- time_t now = time(NULL);
+ time_t now = ServerInstance->Time();
/* Weed out expired invites here. */
InvitedList::iterator safei;
for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
void User::InviteTo(const irc::string &channel, time_t invtimeout)
{
- time_t now = time(NULL);
+ time_t now = ServerInstance->Time();
if (invtimeout != 0 && now > invtimeout) return; /* Don't add invites that are expired from the get-go. */
for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
{
}
}
- if (this->MyClass && (recvq.length() > this->MyClass->GetRecvqMax()))
+ if (this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && recvq.length() > this->MyClass->GetRecvqMax())
{
ServerInstance->Users->QuitUser(this, "RecvQ exceeded");
ServerInstance->SNO->WriteToSnoMask('A', "User %s RecvQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)recvq.length(),this->MyClass->GetRecvqMax());
if (this->quitting)
return;
- if (this->MyClass && (sendq.length() + data.length() > this->MyClass->GetSendqMax()))
+ if (this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && sendq.length() + data.length() > this->MyClass->GetSendqMax())
{
/*
* Fix by brain - Set the error text BEFORE calling, because
return ""; // unused, but oh well
}
-const char* User::GetIPString(bool translate4in6)
+const char* User::GetIPString()
{
static char buf[40];
{
strlcpy(&temp[1], buf, sizeof(temp) - 1);
*temp = '0';
- if (translate4in6 && !strncmp(temp, "0::ffff:", 8))
- {
- this->cachedip = temp + 8;
- return temp + 8;
- }
-
this->cachedip = temp;
return temp;
}
FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(this,shost));
if (MOD_RESULT)
return false;
- FOREACH_MOD(I_OnChangeHost,OnChangeHost(this,shost));
}
+ FOREACH_MOD(I_OnChangeHost, OnChangeHost(this,shost));
+
int MOD_RESULT = 0;
FOREACH_RESULT(I_OnHostCycle, OnHostCycle(this));
{
ConnectClass* c = *i;
+ if (c->GetDisabled())
+ continue; // can't possibly match, removed from conf
+
if (explicit_name == c->GetName())
{
ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Explicitly set to %s", explicit_name.c_str());
ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "DENY %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str());
}
+ /* if it's disabled, we can't match this one. */
+ if (c->GetDisabled())
+ {
+ ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Class disabled");
+ continue;
+ }
+
/* check if host matches.. */
if (!InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) &&
!InspIRCd::MatchCIDR(this->host, c->GetHost(), NULL))