Fix a TCP retransmit loop after transition from SYN-SENT to ESTABLISHED.
This commit is contained in:
parent
3035ef07fb
commit
4878f0f1d6
|
@ -1251,8 +1251,10 @@ impl<'a> TcpSocket<'a> {
|
||||||
self.remote_next_seq = repr.seq_number + repr.segment_len();
|
self.remote_next_seq = repr.seq_number + repr.segment_len();
|
||||||
self.remote_last_ack = repr.ack_number.unwrap_or_default();
|
self.remote_last_ack = repr.ack_number.unwrap_or_default();
|
||||||
|
|
||||||
if self.remote_next_seq - self.local_seq_no >= self.tx_buffer.len() {
|
if self.remote_next_seq - self.local_seq_no >= self.tx_buffer.len() &&
|
||||||
// If we've transmitted all we could, wind up the retransmit timer.
|
repr.segment_len() > 0 {
|
||||||
|
// If we've transmitted all we could (and there was something to transmit),
|
||||||
|
// wind up the retransmit timer.
|
||||||
self.timer.set_for_data(timestamp);
|
self.timer.set_for_data(timestamp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1797,11 +1799,9 @@ mod test {
|
||||||
ack_number: Some(REMOTE_SEQ + 1),
|
ack_number: Some(REMOTE_SEQ + 1),
|
||||||
..RECV_TEMPL
|
..RECV_TEMPL
|
||||||
}]);
|
}]);
|
||||||
|
recv!(s, time 1000, Err(Error::Exhausted));
|
||||||
assert_eq!(s.state, State::Established);
|
assert_eq!(s.state, State::Established);
|
||||||
sanity!(s, TcpSocket {
|
sanity!(s, socket_established());
|
||||||
timer: Timer::Retransmit { expires_at: 100, delay: 100 },
|
|
||||||
..socket_established()
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
@ -2012,10 +2012,7 @@ mod test {
|
||||||
..RECV_TEMPL
|
..RECV_TEMPL
|
||||||
}]);
|
}]);
|
||||||
assert_eq!(s.state, State::CloseWait);
|
assert_eq!(s.state, State::CloseWait);
|
||||||
sanity!(s, TcpSocket {
|
sanity!(s, socket_close_wait());
|
||||||
timer: Timer::Retransmit { expires_at: 100, delay: 100 },
|
|
||||||
..socket_close_wait()
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
Loading…
Reference in New Issue