Fix #1580, fix cid range problem. 3.0.102

lam2003 · winlinvip · commit 86d04a70ed8f · 2020-01-19T18:21:28.000+08:00
diff --git a/README.md b/README.md
@@ -146,6 +146,7 @@ For previous versions, please read:
 
 ## V3 changes
 
+* v3.0, 2020-01-19, For [#1580][bug #1580], fix cid range problem. 3.0.102
 * v3.0, 2020-01-19, For [#1070][bug #1070], define FLV CodecID for [AV1][bug #1070] and [opus][bug #307]. 3.0.101
 * v3.0, 2020-01-16, For [#1575][bug #1575], correct RTMP redirect as tcUrl, add redirect2 as RTMP URL. 3.0.100
 * v3.0, 2020-01-15, For [#1509][bug #1509], decrease the fast vector init size from 64KB to 64B. 3.0.99
@@ -1600,6 +1601,7 @@ Winlin
 [bug #1575]: https://github.com/ossrs/srs/issues/1575
 [bug #307]: https://github.com/ossrs/srs/issues/307
 [bug #1070]: https://github.com/ossrs/srs/issues/1070
+[bug #1580]: https://github.com/ossrs/srs/issues/1580
 [bug #xxxxxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxxxxx
 
 [exo #828]: https://github.com/google/ExoPlayer/pull/828
diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
@@ -27,7 +27,7 @@
 // The version config.
 #define VERSION_MAJOR       3
 #define VERSION_MINOR       0
-#define VERSION_REVISION    101
+#define VERSION_REVISION    102
 
 // The macros generated by configure script.
 #include <srs_auto_headers.hpp>
diff --git a/trunk/src/kernel/srs_kernel_flv.cpp b/trunk/src/kernel/srs_kernel_flv.cpp
@@ -291,7 +291,7 @@ bool SrsSharedPtrMessage::check(int stream_id)
 
     // we donot use the complex basic header,
     // ensure the basic header is 1bytes.
-    if (ptr->header.perfer_cid < 2) {
+    if (ptr->header.perfer_cid < 2 || ptr->header.perfer_cid > 63) {
         srs_info("change the chunk_id=%d to default=%d", ptr->header.perfer_cid, RTMP_CID_ProtocolControl);
         ptr->header.perfer_cid = RTMP_CID_ProtocolControl;
     }

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ bool SrsSharedPtrMessage::check(int stream_id)`
`291`	`291`
`292`	`292`	`// we donot use the complex basic header,`
`293`	`293`	`// ensure the basic header is 1bytes.`
`294`		`- if (ptr->header.perfer_cid < 2) {`
	`294`	`+ if (ptr->header.perfer_cid < 2 \|\| ptr->header.perfer_cid > 63) {`
`295`	`295`	`srs_info("change the chunk_id=%d to default=%d", ptr->header.perfer_cid, RTMP_CID_ProtocolControl);`
`296`	`296`	`ptr->header.perfer_cid = RTMP_CID_ProtocolControl;`
`297`	`297`	`}`