From owner-p4-projects@FreeBSD.ORG  Sun Jun 26 20:43:54 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9C4911065674; Sun, 26 Jun 2011 20:43:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5C678106564A
	for <perforce@freebsd.org>; Sun, 26 Jun 2011 20:43:54 +0000 (UTC)
	(envelope-from cnicutar@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 48C1C8FC08
	for <perforce@freebsd.org>; Sun, 26 Jun 2011 20:43:54 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5QKhs7m042948
	for <perforce@freebsd.org>; Sun, 26 Jun 2011 20:43:54 GMT
	(envelope-from cnicutar@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5QKhsjU042945
	for perforce@freebsd.org; Sun, 26 Jun 2011 20:43:54 GMT
	(envelope-from cnicutar@freebsd.org)
Date: Sun, 26 Jun 2011 20:43:54 GMT
Message-Id: <201106262043.p5QKhsjU042945@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	cnicutar@freebsd.org using -f
From: Catalin Nicutar <cnicutar@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 195386 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Jun 2011 20:43:54 -0000

http://p4web.freebsd.org/@@195386?ac=10

Change 195386 by cnicutar@cnicutar_cronos on 2011/06/26 20:43:13

	Disable keepalives for connections using UTO (RFC 5482: "the
	keep-alive timer MUST be set to a value larger than that of the
	adopted USER TIMEOUT").

Affected files ...

.. //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_timer.c#2 edit

Differences ...

==== //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_timer.c#2 (text+ko) ====

@@ -301,6 +301,19 @@
 		return;
 	}
 	callout_deactivate(&tp->t_timers->tt_keep);
+	if ((tp->t_flags & TF_SND_UTO) || ((tp->t_flags & TF_RCV_UTO) &&
+	    tp->rcv_uto)) {
+		/*
+		 * This connection is using UTO (either sending or has
+		 * received a value). We need to stop sending keepalives
+		 * (RFC 5482 4.2).
+		 * Returning without resetting the timer.
+		 */
+		INP_WUNLOCK(inp);
+		INP_INFO_WUNLOCK(&V_tcbinfo);
+		CURVNET_RESTORE();
+		return;
+	}
 	/*
 	 * Keep-alive timer went off; send something
 	 * or drop connection if idle for too long.