#include "hashcomp.h"
#include "inspstring.h"
-/*
- * Wildcard matching!
- *
- * Iteration 1)
- * Slow, horrible, etc.
- * Iteration 2)
- * The vastly available 'public domain' one
- * Iteration 3)
- * ZNC's, thought to be faster than ours, but it turned out that we could do better ;-)
- * Iteration 4)
- * Largely from work by peavey and myself (w00t) :)
- *
- */
-static bool match_internal(const unsigned char *string, const unsigned char *wild, unsigned const char *map)
+static bool match_internal(const unsigned char *str, const unsigned char *mask, unsigned const char *map)
{
- const unsigned char* s;
+ unsigned char *cp = NULL, *mp = NULL;
+ unsigned char* string = (unsigned char*)str;
+ unsigned char* wild = (unsigned char*)mask;
if (!map)
- map = lowermap;
-
- while (*string)
- {
- if (*wild == '*')
- {
- while (*wild && *wild == '*')
- wild++;
-
- if (!*wild)
- return true;
- else if (*wild != '?')
- {
- s = string;
- while (*s)
- {
- if ((map[*wild] == map[*s]))
- {
- string = s;
- if (*(wild+1) || !*(s+1))
- {
- wild++;
- break;
- }
- }
- s++;
- }
- }
- }
- else if ( (map[*wild] != map[*string]) && (*wild != '?') )
- {
- return false;
- }
- else
- wild++;
-
- string++;
- }
-
- while (*wild && *wild == '*')
- wild++;
-
- return !*wild;
+ map = rfc_case_insensitive_map;
+
+ while ((*string) && (*wild != '*'))
+ {
+ if ((map[*wild] != map[*string]) && (*wild != '?'))
+ {
+ return 0;
+ }
+ wild++;
+ string++;
+ }
+
+ while (*string)
+ {
+ if (*wild == '*')
+ {
+ if (!*++wild)
+ {
+ return 1;
+ }
+ mp = wild;
+ cp = string+1;
+ }
+ else
+ if ((map[*wild] == map[*string]) || (*wild == '?'))
+ {
+ wild++;
+ string++;
+ }
+ else
+ {
+ wild = mp;
+ string = cp++;
+ }
+
+ }
+
+ while (*wild == '*')
+ {
+ wild++;
+ }
+
+ return !*wild;
}
/********************************************************************
return match_internal((const unsigned char *)str, (const unsigned char *)mask, map);
}
-
CoreExport bool InspIRCd::MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map)
{
if (irc::sockets::MatchCIDR(str, mask, true))