X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fwildcard.cpp;h=ccd2e9ec177ef88b6185e3480e3a196b7d265d77;hb=8d3a30d4c5c1cc6ebeb62630b2aa05cd26c42303;hp=aa9f52102d66e9600d0fcfa1371fe68d62c86647;hpb=11376014e3b8395c46366c7395b0daeddef8ceda;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index aa9f52102..ccd2e9ec1 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -2,67 +2,66 @@
  *       | 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-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"
 
-extern char lowermap[255];
+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.
+/* Rewritten to operate on more effective C++ std::string types
+ * rather than char* to avoid data copies.
+ * - Brain
+ */
 
-bool match(const char *str, const char *mask)
+CoreExport bool csmatch(const std::string &str, const std::string &mask)
 {
-	unsigned char *cp, *mp;
-	unsigned char* string = (unsigned char*)str;
-	unsigned char* wild = (unsigned char*)mask;
+	std::string::const_iterator cp, mp;
+
+	//unsigned char *cp = NULL, *mp = NULL;
+	//unsigned char* string = (unsigned char*)str;
+	//unsigned char* wild = (unsigned char*)mask;
+
+	std::string::const_iterator wild = mask.begin();
+	std::string::const_iterator string = str.begin();
 
-	while ((*string) && (*wild != '*'))
+	if (mask.empty())
+		return false;
+
+	while ((string != str.end()) && (wild != mask.end()) && (*wild != '*'))
 	{
-		if ((lowermap[*wild] != lowermap[*string]) && (*wild != '?'))
-		{
+		if ((*wild != *string) && (*wild != '?'))
 			return 0;
-		}
+
 		wild++;
 		string++;
 	}
 
-	while (*string)
+	while (string != str.end())
 	{
-		if (*wild == '*')
+		if (wild != mask.end() && *wild == '*')
 		{
-			if (!*++wild)
-			{
+			if (++wild == mask.end())
 				return 1;
-			}
+
 			mp = wild;
-			cp = string+1;
+			cp = string;
+
+			if (cp != str.end())
+				cp++;
 		}
 		else
-		if ((lowermap[*wild] == lowermap[*string]) || (*wild == '?'))
+		if ((string != str.end() && wild != mask.end()) && ((*wild == *string) || (*wild == '?')))
 		{
 			wild++;
 			string++;
@@ -70,16 +69,93 @@ bool match(const char *str, const char *mask)
 		else
 		{
 			wild = mp;
-			string = cp++;
+			if (cp == str.end())
+				cp = str.end();
+			else
+				string = cp++;
 		}
 
 	}
 
-	while (*wild == '*')
+	while ((wild != mask.end()) && (*wild == '*'))
+		wild++;
+
+	return wild == mask.end();
+}
+
+CoreExport bool match(const std::string &str, const std::string &mask)
+{
+	std::string::const_iterator cp, mp;
+	std::string::const_iterator wild = mask.begin();
+	std::string::const_iterator string = str.begin();
+
+	if (mask.empty())
+		return false;
+
+	while ((string != str.end()) && (wild != mask.end()) && (*wild != '*'))
 	{
+		if ((lowermap[(unsigned char)*wild] != lowermap[(unsigned char)*string]) && (*wild != '?'))
+			return 0;
+
 		wild++;
+		string++;
+	}
+
+	while (string != str.end())
+	{
+		if (wild != mask.end() && *wild == '*')
+		{
+			if (++wild == mask.end())
+				return 1;
+
+			mp = wild;
+			cp = string;
+
+			if (cp != str.end())
+				cp++;
+
+		}
+		else
+		if ((string != str.end() && wild != mask.end()) && ((lowermap[(unsigned char)*wild] == lowermap[(unsigned char)*string]) || (*wild == '?')))
+		{
+			wild++;
+			string++;
+		}
+		else
+		{
+			wild = mp;
+			if (cp == str.end())
+				string = str.end();
+			else
+				string = cp++;
+		}
+
 	}
 
-	return !*wild;
+	while ((wild != mask.end()) && (*wild == '*'))
+		wild++;
+
+	return wild == mask.end();
+}
+
+/* Overloaded function that has the option of using cidr */
+CoreExport bool match(const std::string &str, const std::string &mask, bool use_cidr_match)
+{
+	if (use_cidr_match && MatchCIDR(str, mask, true))
+		return true;
+	return match(str, mask);
+}
+
+CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &mask, bool use_cidr_match)
+{
+	if (use_cidr_match && MatchCIDR(str, mask, true))
+		return true;
+
+	return case_sensitive ? csmatch(str, mask) : match(str, mask);
+}
+
+CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &mask)
+{
+	return case_sensitive ? csmatch(str, mask) : match(str, mask);
 }