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-07-23 10:53:25 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
2e58fac5ebd4a23f1f965cb578a5acfa9cd050cf
2e58fac5
1 parent
b56e7ef7
fix #122: edge forwarder(push to origin) assert failed, init client when connect to server. 0.9.167
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
12 行增加
和
3 行删除
trunk/src/app/srs_app_edge.cpp
trunk/src/core/srs_core.hpp
trunk/src/app/srs_app_edge.cpp
查看文件 @
2e58fac
...
...
@@ -311,7 +311,7 @@ int SrsEdgeIngester::connect_server()
kbps
->
set_io
(
io
,
io
);
srs_trace
(
"edge connected, can_publish=%d, url=%s/%s, server=%s:%d"
,
srs_trace
(
"edge
pull
connected, can_publish=%d, url=%s/%s, server=%s:%d"
,
_source
->
can_publish
(),
_req
->
tcUrl
.
c_str
(),
_req
->
stream
.
c_str
(),
server
.
c_str
(),
port
);
return
ret
;
...
...
@@ -555,8 +555,17 @@ int SrsEdgeForwarder::connect_server()
return
ret
;
}
srs_freep
(
client
);
srs_freep
(
io
);
srs_assert
(
stfd
);
io
=
new
SrsSocket
(
stfd
);
client
=
new
SrsRtmpClient
(
io
);
kbps
->
set_io
(
io
,
io
);
// open socket.
srs_trace
(
"
connect edge
stream=%s, tcUrl=%s to server=%s, port=%d"
,
srs_trace
(
"
edge push connected,
stream=%s, tcUrl=%s to server=%s, port=%d"
,
_req
->
stream
.
c_str
(),
_req
->
tcUrl
.
c_str
(),
server
.
c_str
(),
port
);
return
ret
;
...
...
trunk/src/core/srs_core.hpp
查看文件 @
2e58fac
...
...
@@ -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 "16
6
"
#define VERSION_REVISION "16
7
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
请
注册
或
登录
后发表评论