* +------------------------------------+
*
* 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"
+
#include <ext/hash_map>
#define nspace __gnu_cxx
-// 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;
+
+/* 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<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));
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);
}
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
}
/******************************************************
return is;
}
-irc::tokenstream::tokenstream(std::string &source)
+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 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];
+}
+
+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