- stevesk@cvs.openbsd.org 2002/09/13 19:23:09

     [channels.c sshconnect.c sshd.c]
     remove use of SO_LINGER, it should not be needed. error check
     SO_REUSEADDR. fixup comments. ok markus@

1 files changed, 7 insertions, 8 deletions

diff --git a/channels.c b/channels.c
index 0ae37b6d8..cf1a6462b 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.181 2002/09/09 14:54:14 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.182 2002/09/13 19:23:09 stevesk Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -2022,7 +2022,6 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por
         struct addrinfo hints, *ai, *aitop;
         const char *host;
         char ntop[NI_MAXHOST], strport[NI_MAXSERV];
-        struct linger linger;
 
         success = 0;
         host = (type == SSH_CHANNEL_RPORT_LISTENER) ?
@@ -2065,13 +2064,13 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por
                         continue;
                 }
                 /*
-                 * Set socket options.  We would like the socket to disappear
-                 * as soon as it has been closed for whatever reason.
+                 * Set socket options.
+                 * Allow local port reuse in TIME_WAIT.
                  */
-                setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
-                linger.l_onoff = 1;
-                linger.l_linger = 5;
-                setsockopt(sock, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger));
+                if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on,
+                    sizeof(on)) == -1)
+                        error("setsockopt SO_REUSEADDR: %s", strerror(errno));
+
                 debug("Local forwarding listening on %s port %s.", ntop, strport);
 
                 /* Bind the socket to the address. */