From: Andrew Deason <adeason@sinenomine.net>
Date: Thu, 12 May 2011 15:57:09 +0000 (-0500)
Subject: viced: Enable NAT ping on hosts
X-Git-Tag: upstream/1.6.6_pre2^2~106
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=53005f4fe7b6df5263d399f0aec9fee3078e39bc;p=packages%2Fo%2Fopenafs.git

viced: Enable NAT ping on hosts

Turn on NAT ping on the Rx connection for the callback channel for
hosts. This should help improve behavior for clients behind NATs and
stateful firewalls, even for clients that predate NAT ping
functionality.

Reviewed-on: http://gerrit.openafs.org/4646
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit aafdc08cfc49da4c23ecd91f9e690fd70e95df55)

Change-Id: I428b6648276ec49fd4f003b3cf2d88a07c8aa1d9
Reviewed-on: http://gerrit.openafs.org/9420
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---

diff --git a/src/viced/host.c b/src/viced/host.c
index 1bfe477e4..b14a3c462 100644
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -759,6 +759,7 @@ h_SetupCallbackConn_r(struct host * host)
 	rx_NewConnection(host->host, host->port, 1, sc, 0);
     rx_SetConnDeadTime(host->callback_rxcon, 50);
     rx_SetConnHardDeadTime(host->callback_rxcon, AFS_HARDDEADTIME);
+    rx_SetConnSecondsUntilNatPing(host->callback_rxcon, 20);
 }
 
 /* h_Lookup_r
@@ -1761,6 +1762,7 @@ h_GetHost_r(struct rx_connection *tcon)
             cb_in = rx_NewConnection(haddr, hport, 1, sc, 0);
             rx_SetConnDeadTime(cb_in, 50);
             rx_SetConnHardDeadTime(cb_in, AFS_HARDDEADTIME);
+	    rx_SetConnSecondsUntilNatPing(cb_in, 20);
 
             code =
                 RXAFSCB_TellMeAboutYourself(cb_in, &interf, &caps);