itsscb/smoltcp
1
0
Fork 0
mirror of https://github.com/smoltcp-rs/smoltcp.git synced 2025-10-02 15:15:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #917 from copy/main

Browse Source 
fix(tcp): only reset remote_last_ts if some data is enqueued
This commit is contained in:
Dario Nieuwenhuis 2024-04-08 12:11:15 +00:00 committed by GitHub
commit 114939aa99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/socket/tcp.rs
View File

@ -1123,21 +1123,21 @@ impl<'a> Socket<'a> {
return Err(SendError::InvalidState); return Err(SendError::InvalidState);
} }
// The connection might have been idle for a long time, and so remote_last_ts let old_length = self.tx_buffer.len();
// would be far in the past. Unless we clear it here, we'll abort the connection
// down over in dispatch() by erroneously detecting it as timed out.
if self.tx_buffer.is_empty() {
self.remote_last_ts = None
}
let _old_length = self.tx_buffer.len();
let (size, result) = f(&mut self.tx_buffer); let (size, result) = f(&mut self.tx_buffer);
if size > 0 { if size > 0 {
// The connection might have been idle for a long time, and so remote_last_ts
// would be far in the past. Unless we clear it here, we'll abort the connection
// down over in dispatch() by erroneously detecting it as timed out.
if old_length == 0 {
self.remote_last_ts = None
}
#[cfg(any(test, feature = "verbose"))] #[cfg(any(test, feature = "verbose"))]
tcp_trace!( tcp_trace!(
"tx buffer: enqueueing {} octets (now {})", "tx buffer: enqueueing {} octets (now {})",
size, size,
_old_length + size old_length + size
); );
} }
Ok(result) Ok(result)