From: Matt Durgavich <mattdurgavich@gmail.com>
Subject: ws2_32: WSACleanup cleans up open sockets (OSX only)
Message-Id: <CABC+rgzDrPJAfW1w=x_H9m4Ux4hCUr5myumy+gyDKTGv8zKNSA@mail.gmail.com>
Date: Fri, 31 Jul 2015 23:19:28 -0400

From 991ce8e253fe794dcf77c31dc1eca75c6c654289 Mon Sep 17 00:00:00 2001
From: Matt Durgavich <mattdurgavich@gmail.com>
Date: Fri, 31 Jul 2015 23:05:49 -0400
Subject: ws2_32: WSACleanup cleans up open sockets (OSX only)

---
 configure.ac         |  2 +-
 dlls/ws2_32/socket.c | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 45b8fdb..9b2fe14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -867,7 +867,7 @@ uninstall::
     libwine_targets="libwine.dylib libwine.$libwine_soversion.dylib
libwine.$libwine_version.dylib"
     AC_SUBST(LIBWINE_RULES,["
 OBJS = \$(C_SRCS:.c=.o) \$(EXTRA_OBJS)
-
+    AC_CHECK_HEADER(libproc.h, AC_DEFINE(HAVE_LIBPROC_H))
 all: libwine.dylib

 libwine.$libwine_version.dylib: \$(OBJS)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index b06d7e7..f9cef96 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -132,6 +132,14 @@
 # include <sys/time.h>
 #endif

+#ifdef HAVE_LIBPROC_H
+# include <libproc.h>
+#endif
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "ntstatus.h"
@@ -1449,6 +1457,30 @@ int WINAPI WSAStartup(WORD wVersionRequested,
LPWSADATA lpWSAData)
     return 0;
 }

+static void close_open_sockets() {
+#ifdef HAVE_LIBPROC_H
+    int pid = getpid();
+    int bufferSizeNeeded = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, NULL, 0);
+    if (bufferSizeNeeded > 0) {
+        struct proc_fdinfo *infos = (struct
proc_fdinfo*)malloc(bufferSizeNeeded);
+        int ret = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, infos,
bufferSizeNeeded);
+        int numfds = bufferSizeNeeded / PROC_PIDLISTFD_SIZE;
+        if (ret >= 0) {
+            for (int i = 0; i < numfds; ++i ) {
+                int32_t fd = infos[i].proc_fd;
+                uint32_t type = infos[i].proc_fdtype;
+                if (type == PROX_FDTYPE_SOCKET) {
+                    TRACE("Closing socket with descriptor %d\n", fd);
+                    close(fd);
+                }
+            }
+        }
+        free(infos);
+    }
+#else
+    FIXME("stub")
+#endif
+}

 /***********************************************************************
  *      WSACleanup (WS2_32.116)
@@ -1458,8 +1490,14 @@ INT WINAPI WSACleanup(void)
     if (num_startup) {
         num_startup--;
         TRACE("pending cleanups: %d\n", num_startup);
+        if (num_startup == 0) {
+            TRACE("cleaning up open sockets");
+            close_open_sockets();
+        }
         return 0;
     }
+
+    /* Close all sockets */
     SetLastError(WSANOTINITIALISED);
     return SOCKET_ERROR;
 }

