external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

for #730, refine code to decode the acknowledge message

Browse source
This commit is contained in:
winlin 2017-01-06 13:16:25 +08:00
parent 759c84a395
commit dc1f227aeb
3 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
trunk/src/protocol/srs_rtmp_stack.cpp
View file

@ -5017,6 +5017,22 @@ SrsAcknowledgementPacket::~SrsAcknowledgementPacket()
{
}
int SrsAcknowledgementPacket::decode(SrsBuffer* stream)
{
int ret = ERROR_SUCCESS;
if (!stream->require(4)) {
ret = ERROR_RTMP_MESSAGE_DECODE;
srs_error("decode acknowledgement failed. ret=%d", ret);
return ret;
}
sequence_number = stream->read_4bytes();
srs_info("decode acknowledgement success");
return ret;
}
int SrsAcknowledgementPacket::get_prefer_cid()
{
return RTMP_CID_ProtocolControl;

3
trunk/src/protocol/srs_rtmp_stack.hpp
View file

@ -1847,6 +1847,9 @@ public:
public:
SrsAcknowledgementPacket();
virtual ~SrsAcknowledgementPacket();
// decode functions for concrete packet to override.
public:
virtual int decode(SrsBuffer* stream);
// encode functions for concrete packet to override.
public:
virtual int get_prefer_cid();

4
trunk/src/utest/srs_utest_core.cpp
View file

@ -31,12 +31,12 @@ using namespace std;
VOID TEST(CoreAutoFreeTest, Free)
{
char* data = new char[32];
srs_freep(data);
srs_freepa(data);
EXPECT_TRUE(data == NULL);
if (true) {
data = new char[32];
SrsAutoFree(char, data);
SrsAutoFreeA(char, data);
}
EXPECT_TRUE(data == NULL);
}