From: Derrick Brashear <shadow@dementix.org>
Date: Thu, 8 Sep 2011 14:44:38 +0000 (-0400)
Subject: rx: avoid nat ping during shutdown
X-Git-Tag: upstream/1.6.1.pre1^2~230
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d7c25b2995875df8c6abd3c1992ceb4aac3575f6;p=packages%2Fo%2Fopenafs.git

rx: avoid nat ping during shutdown

shutdown_rx, unlike rx_Finalize, kills the socket before the conns.
since we call osi_NetSend directly, we lose. just do a simple
check for rxinit_status, and exit immediately before sending if rx
is not up.

Reviewed-on: http://gerrit.openafs.org/5377
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit 8d939c08f60b44c83ed8db8892b93563ddea0e15)

Change-Id: Ic22dc3b6e6c6d330eeabddead7ed8f0a0da73b57
Reviewed-on: http://gerrit.openafs.org/5407
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/rx/DARWIN/rx_knet.c b/src/rx/DARWIN/rx_knet.c
index c70e171cb..fcf3f3478 100644
--- a/src/rx/DARWIN/rx_knet.c
+++ b/src/rx/DARWIN/rx_knet.c
@@ -143,6 +143,7 @@ rx_upcall(socket_t so, void *arg, __unused int waitflag)
 void
 osi_StopNetIfPoller(void)
 {
+    shutdown_rx();
     soclose(rx_socket);
     if (afs_termState == AFSOP_STOP_NETIF) {
 	afs_termState = AFSOP_STOP_COMPLETE;