X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fhashcomp.h;h=1f659209318d42fef5e0a3b9fee086d836b4c10c;hb=bd0413a193f185d4d7a8b26fb19b6b997489e134;hp=6c90ee919ed4ac5f26e2df9a34e603227932cb13;hpb=d7336f351d9740fc4bfc1289c2b090a0f272d201;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/hashcomp.h b/include/hashcomp.h index 6c90ee919..1f6592093 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -41,15 +41,56 @@ using irc::sockets::insp_aton; using irc::sockets::insp_ntoa; using irc::sockets::insp_inaddr; +#ifndef LOWERMAP +#define LOWERMAP +/** A mapping of uppercase to lowercase, including scandinavian + * 'oddities' as specified by RFC1459, e.g. { -> [, and | -> \ + */ +unsigned const char lowermap[256] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, /* 0-19 */ + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, /* 20-39 */ + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, /* 40-59 */ + 60, 61, 62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, /* 60-79 */ + 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 94, 95, 96, 97, 98, 99, /* 80-99 */ + 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, /* 100-119 */ + 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, /* 120-139 */ + 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, /* 140-159 */ + 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, /* 160-179 */ + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, /* 180-199 */ + 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, /* 200-219 */ + 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, /* 220-239 */ + 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255 /* 240-255 */ +}; +#endif + +/** Because of weirdness in g++, before 3.x this was namespace std. It's now __gnu_cxx. + * This is a #define'd alias. + */ namespace nspace { + /** Convert a string to lower case respecting RFC1459 + * @param n A string to lowercase + */ + void strlower(char *n); + + /** Hashing function to hash insp_inaddr structs + */ template<> struct hash { + /** Hash an insp_inaddr + * @param a An insp_inaddr to hash + * @return The hash value + */ size_t operator()(const insp_inaddr &a) const; }; + /** Hashing function to hash std::string without respect to case + */ template<> struct hash { + /** Hash a std::string using RFC1459 case sensitivity rules + * @param s A string to hash + * @return The hash value + */ size_t operator()(const string &s) const; }; } @@ -82,6 +123,17 @@ namespace irc bool operator()(const insp_inaddr &s1, const insp_inaddr &s2) const; }; + class modestacker + { + private: + std::deque sequence; + bool adding; + public: + modestacker(bool add); + void Push(char modeletter, const std::string ¶meter); + int GetStackedLine(std::deque &result); + }; + /** irc::tokenstream reads a string formatted as per RFC1459 and RFC2812. * It will split the string into 'tokens' each containing one parameter * from the string. @@ -120,22 +172,39 @@ namespace irc * the next token, until none remain, at which point the method returns * an empty string. */ - class commasepstream + class sepstream : public classbase { private: std::string tokens; std::string::iterator last_starting_position; std::string::iterator n; + char sep; public: /** Create a commasepstream and fill it with the provided data */ - commasepstream(const std::string &source); - ~commasepstream(); + sepstream(const std::string &source, char seperator); + virtual ~sepstream(); /** Fetch the next token from the stream * @returns The next token is returned, or an empty string if none remain */ - const std::string GetToken(); + virtual const std::string GetToken(); + }; + + class commasepstream : public sepstream + { + public: + commasepstream(const std::string &source) : sepstream(source, ',') + { + } + }; + + class spacesepstream : public sepstream + { + public: + spacesepstream(const std::string &source) : sepstream(source, ' ') + { + } }; @@ -166,22 +235,24 @@ namespace irc static const char* find(const char* s1, int n, char c); }; + std::string hex(const unsigned char *raw, size_t rawsz); + /** This typedef declares irc::string based upon irc_char_traits */ typedef basic_string > string; + + const char* Spacify(char* n); } /* Define operators for using >> and << with irc::string to an ostream on an istream. */ /* This was endless fun. No. Really. */ /* It was also the first core change Ommeh made, if anyone cares */ - std::ostream& operator<<(std::ostream &os, const irc::string &str); std::istream& operator>>(std::istream &is, irc::string &str); /* Define operators for + and == with irc::string to std::string for easy assignment * and comparison - Brain */ - std::string operator+ (std::string& leftval, irc::string& rightval); irc::string operator+ (irc::string& leftval, std::string& rightval); bool operator== (std::string& leftval, irc::string& rightval);