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-05-08 11:51:49 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
fa9870db96a9dde26eb6c6ce0baa95700832ebff
fa9870db
1 parent
b2aab880
fix bug #59: edge for FMS, always use schema1(digest-key) for FMS, or connect failed.
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
4 行增加
和
2 行删除
trunk/src/core/srs_core.hpp
trunk/src/rtmp/srs_protocol_handshake.cpp
trunk/src/rtmp/srs_protocol_handshake.hpp
trunk/src/core/srs_core.hpp
查看文件 @
fa9870d
...
...
@@ -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 "9
0
"
#define VERSION_REVISION "9
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_handshake.cpp
查看文件 @
fa9870d
...
...
@@ -1188,7 +1188,8 @@ int SrsComplexHandshake::handshake_with_server(SrsHandshakeBytes* hs_bytes, ISrs
// sign c1
c1s1
c1
;
if
((
ret
=
c1
.
c1_create
(
srs_schema0
))
!=
ERROR_SUCCESS
)
{
// @remark, FMS requires the schema1(digest-key), or connect failed.
if
((
ret
=
c1
.
c1_create
(
srs_schema1
))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
c1
.
dump
(
hs_bytes
->
c0c1
+
1
);
...
...
trunk/src/rtmp/srs_protocol_handshake.hpp
查看文件 @
fa9870d
...
...
@@ -43,6 +43,7 @@ namespace srs
*/
enum
srs_schema_type
{
srs_schema0
=
0
,
// key-digest sequence
// @remark, FMS requires the schema1(digest-key), or connect failed.
srs_schema1
=
1
,
// digest-key sequence
srs_schema_invalid
=
2
,
};
...
...
请
注册
或
登录
后发表评论