From 13dbe09fbacb705add7a7b3b017bf3c161d40143 Mon Sep 17 00:00:00 2001
From: whitequark <pz@m-labs.hk>
Date: Thu, 31 Aug 2017 12:39:05 +0000
Subject: [PATCH] TCP socket debug messages "sending <flags>" should be at
 DEBUG level.

They're not exceptional.
---
 src/socket/tcp.rs | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/socket/tcp.rs b/src/socket/tcp.rs
index 117047c..91de8f5 100644
--- a/src/socket/tcp.rs
+++ b/src/socket/tcp.rs
@@ -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
+        }]);
+    }
 }