There is absolutely no need to cache connect timeout.

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

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 502dc89c3273ab54b8b7f82729eb342ad81faa41..b49ba943a6bc0d18f95fcd34c4417002fb6dd64f 100644 (file)
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -2,92 +2,116 @@
  *       | 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 "hashcomp.h"
 #include "inspstring.h"
 
-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.
-
-bool match(const char *str, const char *mask)
+/*
+ * Wildcard matching!
+ *
+ *  Iteration 1)
+ *   Slow, horrible, etc.
+ *     Iteration 2)
+ *   The vastly available 'public domain' one
+ *     Iteration 3)
+ *   ZNC's, thought to be faster than ours, but it turned out that we could do better ;-)
+ *     Iteration 4)
+ *   Largely from work by peavey and myself (w00t) :)
+ *     Iteration 5)
+ *   peavey: Fix glob scan similar to 1.1, but scan ahead on glob in inner loop to retain speedup
+ *   this fixes another case which we forgot to test. Add early return for obvious fail condition.
+ */
+static bool match_internal(const unsigned char *string, const unsigned char *wild, unsigned const char *map)
 {
-       unsigned char *cp, *mp;
-       unsigned char* string = (unsigned char*)str;
-       unsigned char* wild = (unsigned char*)mask;
-       extern char lowermap[255];
+       const unsigned char *s, *m; m = wild;
 
-       while ((*string) && (*wild != '*'))
-       {
-               if ((lowermap[*wild] != lowermap[*string]) && (*wild != '?'))
-               {
-                       return 0;
-               }
-               wild++;
-               string++;
-       }
+       if (*string && !*wild)
+               return false;
+
+       if (!map)
+               map = rfc_case_insensitive_map;
 
        while (*string)
        {
                if (*wild == '*')
                {
-                       if (!*++wild)
+                       while (*wild && *wild == '*')
+                               wild++;
+
+                       m = wild;
+
+                       if (!*wild)
+                               return true;
+                       else if (*wild != '?')
                        {
-                               return 1;
+                               s = string;
+                               while (*s)
+                               {
+                                       if ((map[*wild] == map[*s]))
+                                       {
+                                               string = s;
+                                               if (*(wild+1) || !*(s+1))
+                                                       wild++;
+                                               break;
+                                       }
+                                       s++;
+                               }
                        }
-                       mp = wild;
-                       cp = string+1;
                }
-               else
-               if ((lowermap[*wild] == lowermap[*string]) || (*wild == '?'))
-               {
+               else if ( (map[*wild] == map[*string]) || (*wild == '?') )
                        wild++;
-                       string++;
-               }
                else
-               {
-                       wild = mp;
-                       string = cp++;
-               }
+                       wild = m;
 
+               string++;
        }
 
-       while (*wild == '*')
-       {
+       while (*wild && *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)
+/********************************************************************
+ * Below here is all wrappers around match_internal
+ ********************************************************************/
+
+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);
+}
+
+CoreExport bool InspIRCd::Match(const  char *str, const char *mask, unsigned const char *map)
+{
+       return match_internal((const unsigned char *)str, (const unsigned char *)mask, map);
+}
+
+CoreExport bool InspIRCd::MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map)
 {
-       if (use_cidr_match && MatchCIDR(str, mask, true))
+       if (irc::sockets::MatchCIDR(str, mask, true))
                return true;
-       return match(str, mask);
+
+       // Fall back to regular match
+       return InspIRCd::Match(str, mask, NULL);
 }
+
+CoreExport bool InspIRCd::MatchCIDR(const  char *str, const char *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);
+}
+