Braunvieh!

[user/henk/code/inspircd.git] / src / wildcard.cpp

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 1b1f874ab41ba410b41d4f04bfd220894ab578ce..63a28b8cb797fe2e25bb9e4d8e94847c530752ec 100644 (file)
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -2,92 +2,102 @@
  *       | 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];
+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++;
+                }
+
+        }
+
+        while (*wild == '*')
+        {
+                wild++;
+        }
+
+        return !*wild;
+}
+
+/********************************************************************
+ * Below here is all wrappers around match_internal
+ ********************************************************************/
 
-// 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.
+CoreExport bool InspIRCd::Match(const std::string &str, const std::string &mask, unsigned const char *map)
+{
+       return match_internal((const unsigned char *)str.c_str(), (const unsigned char *)mask.c_str(), map);
+}
 
-int wildcmp(char *wild, char *string)
+CoreExport bool InspIRCd::Match(const  char *str, const char *mask, unsigned const char *map)
 {
-       char *cp, *mp;
-       while ((*string) && (*wild != '*'))
-       {
-               if ((*wild != *string) && (*wild != '?'))
-               {
-                       return 0;
-               }
-               wild++;
-               string++;
-       }
-
-       while (*string)
-       {
-               if (*wild == '*')
-               {
-                       if (!*++wild)
-                       {
-                               return 1;
-                       }
-                       mp = wild;
-                       cp = string+1;
-               }
-               else
-               if ((lowermap[(unsigned)*wild] == lowermap[(unsigned)*string]) || (*wild == '?'))
-               {
-                       wild++;
-                       string++;
-               }
-               else
-               {
-                       wild = mp;
-                       string = cp++;
-               }
-
-       }
-
-       while (*wild == '*')
-       {
-               wild++;
-       }
-
-       return !*wild;
+       return match_internal((const unsigned char *)str, (const unsigned char *)mask, map);
 }
 
-// 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.
+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;
+
+       // Fall back to regular match
+       return InspIRCd::Match(str, mask, NULL);
+}
 
-bool match(const char* literal, const char* mask)
+CoreExport bool InspIRCd::MatchCIDR(const  char *str, const char *mask, unsigned const char *map)
 {
-       return wildcmp((char*)mask, (char*)literal);
+       if (irc::sockets::MatchCIDR(str, mask, true))
+               return true;
+
+       // Fall back to regular match
+       return InspIRCd::Match(str, mask, NULL);
 }