Adding base64

utils/Base64.cpp

@@ -0,0 +1,46 @@
+#include "Base64.h"
+#include <stdio.h>
+
+#if __GNUC__ >= 4 and __GNUC_MINOR__ >= 3
+#define MOVEBE(x) __builtin_bswap32(x);
+#else
+#define MOVEBE(x) ((x&0xff000000)>>24)|((x&0xff)<<24)|((x&0xff0000)>>8)|((x&0xff00)<<8)
+#endif
+
+char* Base64::digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+std::string Base64::encode(const char* data, unsigned int size)
+{
+    std::string str;
+    unsigned int tmp;
+    unsigned int i = 0;
+    while (i<size)
+    {
+        tmp = MOVEBE(*((unsigned int*)&data[i]));
+        if (size-i == 1)
+        {
+            str += digits[(tmp>>26)&0x3F];
+            str += digits[(tmp>>20)&0x3F];
+            str += "==";
+            i++;
+        }
+        else if (size-i == 2)
+        {
+            str += digits[(tmp>>26)&0x3F];
+            str += digits[(tmp>>20)&0x3F];
+            str += digits[(tmp>>14)&0x3F];
+            str += "=";
+            i+=2;
+        }
+        else
+        {
+            str += digits[(tmp>>26)&0x3F];
+            str += digits[(tmp>>20)&0x3F];
+            str += digits[(tmp>>14)&0x3F];
+            str += digits[(tmp>>8)&0x3F];
+            i+=3;
+        }   
+    }
+
+    return str;
+}

utils/Base64.h

@@ -0,0 +1,10 @@
+#pragma once
+#include <string>
+
+class Base64
+{
+private:
+    static char* digits;
+public:
+    static std::string encode(const char* data, unsigned int size);
+};

websocket/HTTPProtocolParser.cpp

@@ -24,7 +24,7 @@ SOFTWARE.
 #include "HTTPProtocolParser.h"
 #include "utils/Logging.h"
 #include "utils/sha1.h"
-#include "base64.h"
+#include "utils/Base64.h"
 #include <sstream>
 #include <algorithm>
 #include <string.h>
@@ -169,7 +169,7 @@ std::string HTTPProtocolParser::switchProtocol(const std::string& key, const std
     std::string accept = key+MAGIC;
 
     Dumais::Utils::SHA1 sha(accept.c_str(),accept.size());
-    accept = base64_encode(sha.getDigest(),20);
+    accept = Base64::encode((char*)sha.getDigest(),20);
 
     std::stringstream ss;
     ss << "HTTP/1.1 101 Switching Protocols\r\n";

websocket/Makefile

@@ -1,4 +1,4 @@
-SOURCES = WebSocketServer.cpp WebSocket.cpp base64.cpp HTTPProtocolParser.cpp WSProtocolParser.cpp
+SOURCES = WebSocketServer.cpp WebSocket.cpp HTTPProtocolParser.cpp WSProtocolParser.cpp
 OBJECTS=$(SOURCES:.cpp=.o)
 CFLAGS=-I ../ -g -std=c++11
 .cpp.o: