From c16cda5d715241bb4bff8050bee942a8a34a72c0 Mon Sep 17 00:00:00 2001 From: w00t Date: Thu, 21 Aug 2008 20:56:16 +0000 Subject: match() is no longer a function+no header, now a static method of InspIRCd class, blah blah blah. Also rip out the 1.2 matcher, as it was slow, and replace it with one adapted from znc, which happens to be a tiny bit faster than 1.1's (and the fastest I've seen so far that works properly) git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10212 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/users.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/users.cpp') diff --git a/src/users.cpp b/src/users.cpp index f631420fe..943503ff1 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -16,7 +16,6 @@ #include "inspircd.h" #include #include "socketengine.h" -#include "wildcard.h" #include "xline.h" #include "bancache.h" #include "commands/cmd_whowas.h" @@ -1811,7 +1810,8 @@ ConnectClass* User::SetClass(const std::string &explicit_name) } /* check if host matches.. */ - if (((!match(this->GetIPString(),c->GetHost(),true)) && (!match(this->host,c->GetHost())))) + if (!InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) && + !InspIRCd::MatchCIDR(this->host, c->GetHost(), NULL)) { ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "No host match (for %s)", c->GetHost().c_str()); continue; -- cgit v1.3.1-10-gc9f91