diff options
| author | w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-08-21 20:56:16 +0000 |
|---|---|---|
| committer | w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-08-21 20:56:16 +0000 |
| commit | c16cda5d715241bb4bff8050bee942a8a34a72c0 (patch) | |
| tree | 145095fad6904382ecf6775dedc5c981d406a61a /src/cidr.cpp | |
| parent | 5e3bfa266bd99ac15fd621c6e14d12787ba22f6e (diff) | |
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
Diffstat (limited to 'src/cidr.cpp')
| -rw-r--r-- | src/cidr.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/cidr.cpp b/src/cidr.cpp index fb4ab447b..91f4d0237 100644 --- a/src/cidr.cpp +++ b/src/cidr.cpp @@ -14,7 +14,6 @@ /* $Core */ #include "inspircd.h" -#include "wildcard.h" /* Used when comparing CIDR masks for the modulus bits left over. * A lot of ircd's seem to do this: @@ -91,7 +90,7 @@ bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr * symbols, and recursively call MatchCIDR without * username matching enabled to match the host part. */ - return (match(address.substr(0, username_addr_pos), cidr_mask.substr(0, username_mask_pos)) && + return (InspIRCd::Match(address.substr(0, username_addr_pos), cidr_mask.substr(0, username_mask_pos), NULL) && MatchCIDR(address.substr(username_addr_pos + 1), cidr_mask.substr(username_mask_pos + 1), false)); } else |