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

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 47fbaf002..f888b68cf 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 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.
  *
@@ -15,104 +12,137 @@
  */
 
 #include <string>
-#include "inspircd_config.h"
 #include "inspircd.h"
+#include "hashcomp.h"
 #include "inspstring.h"
 
-void Delete(char* str,int pos)
-{
-	char moo[MAXBUF];
-	strlcpy(moo,str,MAXBUF);
-	moo[pos] = '\0';
-	strlcpy(str,moo,MAXBUF);
-	strlcat(str,moo+pos+1,MAXBUF);
-}
+using irc::sockets::MatchCIDR;
 
-void Insert(char* substr,char* str,int pos)
+// 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 csmatch(const char *str, const char *mask)
 {
-	std::string a = str;
-	a.insert(pos,substr);
-	strlcpy(str,a.c_str(),MAXBUF);
-}
+	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 != '?'))
+		{
+			return 0;
+		}
+		wild++;
+		string++;
+	}
 
-int MWC = 0;
+	while (*string)
+	{
+		if (*wild == '*')
+		{
+			if (!*++wild)
+			{
+				return 1;
+			}
+			mp = wild;
+			cp = string+1;
+		}
+		else
+		if ((*wild == *string) || (*wild == '?'))
+		{
+			wild++;
+			string++;
+		}
+		else
+		{
+			wild = mp;
+			string = cp++;
+		}
 
-bool match2(char* literal,char* 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))
-   {
-     strlcpy(OldM,mask,MAXBUF);
-     
-     Delete(mask,I);
-     
-     while (strlen(mask)<255)
-     {
-       match2(literal,mask);
-       if (MWC==2)
-	       return 1;
-
-       Insert("?",mask,I);
-     }
-     strlcpy(mask,OldM,MAXBUF);
-     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;
+	while (*wild == '*')
+	{
+		wild++;
+	}
 
+	return !*wild;
 }
 
-bool match(const char* literal, const char* mask)
+bool match(const char *str, const char *mask)
 {
-	char L[10240];
-	char M[10240];
-	MWC = 0;
-	strlcpy(L,literal,10240);
-	strlcpy(M,mask,10240);
-	strlower(L);
-	strlower(M);
-	// short circuit literals
-	log(DEBUG,"Match '%s' to '%s'",L,M);
-	if ((!strchr(M,'*')) && (!strchr(M,'?')))
+	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)
 	{
-		log(DEBUG,"Short circuiting literal");
-		if (!strcasecmp(L,M))
+		if (*wild == '*')
+		{
+			if (!*++wild)
+			{
+				return 1;
+			}
+			mp = wild;
+			cp = string+1;
+		}
+		else
+		if ((lowermap[*wild] == lowermap[*string]) || (*wild == '?'))
 		{
-			log(DEBUG,"Literal match");
-			return true;
+			wild++;
+			string++;
 		}
+		else
+		{
+			wild = mp;
+			string = cp++;
+		}
+
+	}
+
+	while (*wild == '*')
+	{
+		wild++;
 	}
-	match2(L,M);
-	return (MWC == 2);
+
+	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(bool case_sensitive, const char *str, const char *mask)
+{
+	return case_sensitive ? csmatch(str, mask) : match(str, mask);
 }