[SCTP] pull sctp_proto bug fix related to self.next_ssn +=1

webrtc-rs · Mar 16, 2024 · e1e567b · e1e567b
1 parent 69d0367
commit e1e567b
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 3 deletions.
diff --git a/rtc-sctp/src/queue/queue_test.rs b/rtc-sctp/src/queue/queue_test.rs
@@ -993,3 +993,48 @@ fn test_chunk_set_incomplete_chunk_set_no_contiguous_tsn() -> Result<()> {
     );
     Ok(())
 }
+
+#[test]
+fn test_reassembly_queue_ssn_overflow() -> Result<()> {
+    let mut rq = ReassemblyQueue::new(0);
+    let org_ppi = PayloadProtocolIdentifier::Binary;
+
+    for stream_sequence_number in 0..=u16::MAX {
+        let chunk = ChunkPayloadData {
+            payload_type: org_ppi,
+            beginning_fragment: true,
+            ending_fragment: true,
+            tsn: 10,
+            stream_sequence_number,
+            user_data: Bytes::from_static(b"123"),
+            ..Default::default()
+        };
+        assert!(rq.push(chunk));
+        assert!(rq.read().is_some());
+    }
+
+    Ok(())
+}
+
+#[test]
+fn test_reassembly_queue_ssn_overflow_in_forward_tsn_for_ordered() -> Result<()> {
+    let mut rq = ReassemblyQueue::new(0);
+    let org_ppi = PayloadProtocolIdentifier::Binary;
+
+    for stream_sequence_number in 0..u16::MAX {
+        let chunk = ChunkPayloadData {
+            payload_type: org_ppi,
+            beginning_fragment: true,
+            ending_fragment: true,
+            tsn: 10,
+            stream_sequence_number,
+            user_data: Bytes::from_static(b"123"),
+            ..Default::default()
+        };
+        assert!(rq.push(chunk));
+        assert!(rq.read().is_some());
+    }
+    rq.forward_tsn_for_ordered(u16::MAX);
+
+    Ok(())
+}
diff --git a/rtc-sctp/src/queue/reassembly_queue.rs b/rtc-sctp/src/queue/reassembly_queue.rs
@@ -351,7 +351,7 @@ impl ReassemblyQueue {
                 self.unordered.remove(0)
             } else {
                 if ordered_chunks.ssn == self.next_ssn {
-                    self.next_ssn += 1;
+                    self.next_ssn = self.next_ssn.wrapping_add(1);
                 }
                 self.ordered.remove(0)
             }
@@ -369,7 +369,7 @@ impl ReassemblyQueue {
                     return None;
                 }
                 if chunks.ssn == self.next_ssn {
-                    self.next_ssn += 1;
+                    self.next_ssn = self.next_ssn.wrapping_add(1);
                 }
                 self.ordered.remove(0)
             } else {
@@ -399,7 +399,7 @@ impl ReassemblyQueue {
 
         // Finally, forward next_ssn
         if sna16lte(self.next_ssn, last_ssn) {
-            self.next_ssn = last_ssn + 1;
+            self.next_ssn = last_ssn.wrapping_add(1);
         }
     }