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-10-24 13:17:11 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
e3e18b9915692e870d03b66921f514188bd79cfb
e3e18b99
1 parent
fe59783d
for bug #186, read the args when discovery it. 1.0.4
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
8 行增加
和
2 行删除
trunk/src/core/srs_core.hpp
trunk/src/rtmp/srs_protocol_stack.cpp
trunk/src/core/srs_core.hpp
查看文件 @
e3e18b9
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR "1"
#define VERSION_MINOR "0"
#define VERSION_REVISION "
3
"
#define VERSION_REVISION "
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_stack.cpp
查看文件 @
e3e18b9
...
...
@@ -1869,11 +1869,17 @@ int SrsConnectAppPacket::decode(SrsStream* stream)
// the args maybe any amf0, for instance, a string. we should drop if not object.
SrsAmf0Any
*
any
=
NULL
;
if
((
ret
=
SrsAmf0Any
::
discovery
(
stream
,
&
any
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"amf0
decode
connect args failed. ret=%d"
,
ret
);
srs_error
(
"amf0
find
connect args failed. ret=%d"
,
ret
);
return
ret
;
}
srs_assert
(
any
);
// read the instance
if
((
ret
=
any
->
read
(
stream
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"amf0 decode connect args failed. ret=%d"
,
ret
);
return
ret
;
}
// drop when not an AMF0 object.
if
(
!
any
->
is_object
())
{
srs_warn
(
"drop the args, see: '4.1.1. connect', marker=%#x"
,
any
->
marker
);
...
...
请
注册
或
登录
后发表评论