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

fix #372, support transform vhost of edge 2.0.155.

Browse source
This commit is contained in:
winlin 2015-04-03 10:56:56 +08:00
parent 4d98cbb965
commit 17c0a5c470
7 changed files with 91 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
trunk/src/app/srs_app_config.cpp
View file

@ -1409,7 +1409,7 @@ int SrsConfig::check_config()
SrsConfDirective* conf = vhost->at(i);
string n = conf->name;
if (n != "enabled" && n != "chunk_size"
&& n != "mode" && n != "origin" && n != "token_traverse"
&& n != "mode" && n != "origin" && n != "token_traverse" && n != "vhost"
&& n != "dvr" && n != "ingest" && n != "hls" && n != "http_hooks"
&& n != "gop_cache" && n != "queue_length"
&& n != "refer" && n != "refer_publish" && n != "refer_play"
@ -2517,12 +2517,12 @@ bool SrsConfig::get_vhost_is_edge(SrsConfDirective* vhost)
SrsConfDirective* conf = vhost;
if (!conf) {
return false;
return SRS_CONF_DEFAULT_EDGE_MODE;
}
conf = conf->get("mode");
if (!conf || conf->arg0() != "remote") {
return false;
return SRS_CONF_DEFAULT_EDGE_MODE;
}
return true;
@ -2544,17 +2544,33 @@ bool SrsConfig::get_vhost_edge_token_traverse(string vhost)
SrsConfDirective* conf = get_vhost(vhost);
if (!conf) {
return false;
return SRS_CONF_DEFAULT_EDGE_TOKEN_TRAVERSE;
}
conf = conf->get("token_traverse");
if (!conf || conf->arg0() != "on") {
return false;
return SRS_CONF_DEFAULT_EDGE_TOKEN_TRAVERSE;
}
return true;
}
string SrsConfig::get_vhost_edge_transform_vhost(string vhost)
{
SrsConfDirective* conf = get_vhost(vhost);
if (!conf) {
return SRS_CONF_DEFAULT_EDGE_TRANSFORM_VHOST;
}
conf = conf->get("vhost");
if (!conf || conf->arg0().empty()) {
return SRS_CONF_DEFAULT_EDGE_TRANSFORM_VHOST;
}
return conf->arg0();
}
bool SrsConfig::get_security_enabled(string vhost)
{
SrsConfDirective* conf = get_vhost(vhost);