X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=8212dcaa341cf0a7ac38d15dbd9990ba4483cb8f;hb=9bc8b2602426e187c4c5ba6ff0fad0641155357a;hp=7eb7075c7dbc52c1bec3725044d97e953a5b163a;hpb=c212eb49dfd808aae0a146cb978de2c5e9eb2490;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index 7eb7075c7..8212dcaa3 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.cpp @@ -2,20 +2,15 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2007 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; - #include "inspircd.h" #include "hashcomp.h" #include @@ -44,13 +39,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 @@ -71,13 +61,6 @@ 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 { /* XXX: NO DATA COPIES! :) @@ -87,9 +70,17 @@ size_t nspace::hash::operator()(const string &s) const * 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++, so we don't hash the \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]; + return t; +} + +size_t nspace::hash::operator()(const irc::string &s) const +{ + 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 size_t(t); + return t; } bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) const @@ -102,18 +93,6 @@ bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) 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 @@ -169,14 +148,14 @@ irc::string operator+ (irc::string& leftval, std::string& rightval) return leftval + irc::string(rightval.c_str()); } -bool operator== (std::string& leftval, irc::string& rightval) +bool operator== (const std::string& leftval, const irc::string& rightval) { - return (leftval == std::string(rightval.c_str())); + return (leftval.c_str() == rightval); } -bool operator== (irc::string& leftval, std::string& rightval) +bool operator== (const irc::string& leftval, const std::string& rightval) { - return (rightval == std::string(leftval.c_str())); + return (leftval == rightval.c_str()); } const char* irc::irc_char_traits::find(const char* s1, int n, char c) @@ -211,12 +190,17 @@ irc::tokenstream::~tokenstream() { } -const std::string irc::tokenstream::GetToken() +bool irc::tokenstream::GetToken(std::string &token) { std::string::iterator lsp = last_starting_position; while (n != tokens.end()) { + /** Skip multi space, converting " " into " " + */ + while ((n+1 != tokens.end()) && (*n == ' ') && (*(n+1) == ' ')) + n++; + if ((last_pushed) && (*n == ':')) { /* If we find a token thats not the first and starts with :, @@ -224,7 +208,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; @@ -240,12 +225,14 @@ 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 = ""; + return false; } irc::sepstream::sepstream(const std::string &source, char seperator) : tokens(source), sep(seperator) @@ -277,6 +264,16 @@ const std::string irc::sepstream::GetToken() return ""; } +const std::string irc::sepstream::GetRemaining() +{ + return std::string(n, tokens.end()); +} + +bool irc::sepstream::StreamEnd() +{ + return ((n + 1) == tokens.end()); +} + irc::sepstream::~sepstream() { } @@ -286,19 +283,24 @@ std::string irc::hex(const unsigned char *raw, size_t rawsz) if (!rawsz) return ""; + /* EWW! This used to be using sprintf, which is WAY inefficient. -Special */ + + const char *hex = "0123456789abcdef"; + char buf[rawsz*2+1]; - size_t i; - 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]); + buf[i++] = hex[raw[j] / 16]; + buf[i++] = hex[raw[j] % 16]; } - buf[i*2] = 0; + buf[i] = '\0'; return buf; } -const char* irc::Spacify(char* n) +const char* irc::Spacify(const char* n) { static char x[MAXBUF]; strlcpy(x,n,MAXBUF); @@ -309,3 +311,327 @@ const char* irc::Spacify(char* n) } +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 &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 ? "+" : "-"); + + if (sequence.size() > 1) + nextsize = sequence[1].length() + 2; + + while (!sequence[0].empty() && (sequence.size() > 1) && (result.size() < MAXMODES+1) && ((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++; + } + + return n; +} + +irc::stringjoiner::stringjoiner(const std::string &seperator, const std::vector &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 &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; +} + +irc::portparser::portparser(const std::string &source, bool allow_overlapped) : in_range(0), range_begin(0), range_end(0), overlapped(allow_overlapped) +{ + sep = new irc::commasepstream(source); + overlap_set.clear(); +} + +irc::portparser::~portparser() +{ + delete sep; +} + +bool irc::portparser::Overlaps(long val) +{ + if (!overlapped) + return false; + + if (overlap_set.find(val) == overlap_set.end()) + { + overlap_set[val] = true; + return false; + } + else + return true; +} + +long irc::portparser::GetToken() +{ + if (in_range > 0) + { + in_range++; + if (in_range <= range_end) + { + if (!Overlaps(in_range)) + { + return in_range; + } + else + { + while (((Overlaps(in_range)) && (in_range <= range_end))) + in_range++; + + if (in_range <= range_end) + return in_range; + } + } + else + in_range = 0; + } + + std::string x = sep->GetToken(); + + if (x == "") + return 0; + + while (Overlaps(atoi(x.c_str()))) + { + x = sep->GetToken(); + + if (x == "") + return 0; + } + + std::string::size_type dash = x.rfind('-'); + if (dash != std::string::npos) + { + std::string sbegin = x.substr(0, dash); + std::string send = x.substr(dash+1, x.length()); + range_begin = atoi(sbegin.c_str()); + range_end = atoi(send.c_str()); + + if ((range_begin > 0) && (range_end > 0) && (range_begin < 65536) && (range_end < 65536) && (range_begin < range_end)) + { + in_range = range_begin; + return in_range; + } + else + { + /* Assume its just the one port */ + return atoi(sbegin.c_str()); + } + } + else + { + return atoi(x.c_str()); + } +} + +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]; + memset(bits, 0, bits_size); +} + +irc::dynamicbitmask::~dynamicbitmask() +{ + /* Tidy up the entire used memory on delete */ + delete[] bits; +} + +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, + * this is because we logic shift our bit off the end of unsigned char, and its + * lost, making the loop counter 0 when we're done. + */ + for (unsigned char current_pos = 1; current_pos; current_pos = current_pos << 1) + { + if (!(freebits[i] & current_pos)) + { + freebits[i] |= current_pos; + return std::make_pair(i, current_pos); + } + } + } + /* We dont have any free space left, increase by one */ + + if (bits_size == 255) + /* Oh dear, cant grow it any further */ + throw std::bad_alloc(); + + unsigned char 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; + this->SetFreeBits(freebits); + /* Initialize the new byte on the end of + * the bitfields, pre-allocate the one bit + * for this allocation + */ + bits[old_bits_size] = 0; + freebits[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) + { + this->GetFreeBits()[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) +{ + /* Range check the value */ + 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; + } +} + +bool irc::dynamicbitmask::Get(irc::bitfield &pos) +{ + /* Range check the value */ + if (pos.first < bits_size) + return (bits[pos.first] & pos.second); + else + /* We can't return false, otherwise we can't + * distinguish between failure and a cleared bit! + * Our only sensible choice is to throw (ew). + */ + throw ModuleException("irc::dynamicbitmask::Get(): Invalid bitfield, out of range"); +} + +unsigned char irc::dynamicbitmask::GetSize() +{ + return bits_size; +} + +std::string assign(const irc::string &other) +{ + return other.c_str(); +} + +irc::string assign(const std::string &other) +{ + return other.c_str(); +} + +std::string& trim(std::string &str) +{ + std::string::size_type start = str.find_first_not_of(" "); + std::string::size_type end = str.find_last_not_of(" "); + if (start == std::string::npos || end == std::string::npos) + str = ""; + else + str = str.substr(start, end-start+1); + + return str; +}