windows: Provide a close(2) that can close both file handles and sockets

diff --git a/src/libstrongswan/utils/windows.c b/src/libstrongswan/utils/windows.c
index 48a70b6c29ae7354f5beb8d32b699d0cf8a992f1..492821d53d6ec78d89c95adbbabd0020b3d3e4f1 100644 (file)
--- a/src/libstrongswan/utils/windows.c
+++ b/src/libstrongswan/utils/windows.c
@@ -331,6 +331,22 @@ static bool check_dontwait(int *flags)
        return FALSE;
 }
 
+/**
+ * See header
+ */
+#undef close
+int windows_close(int fd)
+{
+       int ret;
+
+       ret = close(fd);
+       if (ret == -1 && errno == EBADF)
+       {       /* Winsock socket? */
+               ret = wserr(closesocket(fd));
+       }
+       return ret;
+}
+
 /**
  * See header
  */

diff --git a/src/libstrongswan/utils/windows.h b/src/libstrongswan/utils/windows.h
index d57b5dc1d38f6b4cd68d70ce3aed082eca42e14d..3e317ce5920c7000d1258f3a78f6540923c18e95 100644 (file)
--- a/src/libstrongswan/utils/windows.h
+++ b/src/libstrongswan/utils/windows.h
@@ -264,6 +264,12 @@ int socketpair(int domain, int type, int protocol, int sv[2]);
  */
 #define ECONNRESET ENXIO
 
+/**
+ * close(2) working for file handles and Winsock sockets
+ */
+#define close windows_close
+int windows_close(int fd);
+
 /**
  * recv(2) with support for MSG_DONTWAIT
  */