bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
{
- char buffer[MAXBUF];
char itrigger[MAXBUF];
long matches = 0;
if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0))
return false;
- for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+ for (user_hash::iterator u = clientlist->begin(); u != clientlist->end(); u++)
{
- strlcpy(buffer,u->second->ident,MAXBUF);
- charlcat(buffer,'@',MAXBUF);
- strlcat(buffer,u->second->host,MAXBUF);
- if (match(buffer,mask.c_str()))
+ if ((match(u->second->MakeHost(),mask.c_str(),true)) || (match(u->second->MakeHostIP(),mask.c_str(),true)))
+ {
matches++;
+ }
}
- float percent = ((float)matches / (float)clientlist.size()) * 100;
+
+ if (!matches)
+ return false;
+
+ float percent = ((float)matches / (float)clientlist->size()) * 100;
if (percent > (float)atof(itrigger))
{
WriteOpers("*** \2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick,mask.c_str(),percent);
if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0))
return false;
- for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+ for (user_hash::iterator u = clientlist->begin(); u != clientlist->end(); u++)
{
if (match(u->second->GetIPString(),ip.c_str(),true))
matches++;
}
-
- float percent = ((float)matches / (float)clientlist.size()) * 100;
+
+ if (!matches)
+ return false;
+
+ float percent = ((float)matches / (float)clientlist->size()) * 100;
if (percent > (float)atof(itrigger))
{
WriteOpers("*** \2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick,ip.c_str(),percent);
if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0))
return false;
- for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+ for (user_hash::iterator u = clientlist->begin(); u != clientlist->end(); u++)
{
if (match(u->second->nick,nick.c_str()))
matches++;
}
-
- float percent = ((float)matches / (float)clientlist.size()) * 100;
+
+ if (!matches)
+ return false;
+
+ float percent = ((float)matches / (float)clientlist->size()) * 100;
if (percent > (float)atof(itrigger))
{
WriteOpers("*** \2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick,nick.c_str(),percent);