X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=23d4928a627873607f3670c20df54828b26e4866;hb=11f73970236f910a63ff77fbc8e2ee4a8ee23bc3;hp=ee485591f9ba182ef5a93f0ddef505d42300c175;hpb=8942c3cd3217e5c68f01e3cb344709971921fc97;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index ee485591f..23d4928a6 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -3,38 +3,23 @@
  *       +------------------------------------+
  *
  *  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"
-#ifdef GCC3
 #include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-
-#ifdef GCC3
 #define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
-
-// from helperfuncs.cpp
-extern const char lowermap[255];
 
 /******************************************************
  *
@@ -60,39 +45,73 @@ 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;
+using namespace irc::sockets;
 
-size_t nspace::hash<in_addr>::operator()(const struct in_addr &a) const
+/* 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)
 {
-        size_t q;
-        memcpy(&q,&a,sizeof(size_t));
-        return q;
+	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
+{
+	size_t q;
+	memcpy(&q,&a,sizeof(size_t));
+	return q;
 }
 
 size_t nspace::hash<string>::operator()(const string &s) const
 {
-        char a[MAXBUF];
-        static struct hash<const char *> strhash;
-        strlcpy(a,s.c_str(),MAXBUF);
-        strlower(a);
-        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
 {
-	irc::string a = s1.c_str();
-	irc::string b = s2.c_str();
-        return (a == b);
+	unsigned char* n1 = (unsigned char*)s1.c_str();
+	unsigned char* n2 = (unsigned char*)s2.c_str();
+	for (; *n1 && *n2; n1++, n2++)
+		if (lowermap[*n1] != lowermap[*n2])
+			return false;
+	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
 {
-        return (s1.s_addr == s1.s_addr);
+#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
 }
 
 /******************************************************
@@ -102,39 +121,37 @@ bool irc::InAddr_HashComp::operator()(const in_addr &s1, const in_addr &s2) cons
  * 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'.
  *
  ******************************************************/
 
 bool irc::irc_char_traits::eq(char c1st, char c2nd)
 {
-	return lowermap[(unsigned)c1st] == lowermap[(unsigned)c2nd];
+	return lowermap[(unsigned char)c1st] == lowermap[(unsigned char)c2nd];
 }
 
 bool irc::irc_char_traits::ne(char c1st, char c2nd)
 {
-	return lowermap[(unsigned)c1st] != lowermap[(unsigned)c2nd];
+	return lowermap[(unsigned char)c1st] != lowermap[(unsigned char)c2nd];
 }
 
 bool irc::irc_char_traits::lt(char c1st, char c2nd)
 {
-	return lowermap[(unsigned)c1st] < lowermap[(unsigned)c2nd];
+	return lowermap[(unsigned char)c1st] < lowermap[(unsigned char)c2nd];
 }
 
 int irc::irc_char_traits::compare(const char* str1, const char* str2, size_t n)
 {
 	for(unsigned int i = 0; i < n; i++)
 	{
-		if(lowermap[(unsigned)*str1] > lowermap[(unsigned)*str2])
-       	        	return 1;
+		if(lowermap[(unsigned char)*str1] > lowermap[(unsigned char)*str2])
+       			return 1;
 
-		if(lowermap[(unsigned)*str1] < lowermap[(unsigned)*str2])
-	               	return -1;
+		if(lowermap[(unsigned char)*str1] < lowermap[(unsigned char)*str2])
+		       	return -1;
 
-	        if(*str1 == 0 || *str2 == 0)
-	              	return 0;
+		if(*str1 == 0 || *str2 == 0)
+		      	return 0;
 
 	       	str1++;
 		str2++;
@@ -152,19 +169,19 @@ irc::string operator+ (irc::string& leftval, std::string& rightval)
 	return leftval + irc::string(rightval.c_str());
 }
 
-std::string operator== (std::string& leftval, irc::string& rightval)
+bool operator== (std::string& leftval, irc::string& rightval)
 {
 	return (leftval == std::string(rightval.c_str()));
 }
 
-irc::string operator== (irc::string& leftval, std::string& rightval)
+bool operator== (irc::string& leftval, std::string& rightval)
 {
-	return (rightval == irc::string(leftval.c_str()));
+	return (rightval == std::string(leftval.c_str()));
 }
 
 const char* irc::irc_char_traits::find(const char* s1, int  n, char c)
 {
-	while(n-- > 0 && lowermap[(unsigned)*s1] != lowermap[(unsigned)c])
+	while(n-- > 0 && lowermap[(unsigned char)*s1] != lowermap[(unsigned char)c])
 		s1++;
 	return s1;
 }
@@ -182,3 +199,372 @@ std::istream& operator>>(std::istream &is, irc::string &str)
 	str = tmp.c_str();
 	return is;
 }
+
+irc::tokenstream::tokenstream(const std::string &source) : tokens(source), last_pushed(false)
+{
+	/* Record starting position and current position */
+	last_starting_position = tokens.begin();
+	n = tokens.begin();
+}
+
+irc::tokenstream::~tokenstream()
+{
+}
+
+const std::string irc::tokenstream::GetToken()
+{
+	std::string::iterator lsp = last_starting_position;
+
+	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 :,
+			 * this is the last token on the line
+			 */
+			std::string::iterator curr = ++n;
+			n = tokens.end();
+			return std::string(curr, tokens.end());
+		}
+
+		last_pushed = false;
+
+		if ((*n == ' ') || (n+1 == tokens.end()))
+		{
+			/* If we find a space, or end of string, this is the end of a token.
+			 */
+			last_starting_position = n+1;
+			last_pushed = true;
+
+			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++;
+	}
+	return "";
+}
+
+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::sepstream::GetToken()
+{
+	std::string::iterator lsp = last_starting_position;
+
+	while (n != tokens.end())
+	{
+		if ((*n == sep) || (n+1 == tokens.end()))
+		{
+			last_starting_position = n+1;
+			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++;
+	}
+
+	return "";
+}
+
+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() : bits_size(4)
+{
+	/* We start with 4 bytes allocated which is room
+	 * for 4 items. Something makes me doubt its worth
+	 * allocating less than 4 bytes.
+	 */
+	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;
+				return std::make_pair(i, current_pos);
+			}
+		}
+	}
+	/* 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;
+	bits[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;
+	}
+}
+