X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fwildcard.cpp;h=2df7a5bec10e769b3e3445e8ebc18132fbfaee0c;hb=82bf46fa061a4f18071e73756e4e0d618eb57320;hp=900f314ea3a264b2e36084ab9505178ce5a359c9;hpb=73b9d0c5cb02f0ea8350de28bc3687e0af70ea0f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 900f314ea..2df7a5bec 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -1,90 +1,161 @@
-#include <string>
-#include "inspircd_config.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
+
+/* $Core: libIRCDwildcard */
+
 #include "inspircd.h"
+#include "hashcomp.h"
+#include "inspstring.h"
+
+using irc::sockets::MatchCIDR;
+
+/* Rewritten to operate on more effective C++ std::string types
+ * rather than char* to avoid data copies.
+ * - Brain
+ */
 
-void Delete(char* str,int pos)
+CoreExport bool csmatch(const std::string &str, const std::string &mask)
 {
-	char moo[MAXBUF];
-	strcpy(moo,str);
-	moo[pos] = '\0';
-	strcpy(str,moo);
-	strcat(str,moo+pos+1);
+	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();
+
+	if (mask.empty())
+		return false;
+
+	while ((string != str.end()) && (wild != mask.end()) && (*wild != '*'))
+	{
+		if ((*wild != *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()) && ((*wild == *string) || (*wild == '?')))
+		{
+			wild++;
+			string++;
+		}
+		else
+		{
+			wild = mp;
+			if (cp == str.end())
+				cp = str.end();
+			else
+				string = cp++;
+		}
+
+	}
+
+	while ((wild != mask.end()) && (*wild == '*'))
+		wild++;
+
+	return wild == mask.end();
 }
 
-void Insert(char* substr,char* str,int pos)
+CoreExport bool match(const std::string &str, const std::string &mask)
 {
-	string a = str;
-	a.insert(pos,substr);
-	strcpy(str,a.c_str());
-}
+	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++;
 
-int MWC = 0;
+		}
+		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++;
+		}
 
-bool match2(char* literal,char* mask)
+	}
+
+	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);
+}
 
-char OldM[MAXBUF];
-int I,I2;
-
-if (MWC)
-	return true;
-
-if ((strstr(mask,"*")==0) && (strlen(literal) != strlen(mask)))
-	return 0;
- I=0;
- I2=0;
- while (I < strlen(mask))
- {
-   if (I2 >= strlen(literal))
-	   return 0;
- 
-   if ((mask[I]=='*') && (MWC==0))
-   {
-     strcpy(OldM,mask);
-     
-     Delete(mask,I);
-     
-     while (strlen(mask)<255)
-     {
-       match2(literal,mask);
-       if (MWC==2)
-	       return 1;
-
-       Insert("?",mask,I);
-     }
-     strcpy(mask,OldM);
-     Delete(mask,I);
-     Insert("?",mask,I);
-   }
-   if (mask[I]=='?')
-   {
-     I++;
-     I2++;
-     continue;
-   }
-   if (mask[I] != literal[I2])
-	   return 0;
-   if (MWC)
-	   return 1;
-   I++;
-   I2++;
- }
- if (strlen(literal)==strlen(mask))
-		 MWC=2;
+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);
 }
 
-bool match(char* literal, char* mask)
+CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &mask)
 {
-	char L[10240];
-	char M[10240];
-	MWC = 0;
-	strncpy(L,literal,10240);
-	strncpy(M,mask,10240);
-	strlower(L);
-	strlower(M);
-	match2(L,M);
-	return (MWC == 2);
+	return case_sensitive ? csmatch(str, mask) : match(str, mask);
 }