Properly close socket on WIN32 to allow accepting further connections

diff --git a/gdbserver/gdb-server.c b/gdbserver/gdb-server.c
index daacb85cb6a6eb4d85146e115849d5e80d808a6a..b1cea5cb54b0ea6e9c006be03b5fd81e60270122 100644 (file)
--- a/gdbserver/gdb-server.c
+++ b/gdbserver/gdb-server.c
@@ -733,6 +733,9 @@ int serve(stlink_t *sl, st_state_t *st) {
         int status = gdb_recv_packet(client, &packet);
         if(status < 0) {
             ELOG("cannot recv: %d\n", status);
+#ifdef __MINGW32__
+            win32_close_socket(sock);
+#endif
             return 1;
         }
 
@@ -942,6 +945,9 @@ int serve(stlink_t *sl, st_state_t *st) {
                     int status = gdb_check_for_interrupt(client);
                     if(status < 0) {
                         ELOG("cannot check for int: %d\n", status);
+#ifdef __MINGW32__
+                        win32_close_socket(sock);
+#endif
                         return 1;
                     }
 
@@ -1256,6 +1262,9 @@ int serve(stlink_t *sl, st_state_t *st) {
                 ELOG("cannot send: %d\n", result);
                 free(reply);
                 free(packet);
+#ifdef __MINGW32__
+                win32_close_socket(sock);
+#endif
                 return 1;
             }
 
@@ -1265,5 +1274,9 @@ int serve(stlink_t *sl, st_state_t *st) {
         free(packet);
     }
 
+#ifdef __MINGW32__
+    win32_close_socket(sock);
+#endif
+
     return 0;
 }

diff --git a/mingw/mingw.c b/mingw/mingw.c
index 266a87c64fcb095e23bab7ed23e5ab88810c6698..3c5d025a3ca829caa0b6b213f70891d49abd69da 100644 (file)
--- a/mingw/mingw.c
+++ b/mingw/mingw.c
@@ -163,14 +163,16 @@ win32_shutdown(SOCKET fd, int mode)
     }
     return rc;
 }
-int win32_close_socket(SOCKET fd) {
-    int rc;
 
-    rc = closesocket(fd);
+int win32_close_socket(SOCKET fd)
+{
+    int rc = closesocket(fd);
+    if(rc == SOCKET_ERROR) {
+        set_socket_errno(WSAGetLastError());
+    }
     return rc;
 }
 
-
 ssize_t win32_write_socket(SOCKET fd, void *buf, int n)
 {
     int rc = send(fd, buf, n, 0);

diff --git a/mingw/mingw.h b/mingw/mingw.h
index 28c7a82e0278be7f628bf6a96f5150fb639b545f..1fcf93da20ff8183a603a9e137eda2abab667a24 100644 (file)
--- a/mingw/mingw.h
+++ b/mingw/mingw.h
@@ -54,6 +54,7 @@ SOCKET  win32_socket(int, int, int);
 int     win32_connect(SOCKET, struct sockaddr*, socklen_t);
 SOCKET  win32_accept(SOCKET, struct sockaddr*, socklen_t *);
 int     win32_shutdown(SOCKET, int);
+int    win32_close_socket(SOCKET fd);
 
 #define strtok_r(x, y, z)      win32_strtok_r(x, y, z)
 #define strsep(x,y) win32_strsep(x,y)