tcp: Properly time out ACK wait from tap

Seen with iperf3: a control connection is established, no data flows
for a while, all segments are acknowledged. The socket starts closing
it, and we immediately time out because the last ACK from tap was one
minute before that.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/tcp.c b/tcp.c
index 9f9b62d..4c6bfd0 100644
--- a/tcp.c
+++ b/tcp.c
@@ -3004,9 +3004,9 @@ static void tcp_timer_one(struct ctx *c, struct tcp_tap_conn *conn,
 				tcp_send_to_tap(c, conn, 0, NULL, 0);
 		}
 
-		if (ack_tap_ms > ACK_TIMEOUT) {
+		if (sock_ms - ack_tap_ms > ACK_TIMEOUT) {
 			if (conn->seq_ack_from_tap < conn->seq_to_tap) {
-				if (ack_tap_ms > 10 * ACK_TIMEOUT) {
+				if (sock_ms - ack_tap_ms > 10 * ACK_TIMEOUT) {
 					tcp_rst(c, conn);
 					break;
 				}
@@ -3026,7 +3026,7 @@ static void tcp_timer_one(struct ctx *c, struct tcp_tap_conn *conn,
 		break;
 	case CLOSE_WAIT:
 	case FIN_WAIT_1_SOCK_FIN:
-		if (ack_tap_ms > FIN_TIMEOUT)
+		if (sock_ms - ack_tap_ms > FIN_TIMEOUT)
 			tcp_rst(c, conn);
 		break;
 	case FIN_WAIT_1: