* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
* ---------------------------------------------------
*/
-#include <string>
+/* $Core */
+
#include "inspircd.h"
#include "hashcomp.h"
#include "inspstring.h"
-using irc::sockets::MatchCIDR;
-
-// Wed 27 Apr 2005 - Brain
-// I've taken our our old wildcard routine -
-// although comprehensive, it was topheavy and very
-// slow, and ate masses of cpu when doing lots of
-// comparisons. This is the 'de-facto' routine used
-// by many, nobody really knows who wrote it first
-// or what license its under, i've seen examples of it
-// (unattributed to any author) all over the 'net.
-// For now, we'll just consider this public domain.
-
-bool csmatch(const char *str, const char *mask)
+static bool match_internal(const unsigned char *str, const unsigned char *mask, unsigned const char *map)
{
unsigned char *cp = NULL, *mp = NULL;
unsigned char* string = (unsigned char*)str;
while ((*string) && (*wild != '*'))
{
- if ((*wild != *string) && (*wild != '?'))
+ if ((map[*wild] != map[*string]) && (*wild != '?'))
{
return 0;
}
cp = string+1;
}
else
- if ((*wild == *string) || (*wild == '?'))
- {
- wild++;
- string++;
- }
- else
- {
- wild = mp;
- string = cp++;
- }
+ if ((map[*wild] == map[*string]) || (*wild == '?'))
+ {
+ wild++;
+ string++;
+ }
+ else
+ {
+ wild = mp;
+ string = cp++;
+ }
}
return !*wild;
}
-bool match(const char *str, const char *mask)
-{
- unsigned char *cp = NULL, *mp = NULL;
- unsigned char* string = (unsigned char*)str;
- unsigned char* wild = (unsigned char*)mask;
-
- while ((*string) && (*wild != '*'))
- {
- if ((lowermap[*wild] != lowermap[*string]) && (*wild != '?'))
- {
- return 0;
- }
- wild++;
- string++;
- }
+/********************************************************************
+ * Below here is all wrappers around match_internal
+ ********************************************************************/
- while (*string)
- {
- if (*wild == '*')
- {
- if (!*++wild)
- {
- return 1;
- }
- mp = wild;
- cp = string+1;
- }
- else
- if ((lowermap[*wild] == lowermap[*string]) || (*wild == '?'))
- {
- wild++;
- string++;
- }
- else
- {
- wild = mp;
- string = cp++;
- }
-
- }
-
- while (*wild == '*')
- {
- wild++;
- }
+CoreExport bool InspIRCd::Match(const std::string &str, const std::string &mask, unsigned const char *map)
+{
+ if (!map)
+ map = national_case_insensitive_map;
- return !*wild;
+ return match_internal((const unsigned char *)str.c_str(), (const unsigned char *)mask.c_str(), map);
}
-/* Overloaded function that has the option of using cidr */
-bool match(const char *str, const char *mask, bool use_cidr_match)
+CoreExport bool InspIRCd::Match(const char *str, const char *mask, unsigned const char *map)
{
- if (use_cidr_match && MatchCIDR(str, mask, true))
- return true;
- return match(str, mask);
+ if (!map)
+ map = national_case_insensitive_map;
+ return match_internal((const unsigned char *)str, (const unsigned char *)mask, map);
}
-bool match(bool case_sensitive, const char *str, const char *mask, bool use_cidr_match)
+CoreExport bool InspIRCd::MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map)
{
- if (use_cidr_match && MatchCIDR(str, mask, true))
+ if (irc::sockets::MatchCIDR(str, mask, true))
return true;
- return csmatch(str, mask);
+
+ if (!map)
+ map = national_case_insensitive_map;
+
+ // Fall back to regular match
+ return InspIRCd::Match(str, mask, map);
}
-bool match(bool case_sensitive, const char *str, const char *mask)
+CoreExport bool InspIRCd::MatchCIDR(const char *str, const char *mask, unsigned const char *map)
{
- return case_sensitive ? csmatch(str, mask) : match(str, mask);
+ if (irc::sockets::MatchCIDR(str, mask, true))
+ return true;
+
+ if (!map)
+ map = national_case_insensitive_map;
+
+ // Fall back to regular match
+ return InspIRCd::Match(str, mask, map);
}