* +------------------------------------+
*
* 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
* 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)
+{
+ 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));
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++, so we don't hash the \0 */
+ t = 5 * t + lowermap[(unsigned char)*x];
+ return size_t(t);
}
bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) const
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
}
/******************************************************
* 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'.
*
******************************************************/
return is;
}
-irc::tokenstream::tokenstream(std::string &source) : tokens(source), last_pushed(false)
+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();
-
- /*for (std::string::iterator n = source.begin(); n != source.end(); 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
- *
- tokens.push_back(new std::string(n+1, source.end()));
- break;
- }
-
- last_pushed = false;
-
- if ((*n == ' ') || (n+1 == source.end()))
- {
- * If we find a space, or end of string, this is the end of a token.
-
- tokens.push_back(new std::string(last_starting_position, n+1 == source.end() ? n+1 : n));
- last_starting_position = n+1;
- last_pushed = true;
- }
- }*/
}
irc::tokenstream::~tokenstream()
{
}
-/*unsigned int irc::tokenstream::GetNumTokens()
-{
- return tokens.size();
-}*/
-
const std::string irc::tokenstream::GetToken()
{
std::string::iterator lsp = last_starting_position;
/* If we find a token thats not the first and starts with :,
* this is the last token on the line
*/
- return std::string(n+1, tokens.end());
+ std::string::iterator curr = ++n;
+ n = tokens.end();
+ return std::string(curr, tokens.end());
}
last_pushed = false;
*/
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++;
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 ¶meter)
+{
+ *(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;
+}
+
projects / user / henk / code / inspircd.git / blobdiff