Changeset 91024 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Aug 31, 2021 9:56:26 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

146665

Message:

Audio/Validation Kit: Trying to resolve the connection issues by checking whether clients were connected in reverse mode or not. This would otherwise end up in connecting more and more clients without any real use. See comments. ​bugref:10008

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioTestService.cpp (modified) (4 diffs)
• AudioTestServiceClient.cpp (modified) (1 diff)
• AudioTestServiceInternal.h (modified) (1 diff)
• AudioTestServiceTcp.cpp (modified) (3 diffs)

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

@@ -1002 +1002 @@
          * for every new client.
          */
+        bool                fFromServer;
         PATSTRANSPORTCLIENT pTransportClient;
-        rc = pThis->pTransport->pfnWaitForConnect(pThis->pTransportInst, 1000 /* msTimeout */, &pTransportClient);
+        rc = pThis->pTransport->pfnWaitForConnect(pThis->pTransportInst, 1000 /* msTimeout */, &fFromServer, &pTransportClient);
         if (RT_FAILURE(rc))
             continue;
@@ -1032 +1033 @@
             LogRelFunc(("Creating new client structure failed with out of memory error\n"));
             pThis->pTransport->pfnNotifyBye(pThis->pTransportInst, pTransportClient);
+            rc = VERR_NO_MEMORY;
+            break; /* This is fatal, break out of the loop. */
+        }
+
+        if (RT_SUCCESS(rc))
+        {
+            LogRelFunc(("New connection established (%s)\n", fFromServer ? "from server" : "as client"));
+
+            /**
+             * If the new client is from a remote server (also called a reverse connection)
+             * instead from this server, exit this loop and stop trying to connect to the remote server.
+             *
+             * Otherwise we would connect lots and lots of clients without any real use.
+             *
+             ** @todo Improve this handling -- there might be a better / more elegant solution.
+             */
+            if (fFromServer)
+                break;
         }
     }
@@ -1050 +1069 @@
 int AudioTestSvcInit(PATSSERVER pThis, PCATSCALLBACKS pCallbacks)
 {
+    LogRelFlowFuncEnter();
+
     RT_BZERO(pThis, sizeof(ATSSERVER));
 
@@ -1097 +1118 @@
         LogRel(("Creating server failed with %Rrc\n", rc));
 
+    LogRelFlowFuncLeaveRC(rc);
     return rc;
 }

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

@@ -331 +331 @@
     {
         rc = pClient->pTransport->pfnWaitForConnect(pClient->pTransportInst,
-                                                    msTimeout, &pClient->pTransportClient);
+                                                    msTimeout, NULL /* pfFromServer */, &pClient->pTransportClient);
         if (RT_SUCCESS(rc))
         {

trunk/src/VBox/Devices/Audio/AudioTestServiceInternal.h

@@ -128 +128 @@
      *                              Use RT_INDEFINITE_WAIT to wait indefinitely.
      *                              This might or might not be supported by the specific transport implementation.
+     * @param   pfFromServer        Returns \c true if the returned client is from a remote server (called a reverse connection),
+     *                              or \c false if not (regular client). Optional and can be NULL.
      * @param   ppClientNew         Where to return the allocated client on success.
      */
-    DECLR3CALLBACKMEMBER(int, pfnWaitForConnect, (PATSTRANSPORTINST pThis, RTMSINTERVAL msTimeout, PPATSTRANSPORTCLIENT ppClientNew));
+    DECLR3CALLBACKMEMBER(int, pfnWaitForConnect, (PATSTRANSPORTINST pThis, RTMSINTERVAL msTimeout, bool *pfFromServer, PPATSTRANSPORTCLIENT ppClientNew));
 
     /**

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

@@ -321 +321 @@
  * @interface_method_impl{ATSTRANSPORT,pfnWaitForConnect}
  */
-static DECLCALLBACK(int) atsTcpWaitForConnect(PATSTRANSPORTINST pThis,  RTMSINTERVAL msTimeout, PPATSTRANSPORTCLIENT ppClientNew)
+static DECLCALLBACK(int) atsTcpWaitForConnect(PATSTRANSPORTINST pThis,  RTMSINTERVAL msTimeout,
+                                              bool *pfFromServer, PPATSTRANSPORTCLIENT ppClientNew)
 {
     PATSTRANSPORTCLIENT pClient = (PATSTRANSPORTCLIENT)RTMemAllocZ(sizeof(ATSTRANSPORTCLIENT));
@@ -338 +339 @@
         pClient->fFromServer = true;
         rc = RTTcpServerListen2(pThis->pTcpServer, &pClient->hTcpClient);
-        LogRelFlowFunc(("RTTcpServerListen2 -> %Rrc\n", rc));
+        LogRelFlowFunc(("RTTcpServerListen2(%RTsock) -> %Rrc\n", pClient->hTcpClient, rc));
     }
     else if (pThis->enmConnMode == ATSCONNMODE_CLIENT)
@@ -423 +424 @@
     if (RT_SUCCESS(rc))
     {
+        if (pfFromServer)
+            *pfFromServer = pClient->fFromServer;
         *ppClientNew = pClient;
     }