amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-23 03:10:04 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

修复url解析相关bug

Browse Source
This commit is contained in:
xiongziliang 2020-09-20 20:15:39 +08:00
parent 016ca9465f
commit 08a5891bdc
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Common/MediaSource.cpp
View File

@ -364,8 +364,14 @@ bool MediaSource::unregist() {
/////////////////////////////////////MediaInfo////////////////////////////////////// /////////////////////////////////////MediaInfo//////////////////////////////////////
void MediaInfo::parse(const string &url){ void MediaInfo::parse(const string &url_in){
//string url = "rtsp://127.0.0.1:8554/live/id?key=val&a=1&&b=2&vhost=vhost.com"; string url = url_in;
auto pos = url.find("?");
if (pos != string::npos) {
_param_strs = url.substr(pos + 1);
url.erase(pos);
}
auto schema_pos = url.find("://"); auto schema_pos = url.find("://");
if (schema_pos != string::npos) { if (schema_pos != string::npos) {
_schema = url.substr(0, schema_pos); _schema = url.substr(0, schema_pos);
@ -382,12 +388,10 @@ void MediaInfo::parse(const string &url){
} else { } else {
_host = _vhost = vhost; _host = _vhost = vhost;
} }
if (_vhost == "localhost" || INADDR_NONE != inet_addr(_vhost.data())) { if (_vhost == "localhost" || INADDR_NONE != inet_addr(_vhost.data())) {
//如果访问的是localhost或ip，那么则为默认虚拟主机 //如果访问的是localhost或ip，那么则为默认虚拟主机
_vhost = DEFAULT_VHOST; _vhost = DEFAULT_VHOST;
} }
} }
if (split_vec.size() > 1) { if (split_vec.size() > 1) {
_app = split_vec[1]; _app = split_vec[1];
@ -400,18 +404,13 @@ void MediaInfo::parse(const string &url){
if (stream_id.back() == '/') { if (stream_id.back() == '/') {
stream_id.pop_back(); stream_id.pop_back();
} }
auto pos = stream_id.find("?"); _streamid = stream_id;
if (pos != string::npos) { }
_streamid = stream_id.substr(0, pos);
_param_strs = stream_id.substr(pos + 1);
auto params = Parser::parseArgs(_param_strs); auto params = Parser::parseArgs(_param_strs);
if (params.find(VHOST_KEY) != params.end()) { if (params.find(VHOST_KEY) != params.end()) {
_vhost = params[VHOST_KEY]; _vhost = params[VHOST_KEY];
} }
} else {
_streamid = stream_id;
}
}
GET_CONFIG(bool, enableVhost, General::kEnableVhost); GET_CONFIG(bool, enableVhost, General::kEnableVhost);
if (!enableVhost || _vhost.empty()) { if (!enableVhost || _vhost.empty()) {