Changeset 90911 in vbox

Timestamp:

Aug 26, 2021 1:27:36 PM (3 years ago)

Author:

vboxsync

Message:

Audio/ATS: Client disconnection fixes. bugref:10008

File:

• trunk/src/VBox/Devices/Audio/AudioTestService.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/Audio/AudioTestService.cpp

@@ -118 +118 @@
 /** Pointer to a ATS client instance. */
 typedef ATSCLIENTINST *PATSCLIENTINST;
+
+
+/*********************************************************************************************************************************
+*   Prototypes                                                                                                                   *
+*********************************************************************************************************************************/
+static int atsClientDisconnect(PATSSERVER pThis, PATSCLIENTINST pInst);
+
+
 
 /**
@@ -483 +491 @@
         }
         else
-            rc = atsReplyRC(pThis, pInst, pPktHdr, rc, "Shutting down server failed");
-
-        if (RT_SUCCESS(rc))
-            pThis->pTransport->pfnNotifyBye(pThis->pTransportInst, pInst->pTransportClient);
+            rc = atsReplyRC(pThis, pInst, pPktHdr, rc, "Disconnecting client failed");
     }
     else
@@ -786 +791 @@
  * @returns IPRT status code.
  * @param   pThis               The ATS instance.
- * @param   pInst             The ATS client structure sending the request.
- */
-static int atsClientReqProcess(PATSSERVER pThis, PATSCLIENTINST pInst)
+ * @param   pInst               The ATS client structure sending the request.
+ * @param   pfDisconnect        Where to return whether to disconnect the client on success or not.
+ */
+static int atsClientReqProcess(PATSSERVER pThis, PATSCLIENTINST pInst, bool *pfDisconnect)
 {
     /*
@@ -805 +811 @@
         rc = atsDoHowdy(pThis, pInst, pPktHdr);
     else if (atsIsSameOpcode(pPktHdr, ATSPKT_OPCODE_BYE))
+    {
         rc = atsDoBye(pThis, pInst, pPktHdr);
+        if (RT_SUCCESS(rc))
+            *pfDisconnect = true;
+    }
     /* Test set handling: */
     else if (atsIsSameOpcode(pPktHdr, ATSPKT_OPCODE_TESTSET_BEGIN))
@@ -827 +837 @@
 }
 
-/**
- * Destroys a client instance.
+static int atsClientDisconnect(PATSSERVER pThis, PATSCLIENTINST pInst)
+{
+    AssertReturn(pInst->enmState != ATSCLIENTSTATE_DESTROYING, VERR_WRONG_ORDER);
+
+    pInst->enmState = ATSCLIENTSTATE_DESTROYING;
+    pThis->pTransport->pfnNotifyBye(pThis->pTransportInst, pInst->pTransportClient);
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * Free's (destroys) a client instance.
  *
  * @returns nothing.
  * @param   pInst               The opaque ATS instance structure.
  */
-static void atsClientDestroy(PATSCLIENTINST pInst)
+static void atsClientFree(PATSCLIENTINST pInst)
 {
     if (pInst->pszHostname)
@@ -911 +931 @@
                             else
                             {
-                                pThis->pTransport->pfnNotifyBye(pThis->pTransportInst, pIt->pTransportClient);
-                                atsClientDestroy(pIt);
+                                atsClientDisconnect(pThis, pIt);
+                                atsClientFree(pIt);
+                                pIt = NULL;
                             }
                         }
                         else
                         {
-                            pThis->pTransport->pfnNotifyBye(pThis->pTransportInst, pIt->pTransportClient);
-                            atsClientDestroy(pIt);
+                            atsClientDisconnect(pThis, pIt);
+                            atsClientFree(pIt);
+                            pIt = NULL;
                         }
                     }
@@ -925 +947 @@
                 else
                 {
+                    bool fDisconnect = false;
+
                     /* Client sends a request, pick the right client and process it. */
                     PATSCLIENTINST pInst = papInsts[uId - 1];
                     AssertPtr(pInst);
                     if (fEvts & RTPOLL_EVT_READ)
-                        rc = atsClientReqProcess(pThis, pInst);
+                        rc = atsClientReqProcess(pThis, pInst, &fDisconnect);
 
                     if (   (fEvts & RTPOLL_EVT_ERROR)
-                        || RT_FAILURE(rc))
+                        || RT_FAILURE(rc)
+                        || fDisconnect)
                     {
                         /* Close connection and remove client from array. */
-                        rc = pThis->pTransport->pfnPollSetRemove(pThis->pTransportInst, pThis->hPollSet, pInst->pTransportClient, uId);
-                        AssertRC(rc);
-
-                        pThis->pTransport->pfnNotifyBye(pThis->pTransportInst, pInst->pTransportClient);
-                        pInst->pTransportClient = NULL;
+                        int rc2 = pThis->pTransport->pfnPollSetRemove(pThis->pTransportInst, pThis->hPollSet, pInst->pTransportClient, uId);
+                        AssertRC(rc2);
+
+                        atsClientDisconnect(pThis, pInst);
+                        atsClientFree(pInst);
+                        pInst = NULL;
+
                         papInsts[uId - 1] = NULL;
+                        Assert(cClientsCur);
                         cClientsCur--;
-                        atsClientDestroy(pInst);
                     }
                 }