From: Ben Kaduk <kaduk@mit.edu>
Date: Sun, 4 Jul 2010 06:28:02 +0000 (-0400)
Subject: FBSD: always close the rx socket when shutting down
X-Git-Tag: openafs-devel-1_5_75~4
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=4c0d47de22e1cb0258151e266f15d4a5bf239f33;p=packages%2Fo%2Fopenafs.git

FBSD: always close the rx socket when shutting down

The soclose(rx_socket) call is needed in order to restart AFS.
(Otherwise sobind() fails with EADDRINUSE.)
While here, use the defined constant SHUT_RDWR instead of
hardcoding '2' for soshutdown's second argument.

Change-Id: Iba7cac3aec79764783628da28b12253d496a7680
Reviewed-on: http://gerrit.openafs.org/2331
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/rx/FBSD/rx_knet.c b/src/rx/FBSD/rx_knet.c
index 77f2eabcd..3a1d456d4 100644
--- a/src/rx/FBSD/rx_knet.c
+++ b/src/rx/FBSD/rx_knet.c
@@ -86,10 +86,8 @@ osi_StopListener(void)
     int haveGlock = ISAFS_GLOCK();
     if (haveGlock)
 	AFS_GUNLOCK();
-    soshutdown(rx_socket, 2);
-#ifndef AFS_FBSD70_ENV
+    soshutdown(rx_socket, SHUT_RDWR);
     soclose(rx_socket);
-#endif
     p = pfind(rxk_ListenerPid);
     afs_warn("osi_StopListener: rxk_ListenerPid %lx\n", p);
     if (p)