* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
* This program is free but copyrighted software; see
* the file COPYING for details.
*
* ---------------------------------------------------
*/
-using namespace std;
+/* $Core */
-#include <string>
-#include "inspircd_config.h"
#include "inspircd.h"
-#include "helperfuncs.h"
+#include "hashcomp.h"
#include "inspstring.h"
-// 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.
-
-int wildcmp(char *wild, char *string)
+/*
+ * 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) :)
+ * Iteration 5)
+ * peavey: Fix glob scan similar to 1.1, but scan ahead on glob in inner loop to retain speedup
+ * this fixes another case which we forgot to test. Add early return for obvious fail condition.
+ */
+static bool match_internal(const unsigned char *string, const unsigned char *wild, unsigned const char *map)
{
- char *cp, *mp;
- while ((*string) && (*wild != '*'))
- {
- if ((*wild != *string) && (*wild != '?'))
- {
- return 0;
- }
- wild++;
- string++;
- }
+ const unsigned char *s, *m; m = wild;
+
+ if (*string && !*wild)
+ return false;
+
+ if (!map)
+ map = rfc_case_insensitive_map;
while (*string)
{
if (*wild == '*')
{
- if (!*++wild)
+ while (*wild && *wild == '*')
+ wild++;
+
+ m = wild;
+
+ if (!*wild)
+ return true;
+ else if (*wild != '?')
{
- return 1;
+ s = string;
+ while (*s)
+ {
+ if ((map[*wild] == map[*s]))
+ {
+ string = s;
+ if (*(wild+1) || !*(s+1))
+ wild++;
+ break;
+ }
+ s++;
+ }
}
- mp = wild;
- cp = string+1;
}
- else
- if ((*wild == *string) || (*wild == '?'))
- {
+ else if ( (map[*wild] == map[*string]) || (*wild == '?') )
wild++;
- string++;
- }
else
- {
- wild = mp;
- string = cp++;
- }
+ wild = m;
+ string++;
}
- while (*wild == '*')
- {
+ while (*wild && *wild == '*')
wild++;
- }
return !*wild;
}
-// This wrapper function is required to convert both
-// strings to 'scandanavian lowercase' and make copies
-// of them to a safe location. It also ensures we don't
-// bite off more than we can chew with the length of
-// the string.
+/********************************************************************
+ * Below here is all wrappers around match_internal
+ ********************************************************************/
+
+CoreExport bool InspIRCd::Match(const std::string &str, const std::string &mask, unsigned const char *map)
+{
+ return match_internal((const unsigned char *)str.c_str(), (const unsigned char *)mask.c_str(), map);
+}
+
+CoreExport bool InspIRCd::Match(const char *str, const char *mask, unsigned const char *map)
+{
+ 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))
+ return true;
-bool match(const char* literal, const char* mask)
+ // Fall back to regular match
+ return InspIRCd::Match(str, mask, NULL);
+}
+
+CoreExport bool InspIRCd::MatchCIDR(const char *str, const char *mask, unsigned const char *map)
{
- static char L[10240];
- static char M[10240];
- strlcpy(L,literal,10240);
- strlcpy(M,mask,10240);
- strlower(L);
- strlower(M);
- return wildcmp(M,L);
+ if (irc::sockets::MatchCIDR(str, mask, true))
+ return true;
+
+ // Fall back to regular match
+ return InspIRCd::Match(str, mask, NULL);
}
+