* +------------------------------------+
*
* 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.
*
* ---------------------------------------------------
*/
#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];
+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);
+ char a[s.length()];
+ size_t t = 0;
+ static struct hash<const char *> strhash;
+
+ 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);
}
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
}
/******************************************************
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++;
return 0;
}
+std::string operator+ (std::string& leftval, irc::string& rightval)
+{
+ return leftval + std::string(rightval.c_str());
+}
+
+irc::string operator+ (irc::string& leftval, std::string& rightval)
+{
+ return leftval + irc::string(rightval.c_str());
+}
+
+bool operator== (std::string& leftval, irc::string& rightval)
+{
+ return (leftval == std::string(rightval.c_str()));
+}
+
+bool operator== (irc::string& leftval, std::string& rightval)
+{
+ 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;
}
+
+/* See hashcomp.h if you care about these... */
+std::ostream& operator<<(std::ostream &os, const irc::string &str)
+{
+ return os << str.c_str();
+}
+
+std::istream& operator>>(std::istream &is, irc::string &str)
+{
+ std::string tmp;
+ is >> tmp;
+ str = tmp.c_str();
+ return is;
+}
+
+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();
+}
+
+irc::tokenstream::~tokenstream()
+{
+}
+
+const std::string irc::tokenstream::GetToken()
+{
+ std::string::iterator lsp = last_starting_position;
+
+ 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
+ */
+ 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;
+ return std::string(lsp, n+1 == tokens.end() ? n+1 : n++);
+ }
+
+ n++;
+ }
+ return "";
+}
+
+irc::commasepstream::commasepstream(const std::string &source) : tokens(source)
+{
+ last_starting_position = tokens.begin();
+ n = tokens.begin();
+}
+
+const std::string irc::commasepstream::GetToken()
+{
+ 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 "";
+}
+
+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)'\\'] = '|';
+}
+
projects / user / henk / code / inspircd.git / blobdiff