FIxed small bugs....

Author: smasherprog

Test/fuzzingclient.json

@@ -10,7 +10,7 @@
                   "options": {"version": 18}}
               ],
 
-   "cases": ["1.*","2.*","3.*","4.*", "5.*", "6.*", "7.*", "9.*", "10.*"],
+ "cases": ["1.*","2.*","3.*","4.*", "5.*", "6.*", "7.*", "9.*", "10.*"],
    "exclude-cases": [],
    "exclude-agent-cases": {}
 }

Test/main.cpp

@@ -252,12 +252,12 @@ void multithreadthroughputtest() {
 int main(int argc, char* argv[]) {
     wssautobahntest();
     std::this_thread::sleep_for(1s);
-    generaltest();
+    /*generaltest();
     std::this_thread::sleep_for(1s);
     generalTLStest();
     std::this_thread::sleep_for(1s);
     multithreadtest();
     std::this_thread::sleep_for(1s);
-    multithreadthroughputtest();
+    multithreadthroughputtest();*/
     return 0;
 }

include/internal/DataStructures.h

@@ -156,7 +156,7 @@ namespace SL {
             }
             unsigned char* ReceiveBuffer = nullptr;
             size_t ReceiveBufferSize = 0;
-            unsigned char ReceiveHeader[14];
+            unsigned char ReceiveHeader[14] = {};
             bool CompressionEnabled = false;
 
             OpCode LastOpCode = OpCode::INVALID;

include/internal/Utils.h

@@ -74,16 +74,16 @@ namespace SL {
 
 
         template<class PARENTTYPE>inline bool DidPassMaskRequirement(unsigned char* h) { UNUSED(h); return true; }
-        template<> inline bool DidPassMaskRequirement<WSListenerImpl>(unsigned char* h) { return getMask(h); }
-        template<> inline bool DidPassMaskRequirement<WSClientImpl>(unsigned char* h) { return !getMask(h); }
+        template<> inline bool DidPassMaskRequirement<std::shared_ptr<WSListenerImpl>>(unsigned char* h) { return getMask(h); }
+        template<> inline bool DidPassMaskRequirement<std::shared_ptr<WSClientImpl>>(unsigned char* h) { return !getMask(h); }
 
         template<class PARENTTYPE>inline size_t AdditionalBodyBytesToRead() { return 0; }
-        template<>inline size_t AdditionalBodyBytesToRead<WSListenerImpl>() { return 4; }
-        template<>inline size_t AdditionalBodyBytesToRead<WSClientImpl>() { return 0; }
+        template<>inline size_t AdditionalBodyBytesToRead<std::shared_ptr<WSListenerImpl>>() { return 4; }
+        template<>inline size_t AdditionalBodyBytesToRead<std::shared_ptr<WSClientImpl >>() { return 0; }
 
-        template<class PARENTTYPE>inline void set_MaskBitForSending(unsigned char* frame) {  }
-        template<>inline void set_MaskBitForSending<WSListenerImpl>(unsigned char* frame) { setMask(frame, 0x00); }
-        template<>inline void set_MaskBitForSending<WSClientImpl>(unsigned char* frame) { setMask(frame, 0xff); }
+        template<class PARENTTYPE>inline void set_MaskBitForSending(unsigned char* frame) { UNUSED(frame); }
+        template<>inline void set_MaskBitForSending<std::shared_ptr<WSListenerImpl>>(unsigned char* frame) { setMask(frame, 0x00); }
+        template<>inline void set_MaskBitForSending<std::shared_ptr<WSClientImpl >>(unsigned char* frame) { setMask(frame, 0xff); }
 
         template<class T>std::string get_address(T& _socket)
         {

include/internal/WebSocketProtocol.h

@@ -150,7 +150,7 @@ namespace SL {
             write_end(parent, socket, msg);
         }
 
-        template<class PARENTTYPE, class SOCKETTYPE, class SENDBUFFERTYPE>inline void write(const std::shared_ptr<PARENTTYPE>& parent, const SOCKETTYPE& socket, const SENDBUFFERTYPE& msg) {
+        template<class PARENTTYPE, class SOCKETTYPE, class SENDBUFFERTYPE>inline void write(const PARENTTYPE& parent, const SOCKETTYPE& socket, const SENDBUFFERTYPE& msg) {
             size_t sendsize = 0;
             unsigned char header[10] = {};
 
@@ -273,7 +273,7 @@ namespace SL {
             }
             return closeImpl(parent, socket, 1000, "");
         }
-        template <class PARENTTYPE, class SOCKETTYPE>inline void ProcessControlMessage(const std::shared_ptr<PARENTTYPE>& parent, const SOCKETTYPE& socket, const std::shared_ptr<unsigned char>& buffer, size_t size) {
+        template <class PARENTTYPE, class SOCKETTYPE>inline void ProcessControlMessage(const PARENTTYPE& parent, const SOCKETTYPE& socket, const std::shared_ptr<unsigned char>& buffer, size_t size) {
             if (!getFin(socket->ReceiveHeader)) {
                 return closeImpl(parent, socket, 1002, "Closing connection. Control Frames must be Fin");
             }