Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-12-24 19:14:23 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
11e11005acd00f2a53e5c0bf629f002cb85488de
11e11005
1 parent
d267b8fa
specifies the try default vhost
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
5 行增加
和
5 行删除
trunk/src/app/srs_app_rtmp_conn.cpp
trunk/src/app/srs_app_rtmp_conn.hpp
trunk/src/app/srs_app_rtmp_conn.cpp
查看文件 @
11e1100
...
...
@@ -418,8 +418,8 @@ int SrsRtmpConn::do_cycle()
return
ret
;
}
// check vhost
if
((
ret
=
check_vhost
())
!=
ERROR_SUCCESS
)
{
// check vhost, allow default vhost.
if
((
ret
=
check_vhost
(
true
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"check vhost failed. ret=%d"
,
ret
);
return
ret
;
}
...
...
@@ -787,13 +787,13 @@ int SrsRtmpConn::stream_service_cycle()
return
ret
;
}
int
SrsRtmpConn
::
check_vhost
()
int
SrsRtmpConn
::
check_vhost
(
bool
try_default_vhost
)
{
int
ret
=
ERROR_SUCCESS
;
srs_assert
(
req
!=
NULL
);
SrsConfDirective
*
vhost
=
_srs_config
->
get_vhost
(
req
->
vhost
);
SrsConfDirective
*
vhost
=
_srs_config
->
get_vhost
(
req
->
vhost
,
try_default_vhost
);
if
(
vhost
==
NULL
)
{
ret
=
ERROR_RTMP_VHOST_NOT_FOUND
;
srs_error
(
"vhost %s not found. ret=%d"
,
req
->
vhost
.
c_str
(),
ret
);
...
...
trunk/src/app/srs_app_rtmp_conn.hpp
查看文件 @
11e1100
...
...
@@ -171,7 +171,7 @@ private:
virtual
int
service_cycle
();
// stream(play/publish) service cycle, identify client first.
virtual
int
stream_service_cycle
();
virtual
int
check_vhost
();
virtual
int
check_vhost
(
bool
try_default_vhost
);
virtual
int
playing
(
SrsSource
*
source
);
virtual
int
do_playing
(
SrsSource
*
source
,
SrsConsumer
*
consumer
,
SrsQueueRecvThread
*
trd
);
virtual
int
publishing
(
SrsSource
*
source
);
...
...
请
注册
或
登录
后发表评论