|
|
|
@ -3678,7 +3678,7 @@ srs_error_t SrsConfig::check_normal_config()
|
|
|
|
|
for (int i = 0; conf && i < (int)conf->directives.size(); i++) {
|
|
|
|
|
string n = conf->at(i)->name;
|
|
|
|
|
if (n != "enabled" && n != "listen" && n != "dir" && n != "candidate" && n != "ecdsa"
|
|
|
|
|
&& n != "encrypt" && n != "reuseport" && n != "merge_nalus" && n != "perf_stat" && n != "black_hole"
|
|
|
|
|
&& n != "encrypt" && n != "reuseport" && n != "merge_nalus" && n != "black_hole"
|
|
|
|
|
&& n != "ip_family") {
|
|
|
|
|
return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "illegal rtc_server.%s", n.c_str());
|
|
|
|
|
}
|
|
|
|
@ -5033,23 +5033,6 @@ bool SrsConfig::get_rtc_server_merge_nalus()
|
|
|
|
|
return SRS_CONF_PERFER_TRUE(conf->arg0());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool SrsConfig::get_rtc_server_perf_stat()
|
|
|
|
|
{
|
|
|
|
|
static bool DEFAULT = false;
|
|
|
|
|
|
|
|
|
|
SrsConfDirective* conf = root->get("rtc_server");
|
|
|
|
|
if (!conf) {
|
|
|
|
|
return DEFAULT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
conf = conf->get("perf_stat");
|
|
|
|
|
if (!conf || conf->arg0().empty()) {
|
|
|
|
|
return DEFAULT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return SRS_CONF_PERFER_FALSE(conf->arg0());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool SrsConfig::get_rtc_server_black_hole()
|
|
|
|
|
{
|
|
|
|
|
static bool DEFAULT = false;
|
|
|
|
|