Change "CAP *" reply to "CAP $nick", which is the intended use of the parameter

[user/henk/code/inspircd.git] / src / inspstring.cpp

diff --git a/src/inspstring.cpp b/src/inspstring.cpp
index 816e37a19648027ac619734049e8869b796e1eb9..38a51e82ffde04dcfc142e8989742201c56be9ea 100644 (file)
--- a/src/inspstring.cpp
+++ b/src/inspstring.cpp
@@ -11,8 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
 
 /*
@@ -152,3 +150,75 @@ std::string BinToHex(const std::string& data)
        }
        return rv;
 }
+
+static const char b64table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+std::string BinToBase64(const std::string& data_str, const char* table, char pad)
+{
+       if (!table)
+               table = b64table;
+
+       uint32_t buffer;
+       uint8_t* data = (uint8_t*)data_str.data();
+       std::string rv;
+       size_t i = 0;
+       while (i + 2 < data_str.length())
+       {
+               buffer = (data[i] << 16 | data[i+1] << 8 | data[i+2]);
+               rv.push_back(table[0x3F & (buffer >> 18)]);
+               rv.push_back(table[0x3F & (buffer >> 12)]);
+               rv.push_back(table[0x3F & (buffer >>  6)]);
+               rv.push_back(table[0x3F & (buffer >>  0)]);
+               i += 3;
+       }
+       if (data_str.length() == i)
+       {
+               // no extra characters
+       }
+       else if (data_str.length() == i + 1)
+       {
+               buffer = data[i] << 16;
+               rv.push_back(table[0x3F & (buffer >> 18)]);
+               rv.push_back(table[0x3F & (buffer >> 12)]);
+               if (pad)
+               {
+                       rv.push_back(pad);
+                       rv.push_back(pad);
+               }
+       }
+       else if (data_str.length() == i + 2)
+       {
+               buffer = (data[i] << 16 | data[i+1] << 8);
+               rv.push_back(table[0x3F & (buffer >> 18)]);
+               rv.push_back(table[0x3F & (buffer >> 12)]);
+               rv.push_back(table[0x3F & (buffer >>  6)]);
+               if (pad)
+                       rv.push_back(pad);
+       }
+       return rv;
+}
+
+std::string Base64ToBin(const std::string& data_str, const char* table)
+{
+       if (!table)
+               table = b64table;
+
+       int bitcount = 0;
+       uint32_t buffer = 0;
+       const char* data = data_str.c_str();
+       std::string rv;
+       while (true)
+       {
+               const char* find = strchr(table, *data++);
+               if (!find || find >= table + 64)
+                       break;
+               buffer = (buffer << 6) | (find - table);
+               bitcount += 6;
+               if (bitcount >= 8)
+               {
+                       bitcount -= 8;
+                       rv.push_back((buffer >> bitcount) & 0xFF);
+               }
+       }
+       return rv;
+}