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

Remove dead code in SrsRtmpClient::handshake

Browse source
This commit is contained in:
winlin 2019-12-13 16:31:32 +08:00
parent 82cbcf442e
commit 8d9554df8e
1 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1884,20 +1884,9 @@ srs_error_t SrsRtmpClient::handshake()
SrsAutoFree(SrsComplexHandshake, complex_hs); SrsAutoFree(SrsComplexHandshake, complex_hs);
if ((err = complex_hs->handshake_with_server(hs_bytes, io)) != srs_success) { if ((err = complex_hs->handshake_with_server(hs_bytes, io)) != srs_success) {
if (srs_error_code(err) == ERROR_RTMP_TRY_SIMPLE_HS) { // As client, we never verify s0s1s2, because some server doesn't follow the RTMP spec.
srs_freep(err); // So we never have chance to use simple handshake.
return srs_error_wrap(err, "complex handshake");
// always alloc object at heap.
// @see https://github.com/ossrs/srs/issues/509
SrsSimpleHandshake* simple_hs = new SrsSimpleHandshake();
SrsAutoFree(SrsSimpleHandshake, simple_hs);
if ((err = simple_hs->handshake_with_server(hs_bytes, io)) != srs_success) {
return srs_error_wrap(err, "simple handshake");
}
} else {
return srs_error_wrap(err, "complex handshake");
}
} }
hs_bytes->dispose(); hs_bytes->dispose();