]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/hashcomp.cpp
Fix this so it works, passes test case. Provide a method to query for a bit and to...
[user/henk/code/inspircd.git] / src / hashcomp.cpp
index bf90eaeb8a5767be53e99321a36a23bbbf0712f7..ff2bf0572fab3bb5a8b721bb9542cb00dc74023e 100644 (file)
@@ -3,31 +3,24 @@
  *       +------------------------------------+
  *
  *  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.
  *
  * ---------------------------------------------------
  */
 
 using namespace std;
 
-#include "inspircd_config.h"
 #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];
-
 /******************************************************
  *
  * The hash functions of InspIRCd are the centrepoint
@@ -71,11 +64,11 @@ using namespace irc::sockets;
  */
 void nspace::strlower(char *n)
 {
-        if (n)
-        {
-                for (char* t = n; *t; t++)
-                        *t = lowermap[(unsigned char)*t];
-        }
+       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
@@ -87,16 +80,16 @@ size_t nspace::hash<insp_inaddr>::operator()(const insp_inaddr &a) const
 
 size_t nspace::hash<string>::operator()(const string &s) const
 {
-       char a[s.length()];
-       size_t t = 0;
-       static struct hash<const char *> strhash;
-
-       for (const char* x = s.c_str(); *x; x++, t++)   /* Faster to do it this way than */
-               a[t] = lowermap[(unsigned char)*x];     /* Seperate strlcpy and strlower */
-
-       a[t] = 0;
-
-       return strhash(a);
+       /* XXX: NO DATA COPIES! :)
+        * The hash function here is practically
+        * a copy of the one in STL's hash_fun.h,
+        * only with *x replaced with lowermap[*x].
+        * This avoids a copy to use hash<const char*>
+        */
+       register size_t t = 0;
+       for (std::string::const_iterator x = s.begin(); x != s.end(); ++x) /* ++x not x++, as its faster */
+               t = 5 * t + lowermap[(unsigned char)*x];
+       return t;
 }
 
 bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) const
