THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

降低TCP RTP 2字节头被误判为EHOME头的风险 (#2502) 

当TCP RTP包大小为256字节时，可能触发RtpSplitter::onSearchPacketTail误判为EHOME格式。
这个修改一旦检测到数据不是EHOME格式，则后续不再进行尝试，以减小误判的风险。
This commit is contained in:
dengjfzh 2023-05-27 22:27:10 +08:00 committed by GitHub
parent 032a2ac91d
commit 18dbbc8d19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Rtp/RtpSplitter.cpp
View File

@ -46,6 +46,7 @@ const char *RtpSplitter::onSearchPacketTail(const char *data, size_t len) {
return nullptr; return nullptr;
} }
if ( _is_ehome ) {
if (isEhome(data, len)) { if (isEhome(data, len)) {
//是ehome协议 //是ehome协议
if (len < kEHOME_OFFSET + 4) { if (len < kEHOME_OFFSET + 4) {
@ -58,6 +59,8 @@ const char *RtpSplitter::onSearchPacketTail(const char *data, size_t len) {
//忽略ehome私有头 //忽略ehome私有头
return onSearchPacketTail_l(data + kEHOME_OFFSET + 2, len - kEHOME_OFFSET - 2); return onSearchPacketTail_l(data + kEHOME_OFFSET + 2, len - kEHOME_OFFSET - 2);
} }
_is_ehome = false;
}
if ( _is_rtsp_interleaved ) { if ( _is_rtsp_interleaved ) {
if (data[0] == '$') { if (data[0] == '$') {

2
src/Rtp/RtpSplitter.h
View File

@ -35,7 +35,7 @@ protected:
const char *onSearchPacketTail_l(const char *data, size_t len); const char *onSearchPacketTail_l(const char *data, size_t len);
private: private:
bool _is_ehome = false; bool _is_ehome = true;
bool _is_rtsp_interleaved = true; bool _is_rtsp_interleaved = true;
size_t _offset = 0; size_t _offset = 0;
}; };