external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

fix bug #59: edge for FMS, always use schema1(digest-key) for FMS, or connect failed.

Browse source
This commit is contained in:
winlin 2014-05-08 11:51:49 +08:00
parent b2aab8804b
commit fa9870db96
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR "0" #define VERSION_MAJOR "0"
#define VERSION_MINOR "9" #define VERSION_MINOR "9"
#define VERSION_REVISION "90" #define VERSION_REVISION "91"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info. // server info.
#define RTMP_SIG_SRS_KEY "srs" #define RTMP_SIG_SRS_KEY "srs"

3
trunk/src/rtmp/srs_protocol_handshake.cpp
View file

@ -1188,7 +1188,8 @@ int SrsComplexHandshake::handshake_with_server(SrsHandshakeBytes* hs_bytes, ISrs
// sign c1 // sign c1
c1s1 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; return ret;
} }
c1.dump(hs_bytes->c0c1 + 1); c1.dump(hs_bytes->c0c1 + 1);

1
trunk/src/rtmp/srs_protocol_handshake.hpp
View file

@ -43,6 +43,7 @@ namespace srs
*/ */
enum srs_schema_type { enum srs_schema_type {
srs_schema0 = 0, // key-digest sequence srs_schema0 = 0, // key-digest sequence
// @remark, FMS requires the schema1(digest-key), or connect failed.
srs_schema1 = 1, // digest-key sequence srs_schema1 = 1, // digest-key sequence
srs_schema_invalid = 2, srs_schema_invalid = 2,
}; };