初步完成webSocket数据解析

src/Http/HttpRequestSplitter.cpp

@@ -3,6 +3,9 @@
 //
 
 #include "HttpRequestSplitter.h"
+#include "Util/logger.h"
+#include "Util/util.h"
+using namespace ZL::Util;
 
 void HttpRequestSplitter::input(const string &data) {
     if(_remain_data.empty()){

src/Http/HttpSession.h

@@ -33,6 +33,7 @@
 #include "Rtmp/RtmpMediaSource.h"
 #include "Rtmp/FlvMuxer.h"
 #include "HttpRequestSplitter.h"
+#include "WebSocketSplitter.h"
 
 using namespace std;
 using namespace ZL::Rtmp;
@@ -41,7 +42,10 @@ using namespace ZL::Network;
 namespace ZL {
 namespace Http {
 
-class HttpSession: public TcpSession,public FlvMuxer, public HttpRequestSplitter {
+class HttpSession: public TcpSession,
+                   public FlvMuxer,
+                   public HttpRequestSplitter,
+                   public WebSocketSplitter {
 public:
 	typedef StrCaseMap KeyValue;
 	typedef std::function<void(const string &codeOut,
@@ -103,7 +107,7 @@ protected:
      * @param data websocket数据
      */
 	virtual void onRecvWebSocketData(const Parser &header,const string &data){
-        shutdown();
+        WebSocketSplitter::decode((uint8_t *)data.data(),data.size());
     }
 private:
 	Parser m_parser;
@@ -140,10 +144,12 @@ public:
     EchoWebSocketSession(const std::shared_ptr<ThreadPool> &pTh, const Socket::Ptr &pSock) : HttpSession(pTh,pSock){};
     virtual ~EchoWebSocketSession(){};
 protected:
-    void onRecvWebSocketData(const Parser &header,const string &data) override {
+    void onWebSocketHeader(const WebSocketHeader &packet) override{
-        DebugL << "收到websocket数据:" << data;
+        DebugL << packet._playload_len;
-        (*this) << "echo:" << data;
+    };
-    }
+    void onWebSocketPlayload(const WebSocketHeader &packet,const uint8_t *ptr,uint64_t len,uint64_t recved) override {
+        DebugL << string((char *)ptr,len) << " " << recved;
+    };
 };
 
 } /* namespace Http */

src/Http/WebSocketSplitter.cpp

@@ -0,0 +1,126 @@
+//
+// Created by xzl on 2018/9/21.
+//
+
+#include "WebSocketSplitter.h"
+#include "Util/logger.h"
+#include "Util/util.h"
+using namespace ZL::Util;
+/**
+ *
+  0             1                 2               3
+  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ +-+-+-+-+-------+-+-------------+-------------------------------+
+ |F|R|R|R| opcode|M| Payload len |    Extended payload length    |
+ |I|S|S|S|  (4)  |A|     (7)     |             (16/64)           |
+ |N|V|V|V|       |S|             |   (if payload len==126/127)   |
+ | |1|2|3|       |K|             |                               |
+ +-+-+-+-+-------+-+-------------+ - - - - - - - - - - - - - - - +
+ |     Extended payload length continued, if payload len == 127  |
+ + - - - - - - - - - - - - - - - +-------------------------------+
+ |                               |Masking-key, if MASK set to 1  |
+ +-------------------------------+-------------------------------+
+ | Masking-key (continued)       |          Payload Data         |
+ +-------------------------------- - - - - - - - - - - - - - - - +
+ :                     Payload Data continued ...                :
+ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ |                     Payload Data continued ...                |
+ +---------------------------------------------------------------+
+ */
+
+#define CHECK_LEN(size) \
+do{ \
+    if(len - (ptr - data) < size){ \
+        if(_remain_data.empty()){ \
+            _remain_data.assign((char *)data,len); \
+        } \
+        return ; \
+    } \
+}while(0) \
+
+void WebSocketSplitter::decode(uint8_t *data,uint64_t len) {
+    uint8_t *ptr = data;
+    if(!_got_header) {
+        //还没有获取数据头
+        if(!_remain_data.empty()){
+            _remain_data.append((char *)data,len);
+            data = ptr = (uint8_t *)_remain_data.data();
+            len = _remain_data.size();
+        }
+
+begin_decode:
+        CHECK_LEN(1);
+        _fin = (*ptr & 0x80) >> 7;
+        _reserved = (*ptr & 0x70) >> 4;
+        _opcode = (WebSocketHeader::Type) (*ptr & 0x0F);
+        ptr += 1;
+
+        CHECK_LEN(1);
+        _mask_flag = (*ptr & 0x80) >> 7;
+        _playload_len = (*ptr & 0x7F);
+        ptr += 1;
+
+        if (_playload_len == 126) {
+            CHECK_LEN(2);
+            _playload_len = (*ptr << 8) | *(ptr + 1);
+            ptr += 2;
+        } else if (_playload_len == 127) {
+            CHECK_LEN(8);
+            _playload_len = ((uint64_t) ptr[0] << (8 * 7)) |
+                            ((uint64_t) ptr[1] << (8 * 6)) |
+                            ((uint64_t) ptr[2] << (8 * 5)) |
+                            ((uint64_t) ptr[3] << (8 * 4)) |
+                            ((uint64_t) ptr[4] << (8 * 3)) |
+                            ((uint64_t) ptr[5] << (8 * 2)) |
+                            ((uint64_t) ptr[6] << (8 * 1)) |
+                            ((uint64_t) ptr[7] << (8 * 0));
+            ptr += 8;
+        }
+        if (_mask_flag) {
+            CHECK_LEN(4);
+            _mask.assign(ptr, ptr + 4);
+            ptr += 4;
+        }
+        _got_header = true;
+        _mask_offset = 0;
+        _playload_offset = 0;
+        onWebSocketHeader(*this);
+    }
+
+    uint64_t remain = len - (ptr - data);
+    if(remain > 0){
+        uint64_t playload_slice_len = remain;
+        if(playload_slice_len + _playload_offset > _playload_len){
+            playload_slice_len = _playload_len - _playload_offset;
+        }
+        onPlayloadData(ptr,playload_slice_len);
+        _playload_offset += playload_slice_len;
+
+        if(_playload_offset == _playload_len){
+            //这是下一个包
+            if(remain - playload_slice_len > 0){
+                string nextPacket((char *)ptr + playload_slice_len,remain - playload_slice_len);
+                _got_header = false;
+                _remain_data.clear();
+
+                data = ptr = (uint8_t *)nextPacket.data();
+                len = nextPacket.size();
+                goto begin_decode;
+            } else{
+                _got_header = false;
+            }
+        }
+    }
+    _remain_data.clear();
+}
+
+void WebSocketSplitter::onPlayloadData(uint8_t *ptr, uint64_t len) {
+    if(_mask_flag){
+        for(int i = 0; i < len ; ++i,++ptr){
+            InfoL << (int)(*(ptr)) << "^" << (int)(_mask[(i + _mask_offset) % 4]) << "=" << (int)(*(ptr) ^ _mask[(i + _mask_offset) % 4]);
+            *(ptr) ^= _mask[(i + _mask_offset) % 4];
+        }
+        _mask_offset = (_mask_offset + len) % 4;
+    }
+    onWebSocketPlayload(*this,_mask_flag ? ptr - len : ptr,len,_playload_offset);
+}

src/Http/WebSocketSplitter.h

@@ -0,0 +1,64 @@
+//
+// Created by xzl on 2018/9/21.
+//
+
+#ifndef ZLMEDIAKIT_WEBSOCKETSPLITTER_H
+#define ZLMEDIAKIT_WEBSOCKETSPLITTER_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+#include <memory>
+using namespace std;
+
+class WebSocketHeader {
+public:
+    typedef std::shared_ptr<WebSocketHeader> Ptr;
+    typedef enum {
+        CONTINUATION = 0x0,
+        TEXT = 0x1,
+        BINARY = 0x2,
+        RSV3 = 0x3,
+        RSV4 = 0x4,
+        RSV5 = 0x5,
+        RSV6 = 0x6,
+        RSV7 = 0x7,
+        CLOSE = 0x8,
+        PING = 0x9,
+        PONG = 0xA,
+        CONTROL_RSVB = 0xB,
+        CONTROL_RSVC = 0xC,
+        CONTROL_RSVD = 0xD,
+        CONTROL_RSVE = 0xE,
+        CONTROL_RSVF = 0xF
+    } Type;
+public:
+    bool _fin;
+    uint8_t _reserved;
+    Type _opcode;
+    bool _mask_flag;
+    uint64_t _playload_len;
+    vector<uint8_t > _mask;
+};
+
+class WebSocketSplitter : public WebSocketHeader{
+public:
+    WebSocketSplitter(){}
+    virtual ~WebSocketSplitter(){}
+
+    void decode(uint8_t *data,uint64_t len);
+    void encode(uint8_t *data,uint64_t len);
+protected:
+    virtual void onWebSocketHeader(const WebSocketHeader &packet) {};
+    virtual void onWebSocketPlayload(const WebSocketHeader &packet,const uint8_t *ptr,uint64_t len,uint64_t recved) {};
+private:
+    void onPlayloadData(uint8_t *data,uint64_t len);
+private:
+    string _remain_data;
+    int _mask_offset = 0;
+    bool _got_header = false;
+    uint64_t _playload_offset = 0;
+};
+
+
+#endif //ZLMEDIAKIT_WEBSOCKETSPLITTER_H