X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=5ca032229a71c6e06138954e21f07a850cbc7e3a;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=32f74475fd632e72ef222ff7967ff2ae7c95bc6e;hpb=9dd4108273d95204edbc366618da6500571267df;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index 32f74475f..5ca032229 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.cpp @@ -1,10 +1,16 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2013, 2018-2019 Sadie Powell + * Copyright (C) 2013 Adam + * Copyright (C) 2012-2013, 2015-2016 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2009 Uli Schlachter * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2005-2009 Craig Edwards - * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2008 Robin Burchell * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2005-2007, 2010 Craig Edwards * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public @@ -21,7 +27,6 @@ #include "inspircd.h" -#include "hashcomp.h" /****************************************************** * @@ -119,48 +124,7 @@ unsigned const char rfc_case_insensitive_map[256] = { 250, 251, 252, 253, 254, 255, // 250-255 }; -/** - * A case sensitive mapping of characters from upper case to lower case for the - * character set of RFC 1459. This is identical to ASCII. - */ -unsigned const char rfc_case_sensitive_map[256] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, // 0-9 - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, // 10-19 - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, // 20-29 - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, // 30-39 - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, // 40-49 - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, // 50-59 - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, // 60-69 - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, // 70-79 - 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, // 80-89 - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, // 90-99 - 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, // 100-109 - 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, // 110-119 - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, // 120-129 - 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, // 130-139 - 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, // 140-149 - 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, // 150-159 - 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, // 160-169 - 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, // 170-179 - 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, // 180-189 - 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, // 190-199 - 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, // 200-209 - 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, // 210-219 - 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, // 220-229 - 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, // 230-239 - 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, // 240-249 - 250, 251, 252, 253, 254, 255, // 250-255 -}; - -size_t CoreExport irc::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 + national_case_insensitive_map[(unsigned char)*x]; - return t; -} - -bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) const +bool irc::equals(const std::string& s1, const std::string& s2) { const unsigned char* n1 = (const unsigned char*)s1.c_str(); const unsigned char* n2 = (const unsigned char*)s2.c_str(); @@ -170,6 +134,38 @@ bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) return (national_case_insensitive_map[*n1] == national_case_insensitive_map[*n2]); } +size_t irc::find(const std::string& haystack, const std::string& needle) +{ + // The haystack can't contain the needle if it is smaller than it. + if (needle.length() > haystack.length()) + return std::string::npos; + + // The inner loop checks the characters between haystack_last and the end of the haystack. + size_t haystack_last = haystack.length() - needle.length(); + for (size_t hpos = 0; hpos <= haystack_last; ++hpos) + { + // Check for the needle at the current haystack position. + bool found = true; + for (size_t npos = 0; npos < needle.length(); ++npos) + { + if (national_case_insensitive_map[(unsigned char)needle[npos]] != national_case_insensitive_map[(unsigned char)haystack[hpos + npos]]) + { + // Uh-oh, characters at the current haystack position don't match. + found = false; + break; + } + } + + // The entire needle was found in the haystack! + if (found) + return hpos; + } + + // We didn't find anything. + return std::string::npos; +} + + bool irc::insensitive_swo::operator()(const std::string& a, const std::string& b) const { const unsigned char* charmap = national_case_insensitive_map; @@ -197,112 +193,60 @@ size_t irc::insensitive::operator()(const std::string &s) const * only with *x replaced with national_case_insensitive_map[*x]. * This avoids a copy to use hash */ - register size_t t = 0; + 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 + national_case_insensitive_map[(unsigned char)*x]; return t; } -/****************************************************** - * - * This is the implementation of our special irc::string - * class which is a case-insensitive equivalent to - * std::string which is not only case-insensitive but - * can also do scandanavian comparisons, e.g. { = [, etc. - * - * This class depends on the const array 'national_case_insensitive_map'. - * - ******************************************************/ - -bool irc::irc_char_traits::eq(char c1st, 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) +irc::tokenstream::tokenstream(const std::string& msg, size_t start, size_t end) + : message(msg, start, end) + , position(0) { - 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) +bool irc::tokenstream::GetMiddle(std::string& token) { - 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 we are past the end of the string we can't do anything. + if (position >= message.length()) { - if(national_case_insensitive_map[(unsigned char)*str1] > national_case_insensitive_map[(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; - - str1++; - str2++; - } - return 0; -} - -const char* irc::irc_char_traits::find(const char* s1, int n, char c) -{ - while(n-- > 0 && national_case_insensitive_map[(unsigned char)*s1] != national_case_insensitive_map[(unsigned char)c]) - s1++; - return (n >= 0) ? s1 : NULL; -} - -irc::tokenstream::tokenstream(const std::string &source) : spacesepstream(source) -{ -} - -bool irc::tokenstream::GetToken(std::string &token) -{ - bool first = !pos; - - if (!spacesepstream::GetToken(token)) + token.clear(); return false; + } - /* This is the last parameter */ - if (token[0] == ':' && !first) + // If we can't find another separator this is the last token in the message. + size_t separator = message.find(' ', position); + if (separator == std::string::npos) { - token = token.substr(1); - if (!StreamEnd()) - { - token += ' '; - token += GetRemaining(); - } - pos = tokens.length() + 1; + token.assign(message, position, std::string::npos); + position = message.length(); + return true; } + token.assign(message, position, separator - position); + position = message.find_first_not_of(' ', separator); return true; } -bool irc::tokenstream::GetToken(irc::string &token) +bool irc::tokenstream::GetTrailing(std::string& token) { - std::string stdstring; - bool returnval = GetToken(stdstring); - token = assign(stdstring); - return returnval; -} + // If we are past the end of the string we can't do anything. + if (position >= message.length()) + { + token.clear(); + return false; + } -bool irc::tokenstream::GetToken(int &token) -{ - std::string tok; - bool returnval = GetToken(tok); - token = ConvToInt(tok); - return returnval; -} + // If this is true then we have a token! + if (message[position] == ':') + { + token.assign(message, position + 1, std::string::npos); + position = message.length(); + return true; + } -bool irc::tokenstream::GetToken(long &token) -{ - std::string tok; - bool returnval = GetToken(tok); - token = ConvToInt(tok); - return returnval; + // There is no token so it must be a token. + return GetMiddle(token); } irc::sepstream::sepstream(const std::string& source, char separator, bool allowempty) @@ -333,7 +277,7 @@ bool irc::sepstream::GetToken(std::string &token) if (p == std::string::npos) p = this->tokens.length(); - token = this->tokens.substr(this->pos, p - this->pos); + token.assign(tokens, this->pos, p - this->pos); this->pos = p + 1; return true; @@ -349,81 +293,14 @@ bool irc::sepstream::StreamEnd() return this->pos > this->tokens.length(); } -irc::modestacker::modestacker(bool add) : adding(add) -{ - sequence.clear(); - sequence.push_back(""); -} - -void irc::modestacker::Push(char modeletter, const std::string ¶meter) +bool irc::sepstream::Contains(const std::string& value) { - *(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::vector &result, int max_line_size) -{ - if (sequence.empty()) - { - return 0; - } - - 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)) - { - 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; -} + std::string token; + while (GetToken(token)) + if (value == token) + return true; -std::string irc::stringjoiner(const std::vector& sequence, char separator) -{ - std::string joined; - if (sequence.empty()) - return joined; // nothing to do here - - for (std::vector::const_iterator i = sequence.begin(); i != sequence.end(); ++i) - joined.append(*i).push_back(separator); - joined.erase(joined.end()-1); - return joined; + return false; } irc::portparser::portparser(const std::string &source, bool allow_overlapped) @@ -469,7 +346,7 @@ long irc::portparser::GetToken() if (x.empty()) return 0; - while (Overlaps(atoi(x.c_str()))) + while (Overlaps(ConvToNum(x))) { if (!sep.GetToken(x)) return 0; @@ -478,10 +355,9 @@ long irc::portparser::GetToken() 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()); + std::string sbegin(x, 0, dash); + range_begin = ConvToNum(sbegin); + range_end = ConvToNum(x.c_str() + dash + 1); if ((range_begin > 0) && (range_end > 0) && (range_begin < 65536) && (range_end < 65536) && (range_begin < range_end)) { @@ -491,11 +367,11 @@ long irc::portparser::GetToken() else { /* Assume its just the one port */ - return atoi(sbegin.c_str()); + return ConvToNum(sbegin); } } else { - return atoi(x.c_str()); + return ConvToNum(x); } }