From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Mon, 5 Dec 2011 04:15:13 +0000 (-0500)
Subject: afs: prevent nat pings on destroyed connections
X-Git-Tag: upstream/1.6.1.pre1^2~74
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=62815307269a63dfc13fbdc5faa1933620d6ab6e;p=packages%2Fo%2Fopenafs.git

afs: prevent nat pings on destroyed connections

If the connection is no longer in use, reset the nat keep alive
timer to 0 seconds.

Reviewed-on: http://gerrit.openafs.org/6230
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit 7a93c827f353e2ad695d8019ab789b02a3596f2e)

Change-Id: I019bdce7a8f9f0123786b46d0563f42f7b26c14b
Reviewed-on: http://gerrit.openafs.org/6232
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Stephan Wiesand <stephan.wiesand@desy.de>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/afs/afs_conn.c b/src/afs/afs_conn.c
index d9173dbb2..e4cba32dc 100644
--- a/src/afs/afs_conn.c
+++ b/src/afs/afs_conn.c
@@ -276,6 +276,7 @@ afs_ConnBySA(struct srvAddr *sap, unsigned short aport, afs_int32 acell,
 	csec = (struct rx_securityClass *)0;
 	if (tc->id) {
 	    AFS_GUNLOCK();
+	    rx_SetConnSecondsUntilNatPing(tc->id, 0);
 	    rx_DestroyConnection(tc->id);
 	    AFS_GLOCK();
 	}