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

Don't switch TCP state from FIN-WAIT-1 to FIN-WAIT-2 with queued data.

This commit is contained in:
whitequark 2017-01-25 05:36:42 +00:00
parent bef01740a7
commit 8b292c6dd8
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/socket/tcp.rs
View File

@ -725,9 +725,12 @@ impl<'a> TcpSocket<'a> {
self.retransmit.reset();
}
// ACK packets in FIN-WAIT-1 state change it to FIN-WAIT-2.
// ACK packets in FIN-WAIT-1 state change it to FIN-WAIT-2, if we've already
// sent everything in the transmit buffer.
(State::FinWait1, TcpRepr { control: TcpControl::None, .. }) => {
self.set_state(State::FinWait2);
if self.tx_buffer.empty() {
self.set_state(State::FinWait2);
}
}
// FIN packets in FIN-WAIT-1 state change it to CLOSING.
@ -1654,6 +1657,12 @@ mod test {
payload: &b"abcdef"[..],
..RECV_TEMPL
}]);
send!(s, TcpRepr {
seq_number: REMOTE_SEQ + 1,
ack_number: Some(LOCAL_SEQ + 1 + 6),
..SEND_TEMPL
});
assert_eq!(s.state, State::FinWait1);
}
#[test]