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 #1657: Remove duplicated code, merge http api with conn

Browse source
This commit is contained in:
winlin 2020-11-05 16:46:16 +08:00
parent 9cf4203201
commit 0a3a38762a
6 changed files with 117 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

17
trunk/src/app/srs_app_caster_flv.cpp
View file

@ -149,10 +149,14 @@ SrsDynamicHttpConn::SrsDynamicHttpConn(ISrsResourceManager* cm, srs_netfd_t fd,
conn = new SrsHttpConn(this, fd, m, cip, cport);
ip = cip;
port = cport;
_srs_config->subscribe(this);
}
SrsDynamicHttpConn::~SrsDynamicHttpConn()
{
_srs_config->unsubscribe(this);
srs_freep(conn);
srs_freep(sdk);
srs_freep(pprint);
@ -249,6 +253,12 @@ srs_error_t SrsDynamicHttpConn::do_proxy(ISrsHttpResponseReader* rr, SrsFlvDecod
return err;
}
srs_error_t SrsDynamicHttpConn::on_reload_http_stream_crossdomain()
{
bool v = _srs_config->get_http_stream_crossdomain();
return conn->set_crossdomain_enabled(v);
}
srs_error_t SrsDynamicHttpConn::on_http_message(ISrsHttpMessage* msg)
{
return srs_success;
@ -278,6 +288,13 @@ const SrsContextId& SrsDynamicHttpConn::get_id()
srs_error_t SrsDynamicHttpConn::start()
{
srs_error_t err = srs_success;
bool v = _srs_config->get_http_stream_crossdomain();
if ((err = conn->set_crossdomain_enabled(v)) != srs_success) {
return srs_error_wrap(err, "set cors=%d", v);
}
return conn->start();
}