smoltcp-rs · Aug 25, 2017 · Aug 25, 2017 · Aug 25, 2017
Showing with 32 additions and 13 deletions.

+1 −1 README.md

+31 −12 src/socket/tcp.rs
diff --git a/README.md b/README.md
@@ -221,7 +221,7 @@ Read its [source code](/examples/client.rs), then run it as:
 cargo run --example client -- tap0 ADDRESS PORT
 ```
 
-It connects to the given address (not a hostname) and port (e.g. `socat stdio tcp4-listen 1234`),
+It connects to the given address (not a hostname) and port (e.g. `socat stdio tcp4-listen:1234`),
 and will respond with reversed chunks of the input indefinitely.
 
 ### examples/ping.rs

diff --git a/src/socket/tcp.rs b/src/socket/tcp.rs
@@ -750,7 +750,7 @@ impl<'a> TcpSocket<'a> {
         if self.state == State::Closed { return Err(Error::Rejected) }
 
         let packet = TcpPacket::new_checked(&payload[..ip_repr.payload_len()])?;
-        let repr = TcpRepr::parse(&packet, &ip_repr.src_addr(), &ip_repr.dst_addr())?;
+        let mut repr = TcpRepr::parse(&packet, &ip_repr.src_addr(), &ip_repr.dst_addr())?;
 
         // If we're still listening for SYNs and the packet has an ACK, it cannot
         // be destined to this socket, but another one may well listen on the same
@@ -901,6 +901,11 @@ impl<'a> TcpSocket<'a> {
             }
         }
 
+        if repr.control == TcpControl::Psh {
+            // We don't care about the PSH flag.
+            repr.control = TcpControl::None;
+        }
+
         // Validate and update the state.
         match (self.state, repr) {
             // RSTs are not accepted in the LISTEN state.
@@ -1246,8 +1251,10 @@ impl<'a> TcpSocket<'a> {
         self.remote_next_seq = repr.seq_number + repr.segment_len();
         self.remote_last_ack = repr.ack_number.unwrap_or_default();
 
-        if self.remote_next_seq - self.local_seq_no >= self.tx_buffer.len() {
-            // If we've transmitted all we could, wind up the retransmit timer.
+        if self.remote_next_seq - self.local_seq_no >= self.tx_buffer.len() &&
+                repr.segment_len() > 0 {
+            // If we've transmitted all we could (and there was something to transmit),
+            // wind up the retransmit timer.
             self.timer.set_for_data(timestamp);
         }
 
@@ -1792,11 +1799,9 @@ mod test {
             ack_number: Some(REMOTE_SEQ + 1),
             ..RECV_TEMPL
         }]);
+        recv!(s, time 1000, Err(Error::Exhausted));
         assert_eq!(s.state, State::Established);
-        sanity!(s, TcpSocket {
-            timer: Timer::Retransmit { expires_at: 100, delay: 100 },
-            ..socket_established()
-        });
+        sanity!(s, socket_established());
     }
 
     #[test]
@@ -2007,10 +2012,7 @@ mod test {
             ..RECV_TEMPL
         }]);
         assert_eq!(s.state, State::CloseWait);
-        sanity!(s, TcpSocket {
-            timer: Timer::Retransmit { expires_at: 100, delay: 100 },
-            ..socket_close_wait()
-        });
+        sanity!(s, socket_close_wait());
     }
 
     #[test]
@@ -2891,7 +2893,7 @@ mod test {
     // =========================================================================================//
 
     #[test]
-    fn test_psh() {
+    fn test_psh_transmit() {
         let mut s = socket_established();
         s.remote_win_len = 6;
         s.send_slice(b"abcdef").unwrap();
@@ -2911,4 +2913,21 @@ mod test {
             ..RECV_TEMPL
         }), exact);
     }
+
+    #[test]
+    fn test_psh_receive() {
+        let mut s = socket_established();
+        send!(s, TcpRepr {
+            control:    TcpControl::Psh,
+            seq_number: REMOTE_SEQ + 1,
+            ack_number: Some(LOCAL_SEQ + 1),
+            payload:    &b"abcdef"[..],
+            ..SEND_TEMPL
+        }, Ok(Some(TcpRepr {
+            seq_number: LOCAL_SEQ + 1,
+            ack_number: Some(REMOTE_SEQ + 1 + 6),
+            window_len: 58,
+            ..RECV_TEMPL
+        })));
+    }
 }