Attachment 179653 Details for Bug 216832 – unified diff to fix the problem

[patch] unified diff to fix the problem

tcpfix.diff (text/plain), 1.72 KB, created by antonfb on 2017-02-05 19:29:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: antonfb

Created: 2017-02-05 19:29:13 UTC

Size: 1.72 KB

patch

obsolete

>--- tcp_input.c.org	2016-04-08 21:18:49.767353442 -0700
>+++ tcp_input.c	2017-01-07 11:29:59.595783533 -0800
>@@ -1557,24 +1557,6 @@
> 		if (TSTMP_GT(to.to_tsecr, tcp_ts_getticks()))
> 			to.to_tsecr = 0;
> 	}
>-	/*
>-	 * If timestamps were negotiated during SYN/ACK they should
>-	 * appear on every segment during this session and vice versa.
>-	 */
>-	if ((tp->t_flags & TF_RCVD_TSTMP) && !(to.to_flags & TOF_TS)) {
>-		if ((s = tcp_log_addrs(inc, th, NULL, NULL))) {
>-			log(LOG_DEBUG, "%s; %s: Timestamp missing, "
>-			    "no action\n", s, __func__);
>-			free(s, M_TCPLOG);
>-		}
>-	}
>-	if (!(tp->t_flags & TF_RCVD_TSTMP) && (to.to_flags & TOF_TS)) {
>-		if ((s = tcp_log_addrs(inc, th, NULL, NULL))) {
>-			log(LOG_DEBUG, "%s; %s: Timestamp not expected, "
>-			    "no action\n", s, __func__);
>-			free(s, M_TCPLOG);
>-		}
>-	}
> 
> 	/*
> 	 * Process options only when we get SYN/ACK back. The SYN case
>@@ -1607,6 +1589,25 @@
> 	}
> 
> 	/*
>+	 * If timestamps were negotiated during SYN/ACK they should
>+	 * appear on every segment during this session and vice versa.
>+	 */
>+	if ((tp->t_flags & TF_RCVD_TSTMP) && !(to.to_flags & TOF_TS)) {
>+		if ((s = tcp_log_addrs(inc, th, NULL, NULL))) {
>+			log(LOG_DEBUG, "%s; %s: Timestamp missing, "
>+			    "no action\n", s, __func__);
>+			free(s, M_TCPLOG);
>+		}
>+	}
>+	if (!(tp->t_flags & TF_RCVD_TSTMP) && (to.to_flags & TOF_TS)) {
>+		if ((s = tcp_log_addrs(inc, th, NULL, NULL))) {
>+			log(LOG_DEBUG, "%s; %s: Timestamp not expected, "
>+			    "no action\n", s, __func__);
>+			free(s, M_TCPLOG);
>+		}
>+	}
>+
>+	/*
> 	 * Header prediction: check for the two common cases
> 	 * of a uni-directional data xfer.  If the packet has
> 	 * no control flags, is in-sequence, the window didn't

Actions: View | Diff

Attachments on bug 216832: 179653