X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fwildcard.cpp;h=f888b68cfb7943883d54ab7d86bb73ba264c1161;hb=b0e469b0bbdbc76692364e1f52ef613cc02a2a06;hp=1b1f874ab41ba410b41d4f04bfd220894ab578ce;hpb=792f8a011a9aceb3dc0a83770f9b39786f8cc90a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 1b1f874ab..f888b68cf 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -2,27 +2,21 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 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;
-
 #include <string>
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "helperfuncs.h"
+#include "hashcomp.h"
 #include "inspstring.h"
 
-extern char lowermap[255];
+using irc::sockets::MatchCIDR;
 
 // Wed 27 Apr 2005 - Brain
 // I've taken our our old wildcard routine -
@@ -34,9 +28,12 @@ extern char lowermap[255];
 // (unattributed to any author) all over the 'net.
 // For now, we'll just consider this public domain.
 
-int wildcmp(char *wild, char *string)
+bool csmatch(const char *str, const char *mask)
 {
-	char *cp, *mp;
+	unsigned char *cp = NULL, *mp = NULL;
+	unsigned char* string = (unsigned char*)str;
+	unsigned char* wild = (unsigned char*)mask;
+
 	while ((*string) && (*wild != '*'))
 	{
 		if ((*wild != *string) && (*wild != '?'))
@@ -59,7 +56,7 @@ int wildcmp(char *wild, char *string)
 			cp = string+1;
 		}
 		else
-		if ((lowermap[(unsigned)*wild] == lowermap[(unsigned)*string]) || (*wild == '?'))
+		if ((*wild == *string) || (*wild == '?'))
 		{
 			wild++;
 			string++;
@@ -80,14 +77,72 @@ int wildcmp(char *wild, char *string)
 	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.
+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++;
+	}
+
+	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;
+}
+
+/* Overloaded function that has the option of using cidr */
+bool match(const char *str, const char *mask, bool use_cidr_match)
+{
+	if (use_cidr_match && MatchCIDR(str, mask, true))
+		return true;
+	return match(str, mask);
+}
+
+bool match(bool case_sensitive, const char *str, const char *mask, bool use_cidr_match)
+{
+	if (use_cidr_match && MatchCIDR(str, mask, true))
+		return true;
+	return csmatch(str, mask);
+}
 
-bool match(const char* literal, const char* mask)
+bool match(bool case_sensitive, const char *str, const char *mask)
 {
-	return wildcmp((char*)mask, (char*)literal);
+	return case_sensitive ? csmatch(str, mask) : match(str, mask);
 }