X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=04c24418c5424f7d0ac620ace63bf4fa4d4f2079;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=23d4928a627873607f3670c20df54828b26e4866;hpb=11f73970236f910a63ff77fbc8e2ee4a8ee23bc3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index 23d4928a6..04c24418c 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.cpp @@ -2,24 +2,20 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * - * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; +/* $Core */ #include "inspircd.h" #include "hashcomp.h" -#include -#define nspace __gnu_cxx +#include "hash_map.h" /****************************************************** * @@ -44,15 +40,8 @@ using namespace std; * Scandanavian Comparisons: The characters [, ], \ will * be considered the lowercase of {, } and |. * - * This file also contains hashing methods for hashing - * 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; @@ -67,51 +56,53 @@ void nspace::strlower(char *n) if (n) { for (char* t = n; *t; t++) - *t = lowermap[(unsigned char)*t]; + *t = national_case_insensitive_map[(unsigned char)*t]; } } -size_t nspace::hash::operator()(const insp_inaddr &a) const -{ - size_t q; - memcpy(&q,&a,sizeof(size_t)); - return q; -} - -size_t nspace::hash::operator()(const string &s) const +#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED) + size_t nspace::hash_compare >::operator()(const std::string &s) const +#else + #ifdef HASHMAP_DEPRECATED + size_t CoreExport nspace::insensitive::operator()(const std::string &s) const + #else + size_t nspace::hash::operator()(const std::string &s) const + #endif +#endif { /* 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]. + * only with *x replaced with national_case_insensitive_map[*x]. * This avoids a copy to use hash */ 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]; + t = 5 * t + national_case_insensitive_map[(unsigned char)*x]; return t; } -bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) const + +#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED) + size_t nspace::hash_compare >::operator()(const irc::string &s) const +#else + size_t CoreExport nspace::hash::operator()(const irc::string &s) const +#endif { - 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]); + register size_t t = 0; + for (irc::string::const_iterator x = s.begin(); x != s.end(); ++x) /* ++x not x++, as its faster */ + t = 5 * t + national_case_insensitive_map[(unsigned char)*x]; + return t; } -bool irc::InAddr_HashComp::operator()(const insp_inaddr &s1, const insp_inaddr &s2) const +bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) const { -#ifdef IPV6 - for (int n = 0; n < 16; n++) - if (s2.s6_addr[n] != s1.s6_addr[n]) + const unsigned char* n1 = (const unsigned char*)s1.c_str(); + const unsigned char* n2 = (const unsigned char*)s2.c_str(); + for (; *n1 && *n2; n1++, n2++) + if (national_case_insensitive_map[*n1] != national_case_insensitive_map[*n2]) return false; - return true; -#else - return (s1.s_addr == s1.s_addr); -#endif + return (national_case_insensitive_map[*n1] == national_case_insensitive_map[*n2]); } /****************************************************** @@ -121,83 +112,49 @@ 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 const array 'lowermap'. + * This class depends on the const array 'national_case_insensitive_map'. * ******************************************************/ bool irc::irc_char_traits::eq(char c1st, char c2nd) { - return lowermap[(unsigned char)c1st] == lowermap[(unsigned char)c2nd]; + return national_case_insensitive_map[(unsigned char)c1st] == national_case_insensitive_map[(unsigned char)c2nd]; } bool irc::irc_char_traits::ne(char c1st, char c2nd) { - return lowermap[(unsigned char)c1st] != lowermap[(unsigned char)c2nd]; + return national_case_insensitive_map[(unsigned char)c1st] != national_case_insensitive_map[(unsigned char)c2nd]; } bool irc::irc_char_traits::lt(char c1st, char c2nd) { - return lowermap[(unsigned char)c1st] < lowermap[(unsigned char)c2nd]; + return national_case_insensitive_map[(unsigned char)c1st] < national_case_insensitive_map[(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 char)*str1] > lowermap[(unsigned char)*str2]) - return 1; + if(national_case_insensitive_map[(unsigned char)*str1] > national_case_insensitive_map[(unsigned char)*str2]) + return 1; - if(lowermap[(unsigned char)*str1] < lowermap[(unsigned char)*str2]) - return -1; + if(national_case_insensitive_map[(unsigned char)*str1] < national_case_insensitive_map[(unsigned char)*str2]) + return -1; if(*str1 == 0 || *str2 == 0) - return 0; + return 0; - str1++; + 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 char)*s1] != lowermap[(unsigned char)c]) + while(n-- > 0 && national_case_insensitive_map[(unsigned char)*s1] != national_case_insensitive_map[(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; + return (n >= 0) ? s1 : NULL; } irc::tokenstream::tokenstream(const std::string &source) : tokens(source), last_pushed(false) @@ -211,7 +168,7 @@ irc::tokenstream::~tokenstream() { } -const std::string irc::tokenstream::GetToken() +bool irc::tokenstream::GetToken(std::string &token) { std::string::iterator lsp = last_starting_position; @@ -229,7 +186,8 @@ const std::string irc::tokenstream::GetToken() */ std::string::iterator curr = ++n; n = tokens.end(); - return std::string(curr, tokens.end()); + token = std::string(curr, tokens.end()); + return true; } last_pushed = false; @@ -245,12 +203,38 @@ const std::string irc::tokenstream::GetToken() while ((strip.length()) && (strip.find_last_of(' ') == strip.length() - 1)) strip.erase(strip.end() - 1); - return strip; + token = strip; + return !token.empty(); } n++; } - return ""; + token.clear(); + return false; +} + +bool irc::tokenstream::GetToken(irc::string &token) +{ + std::string stdstring; + bool returnval = GetToken(stdstring); + token = assign(stdstring); + return returnval; +} + +bool irc::tokenstream::GetToken(int &token) +{ + std::string tok; + bool returnval = GetToken(tok); + token = ConvToInt(tok); + return returnval; +} + +bool irc::tokenstream::GetToken(long &token) +{ + std::string tok; + bool returnval = GetToken(tok); + token = ConvToInt(tok); + return returnval; } irc::sepstream::sepstream(const std::string &source, char seperator) : tokens(source), sep(seperator) @@ -259,7 +243,7 @@ irc::sepstream::sepstream(const std::string &source, char seperator) : tokens(so n = tokens.begin(); } -const std::string irc::sepstream::GetToken() +bool irc::sepstream::GetToken(std::string &token) { std::string::iterator lsp = last_starting_position; @@ -268,18 +252,32 @@ const std::string irc::sepstream::GetToken() 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++); + token = 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); + while ((token.length()) && (token.find_last_of(sep) == token.length() - 1)) + token.erase(token.end() - 1); + + if (token.empty()) + n++; - return strip; + return n == tokens.end() ? false : true; } n++; } - return ""; + token = ""; + return false; +} + +const std::string irc::sepstream::GetRemaining() +{ + return std::string(n, tokens.end()); +} + +bool irc::sepstream::StreamEnd() +{ + return ((n + 1) == tokens.end()); } irc::sepstream::~sepstream() @@ -291,19 +289,23 @@ std::string irc::hex(const unsigned char *raw, size_t rawsz) if (!rawsz) return ""; - char buf[rawsz*2+1]; - size_t i; + /* EWW! This used to be using sprintf, which is WAY inefficient. -Special */ + + const char *hex = "0123456789abcdef"; + static char hexbuf[MAXBUF]; - for (i = 0; i < rawsz; i++) + size_t i, j; + for (i = 0, j = 0; j < rawsz; ++j) { - sprintf (&(buf[i*2]), "%02x", raw[i]); + hexbuf[i++] = hex[raw[j] / 16]; + hexbuf[i++] = hex[raw[j] % 16]; } - buf[i*2] = 0; + hexbuf[i] = 0; - return buf; + return hexbuf; } -const char* irc::Spacify(char* n) +CoreExport const char* irc::Spacify(const char* n) { static char x[MAXBUF]; strlcpy(x,n,MAXBUF); @@ -314,7 +316,7 @@ const char* irc::Spacify(char* n) } -irc::modestacker::modestacker(bool add) : adding(add) +irc::modestacker::modestacker(InspIRCd* Instance, bool add) : ServerInstance(Instance), adding(add) { sequence.clear(); sequence.push_back(""); @@ -341,27 +343,49 @@ void irc::modestacker::PushMinus() this->Push('-',""); } -int irc::modestacker::GetStackedLine(std::deque &result) +int irc::modestacker::GetStackedLine(std::vector &result, int max_line_size) { - int n = 0; - result.clear(); - result.push_back(adding ? "+" : "-"); + if (sequence.empty()) + { + return 0; + } - while (!sequence[0].empty() && (sequence.size() > 1) && (result.size() < MAXMODES+1)) + unsigned int n = 0; + int size = 1; /* Account for initial +/- char */ + int nextsize = 0; + int start = result.size(); + std::string modeline = adding ? "+" : "-"; + result.push_back(modeline); + + if (sequence.size() > 1) + nextsize = sequence[1].length() + 2; + + while (!sequence[0].empty() && (sequence.size() > 1) && (n < ServerInstance->Config->Limits.MaxModes) && ((size + nextsize) < max_line_size)) { - result[0] += *(sequence[0].begin()); + modeline += *(sequence[0].begin()); if (!sequence[1].empty()) + { result.push_back(sequence[1]); + size += nextsize; /* Account for mode character and whitespace */ + } sequence[0].erase(sequence[0].begin()); sequence.erase(sequence.begin() + 1); + + if (sequence.size() > 1) + nextsize = sequence[1].length() + 2; + n++; } + result[start] = modeline; return n; } irc::stringjoiner::stringjoiner(const std::string &seperator, const std::vector &sequence, int begin, int end) { + if (end < begin) + throw "stringjoiner logic error, this causes problems."; + for (int v = begin; v < end; v++) joined.append(sequence[v]).append(seperator); joined.append(sequence[end]); @@ -369,13 +393,19 @@ irc::stringjoiner::stringjoiner(const std::string &seperator, const std::vector< irc::stringjoiner::stringjoiner(const std::string &seperator, const std::deque &sequence, int begin, int end) { + if (end < begin) + throw "stringjoiner logic error, this causes problems."; + 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) +irc::stringjoiner::stringjoiner(const std::string &seperator, const char* const* sequence, int begin, int end) { + if (end < begin) + throw "stringjoiner logic error, this causes problems."; + for (int v = begin; v < end; v++) joined.append(sequence[v]).append(seperator); joined.append(sequence[end]); @@ -426,7 +456,7 @@ long irc::portparser::GetToken() { while (((Overlaps(in_range)) && (in_range <= range_end))) in_range++; - + if (in_range <= range_end) return in_range; } @@ -435,16 +465,15 @@ long irc::portparser::GetToken() in_range = 0; } - std::string x = sep->GetToken(); + std::string x; + sep->GetToken(x); - if (x == "") + if (x.empty()) return 0; while (Overlaps(atoi(x.c_str()))) { - x = sep->GetToken(); - - if (x == "") + if (!sep->GetToken(x)) return 0; } @@ -473,98 +502,24 @@ long irc::portparser::GetToken() } } -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() +/*const std::basic_string& SearchAndReplace(std::string& text, const std::string& pattern, const std::string& replace) { - /* 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++) + std::string replacement; + if ((!pattern.empty()) && (!text.empty())) { - for (unsigned char current_pos = 1; current_pos; current_pos = current_pos << 1) + for (std::string::size_type n = 0; n != text.length(); ++n) { - if (!(freebits[i] & current_pos)) + if (text.length() >= pattern.length() && text.substr(n, pattern.length()) == pattern) { - freebits[i] |= current_pos; - return std::make_pair(i, current_pos); + replacement.append(replace); + n = n + pattern.length() - 1; + } + else + { + replacement += text[n]; } } } - /* 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; - } -} - + text = replacement; + return text; +}*/