From: Derrick Brashear <shadow@dementia.org>
Date: Thu, 20 May 2010 15:27:10 +0000 (-0400)
Subject: avoid nat ping for authenticated connections
X-Git-Tag: openafs-devel-1_5_75~233
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=deca334a5c9773f1b873b6260353c5c6cbab0af7;p=packages%2Fo%2Fopenafs.git

avoid nat ping for authenticated connections

this is a cheap way to ensure one nat ping per server. basically,
only do it for the one unauth connection we have.

Change-Id: I4583112d7b4a10a0e8f524795527d99a5b2adf51
Reviewed-on: http://gerrit.openafs.org/2010
Reviewed-by: Russ Allbery <rra@stanford.edu>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/afs/afs_conn.c b/src/afs/afs_conn.c
index 38cdf23d9..ce4dc0b76 100644
--- a/src/afs/afs_conn.c
+++ b/src/afs/afs_conn.c
@@ -295,7 +295,12 @@ afs_ConnBySA(struct srvAddr *sap, unsigned short aport, afs_int32 acell,
 	}
 	rx_SetConnIdleDeadTime(tc->id, afs_rx_idledead);
 
-	rx_SetConnSecondsUntilNatPing(tc->id, 20);
+	/*
+	 * Only do this for the base connection, not per-user.
+	 * Will need to be revisited if/when CB gets security.
+	 */
+	if (isec == 0)
+	    rx_SetConnSecondsUntilNatPing(tc->id, 20);
 
 	tc->forceConnectFS = 0;	/* apparently we're appropriately connected now */
 	if (csec)