@@ -128,9 +121,7 @@ bool irc::InAddr_HashComp::operator()(const insp_inaddr &s1, const insp_inaddr &
  * std::string which is not only case-insensitive but
  * can also do scandanavian comparisons, e.g. { = [, etc.
  *
- * This class depends on the global 'lowermap' which is
- * initialized at startup by inspircd.cpp, and contains
- * the 'scandanavian' casemappings for fast irc compare.
+ * This class depends on the const array 'lowermap'.
  *
  ******************************************************/
 
@@ -211,10 +202,6 @@ 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();
@@ -230,6 +217,11 @@ const std::string irc::tokenstream::GetToken()
 
        while (n != tokens.end())
        {
+               /** Skip multi space, converting "  " into " "
+                */
+               while ((n+1 != tokens.end()) && (*n == ' ') && (*(n+1) == ' '))
+                       n++;
+
                if ((last_pushed) && (*n == ':'))
                {
                        /* If we find a token thats not the first and starts with :,
@@ -248,7 +240,12 @@ const std::string irc::tokenstream::GetToken()
                         */
                        last_starting_position = n+1;
                        last_pushed = true;
-                       return std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
+
+                       std::string strip(lsp, n+1 == tokens.end() ? n+1  : n++);
+                       while ((strip.length()) && (strip.find_last_of(' ') == strip.length() - 1))
+                               strip.erase(strip.end() - 1);
+
+                       return strip;
                }
 
                n++;
@@ -256,22 +253,27 @@ const std::string irc::tokenstream::GetToken()
        return "";
 }
 
-irc::commasepstream::commasepstream(const std::string &source) : tokens(source)
+irc::sepstream::sepstream(const std::string &source, char seperator) : tokens(source), sep(seperator)
 {
        last_starting_position = tokens.begin();
        n = tokens.begin();
 }
 
-const std::string irc::commasepstream::GetToken()
+const std::string irc::sepstream::GetToken()
 {
        std::string::iterator lsp = last_starting_position;
 
        while (n != tokens.end())
        {
-               if ((*n == ',') || (n+1 == tokens.end()))
+               if ((*n == sep) || (n+1 == tokens.end()))
                {
                        last_starting_position = n+1;
-                       return std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
+                       std::string strip = std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
+
+                       while ((strip.length()) && (strip.find_last_of(sep) == strip.length() - 1))
+                               strip.erase(strip.end() - 1);
+
+                       return strip;
                }
 
                n++;
@@ -280,6 +282,305 @@ const std::string irc::commasepstream::GetToken()
        return "";
 }
 
-irc::commasepstream::~commasepstream()
+irc::sepstream::~sepstream()
+{
+}
+
+std::string irc::hex(const unsigned char *raw, size_t rawsz)
+{
+       if (!rawsz)
+               return "";
+
+       char buf[rawsz*2+1];
+       size_t i;
+
+       for (i = 0; i < rawsz; i++)
+       {
+               sprintf (&(buf[i*2]), "%02x", raw[i]);
+       }
+       buf[i*2] = 0;
+
+       return buf;
+}
+
+const char* irc::Spacify(char* n)
+{
+       static char x[MAXBUF];
+       strlcpy(x,n,MAXBUF);
+       for (char* y = x; *y; y++)
+               if (*y == '_')
+                       *y = ' ';
+       return x;
+}
+
+
+irc::modestacker::modestacker(bool add) : adding(add)
+{
+       sequence.clear();
+       sequence.push_back("");
+}
+
+void irc::modestacker::Push(char modeletter, const std::string &parameter)
+{
+       *(sequence.begin()) += modeletter;
+       sequence.push_back(parameter);
+}
+
+void irc::modestacker::Push(char modeletter)
+{
+       this->Push(modeletter,"");
+}
+
+void irc::modestacker::PushPlus()
+{
+       this->Push('+',"");
+}
+
+void irc::modestacker::PushMinus()
+{
+       this->Push('-',"");
+}
+
+int irc::modestacker::GetStackedLine(std::deque<std::string> &result)
+{
+       int n = 0;
+       result.clear();
+       result.push_back(adding ? "+" : "-");
+
+       while (!sequence[0].empty() && (sequence.size() > 1) && (result.size() < MAXMODES+1))
+       {
+               result[0] += *(sequence[0].begin());
+               if (!sequence[1].empty())
+                       result.push_back(sequence[1]);
+               sequence[0].erase(sequence[0].begin());
+               sequence.erase(sequence.begin() + 1);
+               n++;
+       }
+
+       return n;
+}
+
+irc::stringjoiner::stringjoiner(const std::string &seperator, const std::vector<std::string> &sequence, int begin, int end)
+{
+       for (int v = begin; v < end; v++)
+               joined.append(sequence[v]).append(seperator);
+       joined.append(sequence[end]);
+}
+
+irc::stringjoiner::stringjoiner(const std::string &seperator, const std::deque<std::string> &sequence, int begin, int end)
+{
+       for (int v = begin; v < end; v++)
+               joined.append(sequence[v]).append(seperator);
+       joined.append(sequence[end]);
+}
+
+irc::stringjoiner::stringjoiner(const std::string &seperator, const char** sequence, int begin, int end)
+{
+       for (int v = begin; v < end; v++)
+               joined.append(sequence[v]).append(seperator);
+       joined.append(sequence[end]);
+}
+
+std::string& irc::stringjoiner::GetJoined()
+{
+       return joined;
+}
+
+irc::portparser::portparser(const std::string &source, bool allow_overlapped) : in_range(0), range_begin(0), range_end(0), overlapped(allow_overlapped)
+{
+       sep = new irc::commasepstream(source);
+       overlap_set.clear();
+}
+
+irc::portparser::~portparser()
+{
+       delete sep;
+}
+
+bool irc::portparser::Overlaps(long val)
+{
+       if (!overlapped)
+               return false;
+
+       if (overlap_set.find(val) == overlap_set.end())
+       {
+               overlap_set[val] = true;
+               return false;
+       }
+       else
+               return true;
+}
+
+long irc::portparser::GetToken()
+{
+       if (in_range > 0)
+       {
+               in_range++;
+               if (in_range <= range_end)
+               {
+                       if (!Overlaps(in_range))
+                       {
+                               return in_range;
+                       }
+                       else
+                       {
+                               while (((Overlaps(in_range)) && (in_range <= range_end)))
+                                       in_range++;
+                               
+                               if (in_range <= range_end)
+                                       return in_range;
+                       }
+               }
+               else
+                       in_range = 0;
+       }
+
+       std::string x = sep->GetToken();
+
+       if (x == "")
+               return 0;
+
+       while (Overlaps(atoi(x.c_str())))
+       {
+               x = sep->GetToken();
+
+               if (x == "")
+                       return 0;
+       }
+
+       std::string::size_type dash = x.rfind('-');
+       if (dash != std::string::npos)
+       {
+               std::string sbegin = x.substr(0, dash);
+               std::string send = x.substr(dash+1, x.length());
+               range_begin = atoi(sbegin.c_str());
+               range_end = atoi(send.c_str());
+
+               if ((range_begin > 0) && (range_end > 0) && (range_begin < 65536) && (range_end < 65536) && (range_begin < range_end))
+               {
+                       in_range = range_begin;
+                       return in_range;
+               }
+               else
+               {
+                       /* Assume its just the one port */
+                       return atoi(sbegin.c_str());
+               }
+       }
+       else
+       {
+               return atoi(x.c_str());
+       }
+}
+
+irc::dynamicbitmask::dynamicbitmask()
+{
+       /* We start with 4 bytes allocated which is room
+        * for 4 items. Something makes me doubt its worth
+        * allocating less than 4 bytes.
+        */
+       bits_size = 4;
+       bits = new unsigned char[bits_size];
+       freebits = new unsigned char[bits_size];
+       memset(bits, 0, bits_size);
+       memset(freebits, 0, bits_size);
+}
+
+irc::dynamicbitmask::~dynamicbitmask()
 {
+       /* Tidy up the entire used memory on delete */
+       delete[] bits;
+       delete[] freebits;
 }
+                         
+irc::bitfield irc::dynamicbitmask::Allocate()
+{
+       for (size_t i = 0; i < bits_size; i++)
+       {
+               for (unsigned char current_pos = 1; current_pos; current_pos = current_pos << 1)
+               {
+                       if (!(freebits[i] & current_pos))
+                       {
+                               freebits[i] |= current_pos;
+                               printf("Just allocate at %d:%2x\n", i, current_pos);
+                               return std::make_pair(i, current_pos);
+                       }
+               }
+       }
+       printf("Grow set to size %d\n", bits_size + 1);
+       /* We dont have any free space left, increase by one */
+       int old_bits_size = bits_size;
+       bits_size++;
+       /* Allocate new bitfield space */
+       unsigned char* temp_bits = new unsigned char[bits_size];
+       unsigned char* temp_freebits = new unsigned char[bits_size];
+       /* Copy the old data in */
+       memcpy(temp_bits, bits, old_bits_size);
+       memcpy(temp_freebits, freebits, old_bits_size);
+       /* Delete the old data pointers */
+       delete[] bits;
+       delete[] freebits;
+       /* Swap the pointers over so now the new 
+        * pointers point to our member values
+        */
+       bits = temp_bits;
+       freebits = temp_freebits;
+       /* Initialize the new byte on the end of
+        * the bitfields, pre-allocate the one bit
+        * for this allocation
+        */
+       bits[old_bits_size] = 0;
+       freebits[old_bits_size] = 1;
+       /* We already know where we just allocated
+        * the bitfield, so no loop needed
+        */
+       return std::make_pair(old_bits_size, 1);
+}
+
+bool irc::dynamicbitmask::Deallocate(irc::bitfield &pos)
+{
+       /* We dont bother to shrink the bitfield
+        * on deallocation, the most we could do
+        * is save one byte (!) and this would cost
+        * us a loop (ugly O(n) stuff) so we just
+        * clear the bit and leave the memory
+        * claimed -- nobody will care about one
+        * byte.
+        */
+       if (pos.first < bits_size)
+       {
+               freebits[pos.first] &= ~pos.second;
+               return true;
+       }
+       /* They gave a bitfield outside of the
+        * length of our array. BAD programmer.
+        */
+       return false;
+}
+
+void irc::dynamicbitmask::Toggle(irc::bitfield &pos, bool state)
+{
+       if (pos.first < bits_size)
+       {
+               if (state)
+                       /* Set state, OR the state in */
+                       bits[pos.first] |= pos.second;
+               else
+                       /* Clear state, AND the !state out */
+                       bits[pos.first] &= ~pos.second;
+       }
+}
+
+bool irc::dynamicbitmask::Get(irc::bitfield &pos)
+{
+       if (pos.first < bits_size)
+               return (bits[pos.first] & pos.second);
+       else
+               return false;
+}
+
+size_t irc::dynamicbitmask::GetSize()
+{
+       return bits_size;
+}
+