X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=a27a83f64ff89ef589b4ad540a7cf80f09be0d9f;hb=87dd84a97265843cfe19f20c207c1c72f38a4f2d;hp=d44ab54c2d39278115126f2900daaa7a5d302eaf;hpb=77300844a4607a7ad97e0a1c0907770f22e7b4af;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index d44ab54c2..a27a83f64 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.cpp @@ -2,24 +2,27 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits * - * 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; +/* $Core: libIRCDhash */ #include "inspircd.h" #include "hashcomp.h" +#ifndef WIN32 #include #define nspace __gnu_cxx +#else +#include +#define nspace stdext +using stdext::hash_map; +#endif /****************************************************** * @@ -44,15 +47,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; @@ -71,14 +67,11 @@ void nspace::strlower(char *n) } } -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 +#ifndef WIN32 +size_t nspace::hash::operator()(const std::string &s) const +#else +size_t nspace::hash_compare >::operator()(const std::string &s) const +#endif { /* XXX: NO DATA COPIES! :) * The hash function here is practically @@ -92,28 +85,28 @@ size_t nspace::hash::operator()(const string &s) const return t; } +#ifndef WIN32 +size_t nspace::hash::operator()(const irc::string &s) const +#else +size_t nspace::hash_compare >::operator()(const irc::string &s) const +#endif +{ + 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 + lowermap[(unsigned char)*x]; + return t; +} + bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) const { - unsigned char* n1 = (unsigned char*)s1.c_str(); - unsigned char* n2 = (unsigned char*)s2.c_str(); + 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 (lowermap[*n1] != lowermap[*n2]) return false; return (lowermap[*n1] == lowermap[*n2]); } -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 -} - /****************************************************** * * This is the implementation of our special irc::string @@ -145,40 +138,20 @@ 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; + return 1; if(lowermap[(unsigned char)*str1] < lowermap[(unsigned char)*str2]) - return -1; + 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]) @@ -186,20 +159,6 @@ const char* irc::irc_char_traits::find(const char* s1, int n, char c) 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) { /* Record starting position and current position */ @@ -211,7 +170,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 +188,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 +205,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 +245,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 +254,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); - return strip; + if (token.empty()) + n++; + + 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 +291,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); @@ -341,19 +345,37 @@ void irc::modestacker::PushMinus() this->Push('-',""); } -int irc::modestacker::GetStackedLine(std::deque &result) +int irc::modestacker::GetStackedLine(std::deque &result, int max_line_size) { + if (sequence.empty()) + { + result.clear(); + return 0; + } + int n = 0; + int size = 1; /* Account for initial +/- char */ + int nextsize = 0; result.clear(); result.push_back(adding ? "+" : "-"); - while (!sequence[0].empty() && (sequence.size() > 1) && (result.size() < MAXMODES+1)) + if (sequence.size() > 1) + nextsize = sequence[1].length() + 2; + + while (!sequence[0].empty() && (sequence.size() > 1) && (result.size() < MAXMODES) && ((size + nextsize) < max_line_size)) { result[0] += *(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++; } @@ -374,7 +396,7 @@ irc::stringjoiner::stringjoiner(const std::string &seperator, const std::dequeGetToken(); + 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,32 +494,29 @@ long irc::portparser::GetToken() } } -irc::dynamicbitmask::dynamicbitmask() +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_size = 4; 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() { /* Yeah, this isnt too efficient, however a module or the core * should only be allocating bitfields on load, the Toggle and * Get methods are O(1) as these are called much more often. */ + unsigned char* freebits = this->GetFreeBits(); for (unsigned char i = 0; i < bits_size; i++) { /* Yes, this is right. You'll notice we terminate the loop when !current_pos, @@ -536,6 +554,7 @@ irc::bitfield irc::dynamicbitmask::Allocate() */ bits = temp_bits; freebits = temp_freebits; + this->SetFreeBits(freebits); /* Initialize the new byte on the end of * the bitfields, pre-allocate the one bit * for this allocation @@ -560,7 +579,7 @@ bool irc::dynamicbitmask::Deallocate(irc::bitfield &pos) */ if (pos.first < bits_size) { - freebits[pos.first] &= ~pos.second; + this->GetFreeBits()[pos.first] &= ~pos.second; return true; } /* They gave a bitfield outside of the