winlin

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

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR "0" 32 #define VERSION_MAJOR "0"
33 #define VERSION_MINOR "9" 33 #define VERSION_MINOR "9"
34 -#define VERSION_REVISION "90" 34 +#define VERSION_REVISION "91"
35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION 35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "srs" 37 #define RTMP_SIG_SRS_KEY "srs"
@@ -1188,7 +1188,8 @@ int SrsComplexHandshake::handshake_with_server(SrsHandshakeBytes* hs_bytes, ISrs @@ -1188,7 +1188,8 @@ int SrsComplexHandshake::handshake_with_server(SrsHandshakeBytes* hs_bytes, ISrs
1188 1188
1189 // sign c1 1189 // sign c1
1190 c1s1 c1; 1190 c1s1 c1;
1191 - if ((ret = c1.c1_create(srs_schema0)) != ERROR_SUCCESS) { 1191 + // @remark, FMS requires the schema1(digest-key), or connect failed.
  1192 + if ((ret = c1.c1_create(srs_schema1)) != ERROR_SUCCESS) {
1192 return ret; 1193 return ret;
1193 } 1194 }
1194 c1.dump(hs_bytes->c0c1 + 1); 1195 c1.dump(hs_bytes->c0c1 + 1);
@@ -43,6 +43,7 @@ namespace srs @@ -43,6 +43,7 @@ namespace srs
43 */ 43 */
44 enum srs_schema_type { 44 enum srs_schema_type {
45 srs_schema0 = 0, // key-digest sequence 45 srs_schema0 = 0, // key-digest sequence
  46 + // @remark, FMS requires the schema1(digest-key), or connect failed.
46 srs_schema1 = 1, // digest-key sequence 47 srs_schema1 = 1, // digest-key sequence
47 srs_schema_invalid = 2, 48 srs_schema_invalid = 2,
48 }; 49 };