diff --git a/src/Http/HttpChunkedSplitter.cpp b/src/Http/HttpChunkedSplitter.cpp index 3083a67f..2b8b3d84 100644 --- a/src/Http/HttpChunkedSplitter.cpp +++ b/src/Http/HttpChunkedSplitter.cpp @@ -9,29 +9,32 @@ */ #include +#include "Common/macros.h" #include "HttpChunkedSplitter.h" using namespace std; +//[chunk size][\r\n][chunk data][\r\n][chunk size][\r\n][chunk data][\r\n][chunk size = 0][\r\n][\r\n] + namespace mediakit{ - + const char *HttpChunkedSplitter::onSearchPacketTail(const char *data, size_t len) { - auto pos = strstr(data,"\r\n"); - if(!pos){ + auto pos = strstr(data, "\r\n"); + if (!pos) { return nullptr; } return pos + 2; } void HttpChunkedSplitter::onRecvContent(const char *data, size_t len) { - onRecvChunk(data,len - 2); + onRecvChunk(data, len - 2); } ssize_t HttpChunkedSplitter::onRecvHeader(const char *data, size_t len) { - string str(data,len - 2); - int ret; - sscanf(str.data(),"%X",&ret); - return ret + 2; + int size; + CHECK(sscanf(data, "%X", &size) == 1 && size >= 0); + //包括后面\r\n两个字节 + return size + 2; } -}//namespace mediakit \ No newline at end of file +}//namespace mediakit diff --git a/src/Http/HttpChunkedSplitter.h b/src/Http/HttpChunkedSplitter.h index ae16c58d..6d8561f1 100644 --- a/src/Http/HttpChunkedSplitter.h +++ b/src/Http/HttpChunkedSplitter.h @@ -21,12 +21,10 @@ public: /** * len == 0时代表结束 */ - typedef std::function onChunkData; + using onChunkData = std::function; - HttpChunkedSplitter(const onChunkData &cb){ - _onChunkData = cb; - }; - ~HttpChunkedSplitter() override {} ; + HttpChunkedSplitter(const onChunkData &cb) { _onChunkData = cb; }; + ~HttpChunkedSplitter() override { _onChunkData = nullptr; }; protected: ssize_t onRecvHeader(const char *data,size_t len) override;