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 --- include/inspircd.h | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'include/inspircd.h') diff --git a/include/inspircd.h b/include/inspircd.h index 81a9f3cbe..85800f4da 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -712,14 +712,21 @@ class CoreExport InspIRCd : public classbase */ void SendMode(const std::vector& parameters, User *user); - /** Match two strings using pattern matching. - * This operates identically to the global function match(), - * except for that it takes std::string arguments rather than - * const char* ones. - * @param sliteral The literal string to match against - * @param spattern The pattern to match against. CIDR and globs are supported. - */ - bool MatchText(const std::string &sliteral, const std::string &spattern); + /** Match two strings using pattern matching, optionally, with a map + * to check case against (may be NULL). + * @param str The literal string to match against + * @param mask The glob pattern to match against. + */ + static bool Match(const std::string &str, const std::string &mask, unsigned const char *map); + static bool Match(const char *str, const char *mask, unsigned const char *map); + + /** Match two strings using pattern matching, optionally, with a map + * to check case against (may be NULL). Supports CIDR patterns as well as globs. + * @param str The literal string to match against + * @param mask The glob or CIDR pattern to match against. + */ + static bool MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map); + static bool MatchCIDR(const char *str, const char *mask, unsigned const char *map); /** Call the handler for a given command. * @param commandname The command whos handler you wish to call -- cgit v1.2.3