external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 19:31:53 +00:00
Code Issues Releases Wiki Activity

change log message

Browse source
This commit is contained in:
sangbumlikeagod 2024-12-30 01:04:33 +09:00
parent b320fdd909
commit 9affdfda03
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2533,10 +2533,10 @@ srs_error_t SrsConfig::check_normal_config()
); );
bool isNotSameHttp = intersection_result.size() == 0; bool isNotSameHttp = intersection_result.size() == 0;
bool isFullyContainedHttp = intersection_result.size() != 0 && intersection_result.size() == api_vec.size(); bool isFullyContainedHttp = !isNotSameHttp && intersection_result.size() == api_vec.size();
if (!isNotSameHttp && !isFullyContainedHttp) if (!isNotSameHttp && !isFullyContainedHttp)
{ {
return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "http api and server have a intersection, but http server doesn't fully contain http api"); return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "http api and http server intersect in functionality, but an http server does not fully encapsulate an http api");
} }
vector<string> apis_vec = get_https_apis_listens(); vector<string> apis_vec = get_https_apis_listens();
vector<string> servers_vec = get_https_streams_listens(); vector<string> servers_vec = get_https_streams_listens();
@ -2550,10 +2550,10 @@ srs_error_t SrsConfig::check_normal_config()
); );
bool isNotSameHttps = intersections_result.size() == 0; bool isNotSameHttps = intersections_result.size() == 0;
bool isFullyContainedHttps = intersections_result.size() != 0 && intersections_result.size() == apis_vec.size(); bool isFullyContainedHttps = !isNotSameHttps && intersections_result.size() == apis_vec.size();
if (!isNotSameHttps && !isFullyContainedHttps) if (!isNotSameHttps && !isFullyContainedHttps)
{ {
return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "https api and server have a intersection, but https server doesn't fully contain https api"); return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "https api and https server intersect in functionality, but an https server does not fully encapsulate an https api");
} }
if (!isNotSameHttp && isNotSameHttps) { if (!isNotSameHttp && isNotSameHttps) {
return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "for same http, https api != server"); return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "for same http, https api != server");

6
trunk/src/app/srs_app_server.cpp
View file

@ -544,13 +544,13 @@ srs_error_t SrsServer::initialize()
std::back_inserter(intersections_result) std::back_inserter(intersections_result)
); );
bool isNotSameHttp = intersection_result.size() == 0; bool isNotSameHttp = intersection_result.size() == 0;
bool isFullyContainedHttp = intersection_result.size() != 0 && intersection_result.size() == api_vec.size(); bool isFullyContainedHttp = !isNotSameHttp && intersection_result.size() == api_vec.size();
bool isNotSameHttps = intersections_result.size() == 0; bool isNotSameHttps = intersections_result.size() == 0;
bool isFullyContainedHttps = intersections_result.size() != 0 && intersections_result.size() == apis_vec.size(); bool isFullyContainedHttps = !isNotSameHttps && intersections_result.size() == apis_vec.size();
if ((!isNotSameHttp && !isFullyContainedHttp) || (!isNotSameHttps && !isFullyContainedHttps)) if ((!isNotSameHttp && !isFullyContainedHttp) || (!isNotSameHttps && !isFullyContainedHttps))
{ {
return srs_error_wrap(err, "http api and http server have a intersection. but http server doesn't fully contain http api"); return srs_error_wrap(err, "http api and http server intersect in functionality, but an http server does not fully encapsulate an http api");
} }
if (stream && api && isFullyContainedHttp && isFullyContainedHttps) if (stream && api && isFullyContainedHttp && isFullyContainedHttps)