Changeset 86114 in vbox for trunk/src/VBox

Timestamp:

Sep 13, 2020 5:52:04 PM (4 years ago)

Author:

vboxsync

Message:

Devices/Serial/DrvTCP: Decrement connection count on orderly shutdown, fixes connection again after the remote end had disconnected, ticketref:19878

File:

• trunk/src/VBox/Devices/Serial/DrvTCP.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Serial/DrvTCP.cpp

@@ -136 +136 @@
 
 /**
+ * Closes the connection.
+ *
+ * @returns nothing.
+ * @param   pThis                  The TCP driver instance.
+ */
+static void drvTcpConnectionClose(PDRVTCP pThis)
+{
+    Assert(pThis->hTcpSock != NIL_RTSOCKET);
+
+    int rc = RTPollSetRemove(pThis->hPollSet, DRVTCP_POLLSET_ID_SOCKET);
+    AssertRC(rc);
+
+    if (pThis->fIsServer)
+        RTTcpServerDisconnectClient2(pThis->hTcpSock);
+    else
+        RTSocketClose(pThis->hTcpSock);
+    pThis->hTcpSock = NIL_RTSOCKET;
+    ASMAtomicDecU32(&pThis->cConnections);
+}
+
+
+/**
  * Checks the wakeup pipe for events.
  *
@@ -260 +282 @@
                     /* On error we close the socket here. */
                     if (fEvtsRecv & RTPOLL_EVT_ERROR)
-                    {
-                        rc = RTPollSetRemove(pThis->hPollSet, DRVTCP_POLLSET_ID_SOCKET);
-                        AssertRC(rc);
-
-                        if (pThis->fIsServer)
-                            RTTcpServerDisconnectClient2(pThis->hTcpSock);
-                        else
-                            RTSocketClose(pThis->hTcpSock);
-                        pThis->hTcpSock = NIL_RTSOCKET;
-                        ASMAtomicDecU32(&pThis->cConnections);
-                        /* Continue with polling. */
-                    }
+                        drvTcpConnectionClose(pThis); /* Continue with polling afterwards. */
                     else
                     {
@@ -328 +339 @@
             if (!cbRead && rc != VINF_TRY_AGAIN)
             {
-                rc = RTPollSetRemove(pThis->hPollSet, DRVTCP_POLLSET_ID_SOCKET);
-                AssertRC(rc);
-
-                if (pThis->fIsServer)
-                    RTTcpServerDisconnectClient2(pThis->hTcpSock);
-                else
-                    RTSocketClose(pThis->hTcpSock);
-                pThis->hTcpSock = NIL_RTSOCKET;
+                drvTcpConnectionClose(pThis);
                 rc = VINF_SUCCESS;
             }