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 the complex handshake of librtmp. refine makefile of librtmp tools

Browse source
This commit is contained in:
winlin 2014-05-26 15:54:39 +08:00
parent 69248cedaa
commit 93c9c55fb9
5 changed files with 39 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

27
trunk/src/libs/srs_librtmp.cpp
View file

@ -183,33 +183,6 @@ int srs_simple_handshake(srs_rtmp_t rtmp)
return ret;
}
int srs_complex_handshake(srs_rtmp_t rtmp)
{
#ifndef SRS_AUTO_SSL
return ERROR_RTMP_HS_SSL_REQUIRE;
#endif
int ret = ERROR_SUCCESS;
srs_assert(rtmp != NULL);
Context* context = (Context*)rtmp;
// parse uri, resolve host, connect to server:port
if ((ret = srs_librtmp_context_connect(context)) != ERROR_SUCCESS) {
return ret;
}
// complex handshake
srs_freep(context->rtmp);
context->rtmp = new SrsRtmpClient(context->skt);
if ((ret = context->rtmp->complex_handshake()) != ERROR_SUCCESS) {
return ret;
}
return ret;
}
int srs_connect_app(srs_rtmp_t rtmp)
{
int ret = ERROR_SUCCESS;