Just to mess with om's head, remove helperfuncs.h from everywhere

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

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 213d51ffb2d417c66086ad46a171e4c34f47c36c..d4f9e53d646caf6097364ed31a5379be2ddc6d70 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -3,13 +3,13 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *             <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -20,13 +20,12 @@ using namespace std;
 #include "inspircd.h"
 #include <string>
 #include "hashcomp.h"
-#include "helperfuncs.h"
+
 #include <ext/hash_map>
 
 #define nspace __gnu_cxx
 
-// from helperfuncs.cpp
-extern const char lowermap[255];
+char lowermap[255];
 
 /******************************************************
  *
@@ -58,6 +57,25 @@ extern const char lowermap[255];
  ******************************************************/
 
 using namespace std;
+using namespace irc::sockets;
+
+/* convert a string to lowercase. Note following special circumstances
+ * taken from RFC 1459. Many "official" server branches still hold to this
+ * rule so i will too;
+ *
+ *  Because of IRC's scandanavian origin, the characters {}| are
+ *  considered to be the lower case equivalents of the characters []\,
+ *  respectively. This is a critical issue when determining the
+ *  equivalence of two nicknames.
+ */
+void nspace::strlower(char *n)
+{
+       if (n)
+       {
+               for (char* t = n; *t; t++)
+                       *t = lowermap[(unsigned char)*t];
+       }
+}
 
 size_t nspace::hash<insp_inaddr>::operator()(const insp_inaddr &a) const
 {
@@ -68,10 +86,15 @@ size_t nspace::hash<insp_inaddr>::operator()(const insp_inaddr &a) const
 
 size_t nspace::hash<string>::operator()(const string &s) const
 {
-       char a[MAXBUF];
+       char a[s.length()];
+       size_t t = 0;
        static struct hash<const char *> strhash;
-       strlcpy(a,s.c_str(),MAXBUF);
-       strlower(a);
+
+       for (const char* x = s.c_str(); *x; x++)        /* Faster to do it this way than */
+               a[t++] = lowermap[(unsigned char)*x];   /* Seperate strlcpy and strlower */
+
+       a[t] = 0;
+
        return strhash(a);
 }
 
@@ -87,7 +110,14 @@ bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2)
 
 bool irc::InAddr_HashComp::operator()(const insp_inaddr &s1, const insp_inaddr &s2) const
 {
+#ifdef IPV6
+       for (int n = 0; n < 16; n++)
+               if (s2.s6_addr[n] != s1.s6_addr[n])
+                       return false;
+       return true;
+#else
        return (s1.s_addr == s1.s_addr);
+#endif
 }
 
 /******************************************************
@@ -180,6 +210,11 @@ std::istream& operator>>(std::istream &is, irc::string &str)
 
 irc::tokenstream::tokenstream(const std::string &source) : tokens(source), last_pushed(false)
 {
+       /* Remove trailing spaces, these muck up token parsing */
+       while (tokens.find_last_of(' ') == tokens.length() - 1)
+               tokens.erase(tokens.end() - 1);
+
+       /* Record starting position and current position */
        last_starting_position = tokens.begin();
        n = tokens.begin();
 }
@@ -247,3 +282,18 @@ const std::string irc::commasepstream::GetToken()
 irc::commasepstream::~commasepstream()
 {
 }
+
+void InspIRCd::MakeLowerMap()
+{       
+       // initialize the lowercase mapping table
+       for (unsigned char cn = 0; cn < 255; cn++)
+               lowermap[cn] = cn;
+       // lowercase the uppercase chars
+       for (unsigned char cn = 65; cn < 91; cn++)
+               lowermap[cn] = tolower(cn);
+       // now replace the specific chars for scandanavian comparison
+       lowermap[(unsigned char)'['] = '{';
+       lowermap[(unsigned char)']'] = '}';
+       lowermap[(unsigned char)'\\'] = '|';
+}
+