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

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index f99054939..63a28b8cb 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,76 +11,93 @@
  * ---------------------------------------------------
  */
 
-#include <string>
+/* $Core */
+
 #include "inspircd.h"
 #include "hashcomp.h"
 #include "inspstring.h"
 
-using irc::sockets::MatchCIDR;
+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;
+        unsigned char* wild = (unsigned char*)mask;
+
+	if (!map)
+		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++;
+                }
 
-// 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)
+        while (*wild == '*')
+        {
+                wild++;
+        }
+
+        return !*wild;
+}
+
+/********************************************************************
+ * Below here is all wrappers around match_internal
+ ********************************************************************/
+
+CoreExport bool InspIRCd::Match(const std::string &str, const std::string &mask, unsigned const char *map)
 {
-	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++;
-	}
-
-	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++;
-	}
-
-	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 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;
-	return match(str, 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)
+{
+	if (irc::sockets::MatchCIDR(str, mask, true))
+		return true;
+
+	// Fall back to regular match
+	return InspIRCd::Match(str, mask, NULL);
+}
+