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-03-31 10:22:00 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
27029679e9bb376911e699f96103bdf65a034313
27029679
1 parent
e3254377
donot ensure transaction-id===1 for connect req/res, change to 0.9.41
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
9 行增加
和
5 行删除
trunk/src/core/srs_core.hpp
trunk/src/rtmp/srs_protocol_rtmp_stack.cpp
trunk/src/core/srs_core.hpp
查看文件 @
2702967
...
...
@@ -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 "4
0
"
#define VERSION_REVISION "4
1
"
#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_stack.cpp
查看文件 @
2702967
...
...
@@ -1752,11 +1752,13 @@ int SrsConnectAppPacket::decode(SrsStream* stream)
srs_error
(
"amf0 decode connect transaction_id failed. ret=%d"
,
ret
);
return
ret
;
}
// some client donot send id=1.0, so we only warn user if not match.
if
(
transaction_id
!=
1.0
)
{
ret
=
ERROR_RTMP_AMF0_DECODE
;
srs_
error
(
"amf0 decode connect transaction_id failed. "
srs_
warn
(
"amf0 decode connect transaction_id failed. "
"required=%.1f, actual=%.1f, ret=%d"
,
1.0
,
transaction_id
,
ret
);
ret
urn
ret
;
ret
=
ERROR_SUCCESS
;
}
if
((
ret
=
command_object
->
read
(
stream
))
!=
ERROR_SUCCESS
)
{
...
...
@@ -1845,11 +1847,13 @@ int SrsConnectAppResPacket::decode(SrsStream* stream)
srs_error
(
"amf0 decode connect transaction_id failed. ret=%d"
,
ret
);
return
ret
;
}
// some client donot send id=1.0, so we only warn user if not match.
if
(
transaction_id
!=
1.0
)
{
ret
=
ERROR_RTMP_AMF0_DECODE
;
srs_
error
(
"amf0 decode connect transaction_id failed. "
srs_
warn
(
"amf0 decode connect transaction_id failed. "
"required=%.1f, actual=%.1f, ret=%d"
,
1.0
,
transaction_id
,
ret
);
ret
urn
ret
;
ret
=
ERROR_SUCCESS
;
}
if
((
ret
=
props
->
read
(
stream
))
!=
ERROR_SUCCESS
)
{
...
...
请
注册
或
登录
后发表评论