zerotier/sequential-exchange
0
0
Fork 0
mirror of https://github.com/zerotier/sequential-exchange.git synced 2026-05-22 16:28:28 -07:00
Code Issues Packages Projects Releases Wiki Activity

fixed overflow

Browse Source
This commit is contained in:
Monica Moniot
2023-07-28 18:10:39 -04:00
parent 332b40f9be
commit 1978bc39f8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/seq_queue.rs
+6 -6
View File
@@ -211,15 +211,15 @@ impl<TL: TransportLayer> SeqEx<TL> {
// because there would be no way to reply.
// We can only process this packet if processing it would make space in the send window.
let next_i = self.next_send_seq_no as usize % self.send_window.len();
let would_be_full = self.send_window[next_i].as_ref().map_or(false, |e| Some(e.seq_no) != reply_no);
let is_full = self.send_window[next_i].as_ref().map_or(false, |e| Some(e.seq_no) != reply_no) || self.reserved_len >= self.reserved.len();
let i = seq_no as usize % self.recv_window.len();
if let Some(pre) = self.recv_window[i].as_mut() {
if seq_no == pre.seq_no {
if is_next && !would_be_full {
if is_next && !is_full {
self.recv_window[i] = None;
} else {
app.send_ack(seq_no);
return if would_be_full {
return if is_full {
Err(Error::WindowIsFull)
} else {
Err(Error::OutOfSequence)
@@ -230,7 +230,7 @@ impl<TL: TransportLayer> SeqEx<TL> {
return Err(Error::OutOfSequence);
}
}
if is_next && !would_be_full {
if is_next && !is_full {
self.pre_recv_seq_no = seq_no;
self.reserved[self.reserved_len] = seq_no;
self.reserved_len += 1;
@@ -242,7 +242,7 @@ impl<TL: TransportLayer> SeqEx<TL> {
self.receive_ack(reply_no);
}
app.send_ack(seq_no);
if would_be_full {
if is_full {
Err(Error::WindowIsFull)
} else {
Err(Error::OutOfSequence)
@@ -281,7 +281,7 @@ impl<TL: TransportLayer> SeqEx<TL> {
if self.recv_window[i].as_ref().map_or(false, |pre| pre.seq_no == next_seq_no) {
let next_i = self.next_send_seq_no as usize % self.send_window.len();
if self.send_window[next_i].is_some() {
if self.send_window[next_i].is_some() || self.reserved_len >= self.reserved.len() {
return Err(Error::WindowIsFull);
}
let entry = self.recv_window[i].take().unwrap();