socket-util: closesocket() for Windows.

For Windows sockets, one has to call closesocket() to
close the sockets.

Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>

diff --git a/lib/socket-util.c b/lib/socket-util.c
index a30408a..357594d 100644 (file)
--- a/lib/socket-util.c
+++ b/lib/socket-util.c
@@ -810,7 +810,7 @@ exit:
             memset(ssp, 0, sizeof *ssp);
         }
         if (fd >= 0) {
-            close(fd);
+            closesocket(fd);
             fd = -1;
         }
     } else {
@@ -958,7 +958,7 @@ error:
     if (ssp) {
         memset(ssp, 0, sizeof *ssp);
     }
-    close(fd);
+    closesocket(fd);
     return -error;
 }
 

diff --git a/lib/socket-util.h b/lib/socket-util.h
index 6e55a4c..d2bd109 100644 (file)
--- a/lib/socket-util.h
+++ b/lib/socket-util.h
@@ -111,4 +111,8 @@ static inline int sock_errno(void)
 #endif
 }
 
+#ifndef _WIN32
+#define closesocket close
+#endif
+
 #endif /* socket-util.h */

diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c
index 0dc832d..14d62c4 100644 (file)
--- a/lib/stream-ssl.c
+++ b/lib/stream-ssl.c
@@ -60,8 +60,6 @@
  * compiled with /MD is not tested. */
 #include <openssl/applink.c>
 #define SHUT_RDWR SD_BOTH
-#else
-#define closesocket close
 #endif
 
 VLOG_DEFINE_THIS_MODULE(stream_ssl);