<div dir="ltr"><div>From 991ce8e253fe794dcf77c31dc1eca75c6c654289 Mon Sep 17 00:00:00 2001</div><div>From: Matt Durgavich &lt;<a href="mailto:mattdurgavich@gmail.com">mattdurgavich@gmail.com</a>&gt;</div><div>Date: Fri, 31 Jul 2015 23:05:49 -0400</div><div>Subject: ws2_32: WSACleanup cleans up open sockets (OSX only)</div><div><br></div><div>---</div><div> <a href="http://configure.ac">configure.ac</a>         |  2 +-</div><div> dlls/ws2_32/socket.c | 38 ++++++++++++++++++++++++++++++++++++++</div><div> 2 files changed, 39 insertions(+), 1 deletion(-)</div><div><br></div><div>diff --git a/<a href="http://configure.ac">configure.ac</a> b/<a href="http://configure.ac">configure.ac</a></div><div>index 45b8fdb..9b2fe14 100644</div><div>--- a/<a href="http://configure.ac">configure.ac</a></div><div>+++ b/<a href="http://configure.ac">configure.ac</a></div><div>@@ -867,7 +867,7 @@ uninstall::</div><div>     libwine_targets=&quot;libwine.dylib libwine.$libwine_soversion.dylib libwine.$libwine_version.dylib&quot;</div><div>     AC_SUBST(LIBWINE_RULES,[&quot;</div><div> OBJS = \$(C_SRCS:.c=.o) \$(EXTRA_OBJS)</div><div>-</div><div>+    AC_CHECK_HEADER(libproc.h, AC_DEFINE(HAVE_LIBPROC_H))</div><div> all: libwine.dylib</div><div> </div><div> libwine.$libwine_version.dylib: \$(OBJS)</div><div>diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c</div><div>index b06d7e7..f9cef96 100644</div><div>--- a/dlls/ws2_32/socket.c</div><div>+++ b/dlls/ws2_32/socket.c</div><div>@@ -132,6 +132,14 @@</div><div> # include &lt;sys/time.h&gt;</div><div> #endif</div><div> </div><div>+#ifdef HAVE_LIBPROC_H</div><div>+# include &lt;libproc.h&gt;</div><div>+#endif</div><div>+</div><div>+#include &lt;unistd.h&gt;</div><div>+#include &lt;stdio.h&gt;</div><div>+#include &lt;stdlib.h&gt;</div><div>+</div><div> #define NONAMELESSUNION</div><div> #define NONAMELESSSTRUCT</div><div> #include &quot;ntstatus.h&quot;</div><div>@@ -1449,6 +1457,30 @@ int WINAPI WSAStartup(WORD wVersionRequested, LPWSADATA lpWSAData)</div><div>     return 0;</div><div> }</div><div> </div><div>+static void close_open_sockets() {</div><div>+#ifdef HAVE_LIBPROC_H</div><div>+    int pid = getpid();</div><div>+    int bufferSizeNeeded = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, NULL, 0);</div><div>+    if (bufferSizeNeeded &gt; 0) {</div><div>+        struct proc_fdinfo *infos = (struct proc_fdinfo*)malloc(bufferSizeNeeded);</div><div>+        int ret = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, infos, bufferSizeNeeded);</div><div>+        int numfds = bufferSizeNeeded / PROC_PIDLISTFD_SIZE;</div><div>+        if (ret &gt;= 0) {</div><div>+            for (int i = 0; i &lt; numfds; ++i ) {</div><div>+                int32_t fd = infos[i].proc_fd;</div><div>+                uint32_t type = infos[i].proc_fdtype;</div><div>+                if (type == PROX_FDTYPE_SOCKET) {</div><div>+                    TRACE(&quot;Closing socket with descriptor %d\n&quot;, fd);</div><div>+                    close(fd);</div><div>+                } </div><div>+            }</div><div>+        }</div><div>+        free(infos);</div><div>+    }</div><div>+#else</div><div>+    FIXME(&quot;stub&quot;)</div><div>+#endif</div><div>+}</div><div> </div><div> /***********************************************************************</div><div>  *      WSACleanup<span class="Apple-tab-span" style="white-space:pre">			</span>(WS2_32.116)</div><div>@@ -1458,8 +1490,14 @@ INT WINAPI WSACleanup(void)</div><div>     if (num_startup) {</div><div>         num_startup--;</div><div>         TRACE(&quot;pending cleanups: %d\n&quot;, num_startup);</div><div>+        if (num_startup == 0) {</div><div>+            TRACE(&quot;cleaning up open sockets&quot;);</div><div>+            close_open_sockets();</div><div>+        }</div><div>         return 0;</div><div>     }</div><div>+</div><div>+    /* Close all sockets */</div><div>     SetLastError(WSANOTINITIALISED);</div><div>     return SOCKET_ERROR;</div><div> }</div></div>