From 6f44a394e648cfca36031c38776ee2296fe22a54 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Fri, 12 Apr 2013 12:40:56 -0700
Subject: [PATCH] Added option to create listen sockets with SO_REUSEADDR if
 attach is done with -U switch set.  Requested by Michael Mondy

---
 sim_sock.c | 40 +++++++++++++++++++++++++++++++++++++++-
 sim_sock.h |  3 +++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/sim_sock.c b/sim_sock.c
index 33a5f20c..90a2a80d 100644
--- a/sim_sock.c
+++ b/sim_sock.c
@@ -123,11 +123,37 @@ return;
 
 /* UNIX, Win32, Macintosh, VMS, OS2 (Berkeley socket) routines */
 
+static struct sock_errors {
+    int32 value;
+    char *text;
+    } sock_errors[] = {
+        {WSAEWOULDBLOCK,  "Operation would block"},
+        {WSAENAMETOOLONG, "File name too long"},
+        {WSAEINPROGRESS,  "Operation now in progress "},
+        {WSAETIMEDOUT,    "Connection timed out"},
+        {WSAEISCONN,      "Transport endpoint is already connected"},
+        {WSAECONNRESET,   "Connection reset by peer"},
+        {WSAECONNREFUSED, "Connection refused"},
+        {WSAEHOSTUNREACH, "No route to host"},
+        {WSAEADDRINUSE,   "Address already in use "},
+        {0, NULL}
+    };
+
+
+
+
 SOCKET sim_err_sock (SOCKET s, char *emsg, int32 flg)
 {
 int32 err = WSAGetLastError ();
+int32 i;
 
-printf ("Sockets: %s error %d\n", emsg, err);
+for (i=0; (sock_errors[i].text) && (sock_errors[i].value != err); i++)
+    ;
+
+if (sock_errors[i].value == err)
+    printf ("Sockets: %s error %d - %s\n", emsg, err, sock_errors[i].text);
+else
+    printf ("Sockets: %s error %d\n", emsg, err);
 sim_close_sock (s, flg);
 return INVALID_SOCKET;
 }
@@ -735,6 +761,18 @@ if (preferred->ai_family == AF_INET6) {
     sta = setsockopt (newsock, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&off, sizeof(off));
     }
 #endif
+if (sim_switches & SWMASK ('U')) {
+    int on = TRUE;
+
+    sta = setsockopt (newsock, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on));
+    }
+#if defined (SO_EXCLUSIVEADDRUSE)
+else {
+    int on = TRUE;
+
+    sta = setsockopt (newsock, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, (char *)&on, sizeof(on));
+    }
+#endif
 sta = bind (newsock, preferred->ai_addr, preferred->ai_addrlen);
 p_freeaddrinfo(result);
 if (sta == SOCKET_ERROR)                                /* bind error? */
diff --git a/sim_sock.h b/sim_sock.h
index b817f9bd..76dbe732 100644
--- a/sim_sock.h
+++ b/sim_sock.h
@@ -61,8 +61,11 @@
 #define WSAENAMETOOLONG ENAMETOOLONG
 #define WSAEINPROGRESS  EINPROGRESS
 #define WSAETIMEDOUT    ETIMEDOUT
+#define WSAEISCONN      EISCONN
+#define WSAECONNRESET   ECONNRESET
 #define WSAECONNREFUSED ECONNREFUSED
 #define WSAEHOSTUNREACH EHOSTUNREACH
+#define WSAEADDRINUSE   EADDRINUSE
 #define INVALID_SOCKET  ((SOCKET)-1) 
 #define SOCKET_ERROR    -1
 #include <sys/types.h>                                  /* for fcntl, getpid */