external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

donot ensure transaction-id===1 for connect req/res, change to 0.9.41

Browse source
This commit is contained in:
winlin 2014-03-31 10:22:00 +08:00
parent e3254377ce
commit 27029679e9
2 changed files with 9 additions and 5 deletions
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
#define VERSION_MAJOR "0"
#define VERSION_MINOR "9"
#define VERSION_REVISION "40"
#define VERSION_REVISION "41"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "srs"

12
trunk/src/rtmp/srs_protocol_rtmp_stack.cpp
View file

@ -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);
return 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);
return ret;
ret = ERROR_SUCCESS;
}
if ((ret = props->read(stream)) != ERROR_SUCCESS) {