X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fwildcard.cpp;h=00ccac2a87dced7615f94574b354b64e8202a4cf;hb=e11ae4f39cbcd169e725b680015d73c127f4a70e;hp=f99054939056b230550e27aebf3dffc45f8c9292;hpb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index f99054939..00ccac2a8 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,24 +11,13 @@
  * ---------------------------------------------------
  */
 
-#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 match(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;
@@ -36,7 +25,7 @@ bool match(const char *str, const char *mask)
 
 	while ((*string) && (*wild != '*'))
 	{
-		if ((lowermap[*wild] != lowermap[*string]) && (*wild != '?'))
+		if ((map[*wild] != map[*string]) && (*wild != '?'))
 		{
 			return 0;
 		}
@@ -56,16 +45,16 @@ bool match(const char *str, const char *mask)
 			cp = string+1;
 		}
 		else
-		if ((lowermap[*wild] == lowermap[*string]) || (*wild == '?'))
-		{
-			wild++;
-			string++;
-		}
-		else
-		{
-			wild = mp;
-			string = cp++;
-		}
+			if ((map[*wild] == map[*string]) || (*wild == '?'))
+			{
+				wild++;
+				string++;
+			}
+			else
+			{
+				wild = mp;
+				string = cp++;
+			}
 
 	}
 
@@ -77,10 +66,46 @@ bool match(const char *str, const char *mask)
 	return !*wild;
 }
 
-/* Overloaded function that has the option of using cidr */
-bool match(const char *str, const char *mask, bool use_cidr_match)
+/********************************************************************
+ * Below here is all wrappers around match_internal
+ ********************************************************************/
+
+CoreExport bool InspIRCd::Match(const std::string &str, const std::string &mask, unsigned const char *map)
 {
-	if (use_cidr_match && MatchCIDR(str, mask, true))
+	if (!map)
+		map = national_case_insensitive_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)
+{
+	if (!map)
+		map = national_case_insensitive_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;
+
+	if (!map)
+		map = national_case_insensitive_map;
+
+	// Fall back to regular match
+	return InspIRCd::Match(str, mask, map);
+}
+
+CoreExport bool InspIRCd::MatchCIDR(const  char *str, const char *mask, unsigned const char *map)
+{
+	if (irc::sockets::MatchCIDR(str, mask, true))
 		return true;
-	return match(str, mask);
+
+	if (!map)
+		map = national_case_insensitive_map;
+
+	// Fall back to regular match
+	return InspIRCd::Match(str, mask, map);
 }
+