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

TCP socket debug messages "sending <flags>" should be at DEBUG level. 

They're not exceptional.
This commit is contained in:
whitequark 2017-08-31 12:39:05 +00:00
parent 9a5d056d7f
commit 13dbe09fba
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/socket/tcp.rs
View File

@ -1202,7 +1202,11 @@ impl<'a> TcpSocket<'a> {
return Err(Error::Exhausted)
}
if net_log_enabled!(debug) {
if repr.payload.len() > 0 {
net_trace!("[{}]{}:{}: tx buffer: peeking at {} octets (from {})",
self.debug_id, self.local_endpoint, self.remote_endpoint,
repr.payload.len(), self.remote_last_seq - self.local_seq_no);
} else {
let flags =
match (repr.control, repr.ack_number) {
(TcpControl::Syn, None) => "SYN",
@ -1213,15 +1217,9 @@ impl<'a> TcpSocket<'a> {
(TcpControl::None, Some(_)) => "ACK",
_ => unreachable!()
};
if repr.payload.len() > 0 {
net_trace!("[{}]{}:{}: tx buffer: peeking at {} octets (from {})",
self.debug_id, self.local_endpoint, self.remote_endpoint,
repr.payload.len(), self.remote_last_seq - self.local_seq_no);
} else {
net_debug!("[{}]{}:{}: sending {}",
self.debug_id, self.local_endpoint, self.remote_endpoint,
flags);
}
net_trace!("[{}]{}:{}: sending {}",
self.debug_id, self.local_endpoint, self.remote_endpoint,
flags);
}
// Remember the header length before enabling the MSS option, since that option
@ -3006,4 +3004,27 @@ mod test {
..RECV_TEMPL
}));
}
#[test]
fn test_fill_peer_window() {
let mut s = socket_established();
s.remote_mss = 6;
s.send_slice(b"abcdef123456!@#$%^").unwrap();
recv!(s, [TcpRepr {
seq_number: LOCAL_SEQ + 1,
ack_number: Some(REMOTE_SEQ + 1),
payload: &b"abcdef"[..],
..RECV_TEMPL
}, TcpRepr {
seq_number: LOCAL_SEQ + 1 + 6,
ack_number: Some(REMOTE_SEQ + 1),
payload: &b"123456"[..],
..RECV_TEMPL
}, TcpRepr {
seq_number: LOCAL_SEQ + 1 + 6 + 6,
ack_number: Some(REMOTE_SEQ + 1),
payload: &b"!@#$%^"[..],
..RECV_TEMPL
}]);
}
}