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
2014-08-19 16:32:52 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
4d5414faec7c91d36b0bbcf9281f821e828b1e06
4d5414fa
1 parent
f549f88e
update log, add dsu(debug_srs_upnode), 0.9.204
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
9 行增加
和
6 行删除
trunk/src/app/srs_app_edge.cpp
trunk/src/app/srs_app_forward.cpp
trunk/src/core/srs_core.hpp
trunk/src/rtmp/srs_protocol_rtmp.cpp
trunk/src/app/srs_app_edge.cpp
查看文件 @
4d5414f
...
...
@@ -256,7 +256,8 @@ int SrsEdgeIngester::connect_app(string ep_server, string ep_port)
// the debug_srs_upnode is config in vhost and default to true.
bool
debug_srs_upnode
=
_srs_config
->
get_debug_srs_upnode
(
req
->
vhost
);
if
((
ret
=
client
->
connect_app
(
req
->
app
,
tc_url
,
req
,
debug_srs_upnode
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"connect with server failed, tcUrl=%s. ret=%d"
,
tc_url
.
c_str
(),
ret
);
srs_error
(
"connect with server failed, tcUrl=%s, dsu=%d. ret=%d"
,
tc_url
.
c_str
(),
debug_srs_upnode
,
ret
);
return
ret
;
}
...
...
@@ -686,7 +687,8 @@ int SrsEdgeForwarder::connect_app(string ep_server, string ep_port)
// the debug_srs_upnode is config in vhost and default to true.
bool
debug_srs_upnode
=
_srs_config
->
get_debug_srs_upnode
(
req
->
vhost
);
if
((
ret
=
client
->
connect_app
(
req
->
app
,
tc_url
,
req
,
debug_srs_upnode
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"connect with server failed, tcUrl=%s. ret=%d"
,
tc_url
.
c_str
(),
ret
);
srs_error
(
"connect with server failed, tcUrl=%s, dsu=%d. ret=%d"
,
tc_url
.
c_str
(),
debug_srs_upnode
,
ret
);
return
ret
;
}
...
...
trunk/src/app/srs_app_forward.cpp
查看文件 @
4d5414f
...
...
@@ -352,7 +352,8 @@ int SrsForwarder::connect_app(string ep_server, string ep_port)
// the debug_srs_upnode is config in vhost and default to true.
bool
debug_srs_upnode
=
_srs_config
->
get_debug_srs_upnode
(
req
->
vhost
);
if
((
ret
=
client
->
connect_app
(
req
->
app
,
tc_url
,
req
,
debug_srs_upnode
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"connect with server failed, tcUrl=%s. ret=%d"
,
tc_url
.
c_str
(),
ret
);
srs_error
(
"connect with server failed, tcUrl=%s, dsu=%d. ret=%d"
,
tc_url
.
c_str
(),
debug_srs_upnode
,
ret
);
return
ret
;
}
...
...
trunk/src/core/srs_core.hpp
查看文件 @
4d5414f
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR "0"
#define VERSION_MINOR "9"
#define VERSION_REVISION "20
3
"
#define VERSION_REVISION "20
4
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
trunk/src/rtmp/srs_protocol_rtmp.cpp
查看文件 @
4d5414f
...
...
@@ -536,8 +536,8 @@ int SrsRtmpClient::connect_app2(
srs_pid
=
(
int
)
prop
->
to_number
();
}
}
srs_trace
(
"connected, version=%s, ip=%s, pid=%d, id=%d"
,
srs_version
.
c_str
(),
srs_server_ip
.
c_str
(),
srs_pid
,
srs_id
);
srs_trace
(
"connected, version=%s, ip=%s, pid=%d, id=%d, dsu=%d"
,
srs_version
.
c_str
(),
srs_server_ip
.
c_str
(),
srs_pid
,
srs_id
,
debug_srs_upnode
);
return
ret
;
}
...
...
请
注册
或
登录
后发表评论