renet
/
renet
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tcp: LastAck should only change to Closed on ack of fin. 

Fixes #470
v0.7.x
Dario Nieuwenhuis 2021-05-28 21:09:36 +02:00
parent cefbed6e52
commit a2302412e7
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/socket/tcp.rs
View File

@ -1438,10 +1438,14 @@ impl<'a> TcpSocket<'a> {
// ACK packets in LAST-ACK state change it to CLOSED.
(State::LastAck, TcpControl::None) => {
// Clear the remote endpoint, or we'll send an RST there.
self.set_state(State::Closed);
self.local_endpoint = IpEndpoint::default();
self.remote_endpoint = IpEndpoint::default();
if ack_of_fin {
// Clear the remote endpoint, or we'll send an RST there.
self.set_state(State::Closed);
self.local_endpoint = IpEndpoint::default();
self.remote_endpoint = IpEndpoint::default();
} else {
self.timer.set_for_idle(timestamp, self.keep_alive);
}
}
_ => {
@ -3489,6 +3493,34 @@ mod test {
assert_eq!(s.state, State::Closed);
}
#[test]
fn test_last_ack_ack_not_of_fin() {
let mut s = socket_last_ack();
recv!(s, [TcpRepr {
control: TcpControl::Fin,
seq_number: LOCAL_SEQ + 1,
ack_number: Some(REMOTE_SEQ + 1 + 1),
..RECV_TEMPL
}]);
assert_eq!(s.state, State::LastAck);
// ACK received that doesn't ack the FIN: socket should stay in LastAck.
send!(s, TcpRepr {
seq_number: REMOTE_SEQ + 1 + 1,
ack_number: Some(LOCAL_SEQ + 1),
..SEND_TEMPL
});
assert_eq!(s.state, State::LastAck);
// ACK received of fin: socket should change to Closed.
send!(s, TcpRepr {
seq_number: REMOTE_SEQ + 1 + 1,
ack_number: Some(LOCAL_SEQ + 1 + 1),
..SEND_TEMPL
});
assert_eq!(s.state, State::Closed);
}
#[test]
fn test_last_ack_close() {
let mut s = socket_last_ack();