Fix global session checks

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

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 08fbc8e2f0f0a81157f1112b912e9bdc309549fa..9b3b5b5b1c8b64dce75c99149dd46cc127a6ee09 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -52,14 +52,14 @@ extern const char lowermap[255];
  * be considered the lowercase of {, } and |.
  *
  * This file also contains hashing methods for hashing
- * in_addr structs, we use this if we want to cache IP
+ * insp_inaddr structs, we use this if we want to cache IP
  * addresses.
  *
  ******************************************************/
 
 using namespace std;
 
-size_t nspace::hash<in_addr>::operator()(const struct in_addr &a) const
+size_t nspace::hash<insp_inaddr>::operator()(const insp_inaddr &a) const
 {
        size_t q;
        memcpy(&q,&a,sizeof(size_t));
@@ -85,9 +85,16 @@ bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2)
        return (lowermap[*n1] == lowermap[*n2]);
 }
 
-bool irc::InAddr_HashComp::operator()(const in_addr &s1, const in_addr &s2) const
+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
 }
 
 /******************************************************
@@ -178,46 +185,72 @@ std::istream& operator>>(std::istream &is, irc::string &str)
        return is;
 }
 
-irc::tokenstream::tokenstream(std::string &source)
+irc::tokenstream::tokenstream(const std::string &source) : tokens(source), last_pushed(false)
+{
+       last_starting_position = tokens.begin();
+       n = tokens.begin();
+}
+
+irc::tokenstream::~tokenstream()
+{
+}
+
+const std::string irc::tokenstream::GetToken()
 {
-       std::string::iterator last_starting_position = source.begin();
-       bool last_pushed = false;
+       std::string::iterator lsp = last_starting_position;
 
-       for (std::string::iterator n = source.begin(); n != source.end(); n++)
+       while (n != tokens.end())
        {
                if ((last_pushed) && (*n == ':'))
                {
                        /* If we find a token thats not the first and starts with :,
                         * this is the last token on the line
                         */
-                       tokens.push_back(std::string(n+1, source.end()));
-                       break;
+                       std::string::iterator curr = ++n;
+                       n = tokens.end();
+                       return std::string(curr, tokens.end());
                }
 
                last_pushed = false;
 
-               if ((*n == ' ') || (n+1 == source.end()))
+               if ((*n == ' ') || (n+1 == tokens.end()))
                {
                        /* If we find a space, or end of string, this is the end of a token.
                         */
-                       tokens.push_back(std::string(last_starting_position, n+1 == source.end() ? n+1  : n));
                        last_starting_position = n+1;
                        last_pushed = true;
+                       return std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
                }
+
+               n++;
        }
+       return "";
 }
 
-irc::tokenstream::~tokenstream()
+irc::commasepstream::commasepstream(const std::string &source) : tokens(source)
 {
+       last_starting_position = tokens.begin();
+       n = tokens.begin();
 }
 
-unsigned int irc::tokenstream::GetNumTokens()
+const std::string irc::commasepstream::GetToken()
 {
-       return tokens.size();
+       std::string::iterator lsp = last_starting_position;
+
+       while (n != tokens.end())
+       {
+               if ((*n == ',') || (n+1 == tokens.end()))
+               {
+                       last_starting_position = n+1;
+                       return std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
+               }
+
+               n++;
+       }
+
+       return "";
 }
 
-const std::string& irc::tokenstream::GetToken(unsigned int index)
+irc::commasepstream::~commasepstream()
 {
-       return tokens[index];
 }
-