Revert "viced: Enable NAT ping on hosts"

This reverts commit 53005f4fe7b6df5263d399f0aec9fee3078e39bc.

The fileserver-side "NAT ping" behavior has yet to be proven to be helpful in
situations with NATs. If the behavior is not helpful, this generates
potentially a significant amount of extra useless traffic.  So until it can be
shown to what degree this is helpful, keep this behavior out of the fileserver.

Change-Id: I783222e1be166920445175fe09680cd4968c2810
Reviewed-on: http://gerrit.openafs.org/10135
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

diff --git a/src/viced/host.c b/src/viced/host.c
index 7ccaec81b04151543c8b48b284af851f49f05b82..eb5b868ff0be1e922df0fa3a00f93b1733966025 100644 (file)
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -766,7 +766,6 @@ 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
@@ -1769,7 +1768,6 @@ 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);