Changeset 90912 in vbox

Timestamp:

Aug 26, 2021 1:38:34 PM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: More connection mode handling. bugref:10008

Location:

trunk/src/VBox

Files:

• Devices/Audio/AudioTestService.h (modified) (1 diff)
• Devices/Audio/AudioTestServiceTcp.cpp (modified) (10 diffs)
• Devices/Audio/DrvHostAudioValidationKit.cpp (modified) (1 diff)
• Devices/Audio/testcase/tstAudioTestService.cpp (modified) (2 diffs)
• ValidationKit/utils/audio/vkatCommon.cpp (modified) (7 diffs)
• ValidationKit/utils/audio/vkatInternal.h (modified) (1 diff)

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

@@ -178 +178 @@
 int AudioTestSvcShutdown(PATSSERVER pThis);
 
+/**
+ * Enumeration for the server connection mode.
+ * Only applies to certain transport implementation like TCP/IP.
+ */
+typedef enum ATSCONNMODE
+{
+    /** Both: Uses parallel client and server connection methods (via threads). */
+    ATSCONNMODE_BOTH = 0,
+    /** Client only: Connects to a server. */
+    ATSCONNMODE_CLIENT,
+    /** Server only: Listens for new incoming client connections. */
+    ATSCONNMODE_SERVER,
+    /** 32bit hack. */
+    ATSCONNMODE_32BIT_HACK = 0x7fffffff
+} ATSCONNMODE;
+
 /** TCP/IP options for the ATS server.
  *  @todo Make this more abstract later. */
 enum ATSTCPOPT
 {
-    ATSTCPOPT_MODE = 5000,
+    ATSTCPOPT_CONN_MODE = 5000,
     ATSTCPOPT_BIND_ADDRESS,
     ATSTCPOPT_BIND_PORT,

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

@@ -68 +68 @@
 
 /**
- * Enumeration for the TCP/IP connection mode.
- */
-typedef enum ATSTCPMODE
-{
-    /** Both: Uses parallel client and server connection methods (via threads). */
-    ATSTCPMODE_BOTH = 0,
-    /** Client only: Connects to a server. */
-    ATSTCPMODE_CLIENT,
-    /** Server only: Listens for new incoming client connections. */
-    ATSTCPMODE_SERVER
-} ATSTCPMODE;
-
-/**
  * Structure for keeping Audio Test Service (ATS) transport instance-specific data.
  */
@@ -88 +75 @@
     RTCRITSECT                         CritSect;
     /** Connection mode to use. */
-    ATSTCPMODE                         enmMode;
+    ATSCONNMODE                        enmConnMode;
     /** The addresses to bind to.  Empty string means any. */
     char                               szBindAddr[256];
@@ -314 +301 @@
     int rc;
 
-    LogFunc(("enmMode=%#x\n", pThis->enmMode));
-
-    if (pThis->enmMode == ATSTCPMODE_SERVER)
+    LogFunc(("enmConnMode=%#x\n", pThis->enmConnMode));
+
+    if (pThis->enmConnMode == ATSCONNMODE_SERVER)
     {
         pClient->fFromServer = true;
@@ -322 +309 @@
         LogFunc(("RTTcpServerListen2 -> %Rrc\n", rc));
     }
-    else if (pThis->enmMode == ATSTCPMODE_CLIENT)
+    else if (pThis->enmConnMode == ATSCONNMODE_CLIENT)
     {
         pClient->fFromServer = false;
@@ -339 +326 @@
     else
     {
-        Assert(pThis->enmMode == ATSTCPMODE_BOTH);
+        Assert(pThis->enmConnMode == ATSCONNMODE_BOTH);
 
         /*
@@ -731 +718 @@
     int rc = VINF_SUCCESS;
 
-    if (pThis->enmMode != ATSTCPMODE_CLIENT)
+    if (pThis->enmConnMode != ATSCONNMODE_CLIENT)
     {
         rc = RTTcpServerCreateEx(pThis->szBindAddr[0] ? pThis->szBindAddr : NULL, pThis->uBindPort, &pThis->pTcpServer);
@@ -771 +758 @@
     switch (ch)
     {
-        case ATSTCPOPT_MODE:
-            if (!strcmp(pVal->psz, "both"))
-                pThis->enmMode = ATSTCPMODE_BOTH;
-            else if (!strcmp(pVal->psz, "client"))
-                pThis->enmMode = ATSTCPMODE_CLIENT;
-            else if (!strcmp(pVal->psz, "server"))
-                pThis->enmMode = ATSTCPMODE_SERVER;
-            else
-                return RTMsgErrorRc(VERR_INVALID_PARAMETER, "Invalid TCP mode: '%s'\n", pVal->psz);
+        case ATSTCPOPT_CONN_MODE:
+            pThis->enmConnMode = (ATSCONNMODE)pVal->u32;
             return VINF_SUCCESS;
 
@@ -818 +798 @@
 {
     RTStrmPrintf(pStream,
-                 "  --tcp-mode <both|client|server>\n"
-                 "       Selects the mode of operation.\n"
-                 "       Default: both\n"
-                 "  --tcp-bind-address <address>\n"
+                 "  --tcp-conn-mode <0=both|1=client|2=server>\n"
+                 "       Selects the connection mode.\n"
+                 "       Default: 0 (both)\n"
+                 "  --tcp-bind-addr[ess] <address>\n"
                  "       The address(es) to listen to TCP connection on.  Empty string\n"
                  "       means any address, this is the default.\n"
@@ -827 +807 @@
                  "       The port to listen to TCP connections on.\n"
                  "       Default: %u\n"
-                 "  --tcp-connect-address <address>\n"
+                 "  --tcp-connect-addr[ess] <address>\n"
                  "       The address of the server to try connect to in client mode.\n"
                  "       Default: " ATS_TCP_DEF_CONNECT_GUEST_STR "\n"
@@ -839 +819 @@
 static const RTGETOPTDEF  g_TcpOpts[] =
 {
-    { "--tcp-mode",             ATSTCPOPT_MODE,             RTGETOPT_REQ_STRING },
+    { "--tcp-conn-mode",        ATSTCPOPT_CONN_MODE,        RTGETOPT_REQ_STRING },
+    { "--tcp-bind-addr",        ATSTCPOPT_BIND_ADDRESS,     RTGETOPT_REQ_STRING },
     { "--tcp-bind-address",     ATSTCPOPT_BIND_ADDRESS,     RTGETOPT_REQ_STRING },
     { "--tcp-bind-port",        ATSTCPOPT_BIND_PORT,        RTGETOPT_REQ_UINT16 },
+    { "--tcp-connect-addr",     ATSTCPOPT_CONNECT_ADDRESS,  RTGETOPT_REQ_STRING },
     { "--tcp-connect-address",  ATSTCPOPT_CONNECT_ADDRESS,  RTGETOPT_REQ_STRING },
     { "--tcp-connect-port",     ATSTCPOPT_CONNECT_PORT,     RTGETOPT_REQ_UINT16 }

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

@@ -1114 +1114 @@
         RT_ZERO(Val);
 
-        Val.psz = "server"; /** @ŧodo No client connection mode needed here (yet). Make this configurable via CFGM. */
-        rc2 = AudioTestSvcHandleOption(&pThis->Srv, ATSTCPOPT_MODE, &Val);
+        Val.u32 = ATSCONNMODE_SERVER; /** @todo No client connection mode needed here (yet). Make this configurable via CFGM. */
+        rc2 = AudioTestSvcHandleOption(&pThis->Srv, ATSTCPOPT_CONN_MODE, &Val);
         AssertRC(rc2);
 

trunk/src/VBox/Devices/Audio/testcase/tstAudioTestService.cpp

@@ -84 +84 @@
 
         Val.psz = "server";
-        rc = AudioTestSvcHandleOption(&Srv, ATSTCPOPT_MODE, &Val);
+        rc = AudioTestSvcHandleOption(&Srv, ATSTCPOPT_CONN_MODE, &Val);
         RTTEST_CHECK_RC_OK(hTest, rc);
 
@@ -118 +118 @@
 
                 Val.psz = "client";
-                rc = AudioTestSvcClientHandleOption(&Client, ATSTCPOPT_MODE, &Val);
+                rc = AudioTestSvcClientHandleOption(&Client, ATSTCPOPT_CONN_MODE, &Val);
                 RTTEST_CHECK_RC_OK(hTest, rc);
 

trunk/src/VBox/ValidationKit/utils/audio/vkatCommon.cpp

@@ -693 +693 @@
     RT_ZERO(Val);
 
-    int rc;
-
-    if (!pTcpOpts->szBindAddr[0])
-    {
-        Val.psz = "client";
-    }
-    else if (!pTcpOpts->szConnectAddr[0])
-    {
-        Val.psz = "server";
-    }
-    else
-        Val.psz = "both";
-
-    rc = AudioTestSvcClientHandleOption(pClient, ATSTCPOPT_MODE, &Val);
+    Val.u32 = pTcpOpts->enmConnMode;
+    int rc = AudioTestSvcClientHandleOption(pClient, ATSTCPOPT_CONN_MODE, &Val);
     AssertRCReturn(rc, rc);
 
-    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Connecting %s (connection mode '%s') ...\n", pszWhat, Val.psz);
-
-    if (   !RTStrCmp(Val.psz, "client")
-        || !RTStrCmp(Val.psz, "both"))
-           RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Connecting to %s:%RU32\n", pTcpOpts->szConnectAddr, pTcpOpts->uConnectPort);
-
-    if (   !RTStrCmp(Val.psz, "server")
-        || !RTStrCmp(Val.psz, "both"))
-        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Listening at %s:%RU32\n", pTcpOpts->szBindAddr, pTcpOpts->uBindPort);
-
-    if (pTcpOpts->szBindAddr[0])
-    {
-        Val.psz = pTcpOpts->szBindAddr;
-        rc = AudioTestSvcClientHandleOption(pClient, ATSTCPOPT_BIND_ADDRESS, &Val);
-        AssertRCReturn(rc, rc);
-    }
-
-    if (pTcpOpts->uBindPort)
-    {
+    if (   pTcpOpts->enmConnMode == ATSCONNMODE_BOTH
+        || pTcpOpts->enmConnMode == ATSCONNMODE_SERVER)
+    {
+        Assert(pTcpOpts->uBindPort); /* Always set by the caller. */
         Val.u16 = pTcpOpts->uBindPort;
         rc = AudioTestSvcClientHandleOption(pClient, ATSTCPOPT_BIND_PORT, &Val);
         AssertRCReturn(rc, rc);
-    }
-
-    if (pTcpOpts->szConnectAddr[0])
-    {
-        Val.psz = pTcpOpts->szConnectAddr;
-        rc = AudioTestSvcClientHandleOption(pClient, ATSTCPOPT_CONNECT_ADDRESS, &Val);
-        AssertRCReturn(rc, rc);
-    }
-
-    if (pTcpOpts->uConnectPort)
-    {
+
+        if (pTcpOpts->szBindAddr[0])
+        {
+            Val.psz = pTcpOpts->szBindAddr;
+            rc = AudioTestSvcClientHandleOption(pClient, ATSTCPOPT_BIND_ADDRESS, &Val);
+            AssertRCReturn(rc, rc);
+        }
+        else
+        {
+            RTTestFailed(g_hTest, "No bind address specified!\n");
+            return VERR_INVALID_PARAMETER;
+        }
+
+        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Connecting %s by listening as server at %s:%RU32 ...\n",
+                     pszWhat, pTcpOpts->szBindAddr, pTcpOpts->uBindPort);
+    }
+
+
+    if (   pTcpOpts->enmConnMode == ATSCONNMODE_BOTH
+        || pTcpOpts->enmConnMode == ATSCONNMODE_CLIENT)
+    {
+        Assert(pTcpOpts->uConnectPort); /* Always set by the caller. */
         Val.u16 = pTcpOpts->uConnectPort;
         rc = AudioTestSvcClientHandleOption(pClient, ATSTCPOPT_CONNECT_PORT, &Val);
         AssertRCReturn(rc, rc);
+
+        if (pTcpOpts->szConnectAddr[0])
+        {
+            Val.psz = pTcpOpts->szConnectAddr;
+            rc = AudioTestSvcClientHandleOption(pClient, ATSTCPOPT_CONNECT_ADDRESS, &Val);
+            AssertRCReturn(rc, rc);
+        }
+        else
+        {
+            RTTestFailed(g_hTest, "No connect address specified!\n");
+            return VERR_INVALID_PARAMETER;
+        }
+
+        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Connecting %s by connecting as client to %s:%RU32 ...\n",
+                     pszWhat, pTcpOpts->szConnectAddr, pTcpOpts->uConnectPort);
     }
 
@@ -773 +772 @@
     RT_ZERO(Val);
 
-    if (pTcpOpts->szBindAddr[0])
-    {
-        Val.psz = pTcpOpts->szBindAddr;
-        AudioTestSvcHandleOption(pSrv, ATSTCPOPT_BIND_ADDRESS, &Val);
-    }
-
-    if (pTcpOpts->uBindPort)
-    {
+    Val.u32 = pTcpOpts->enmConnMode;
+    AudioTestSvcHandleOption(pSrv, ATSTCPOPT_CONN_MODE, &Val);
+
+    if (   pTcpOpts->enmConnMode == ATSCONNMODE_BOTH
+        || pTcpOpts->enmConnMode == ATSCONNMODE_SERVER)
+    {
+        Assert(pTcpOpts->uBindPort); /* Always set by the caller. */
         Val.u16 = pTcpOpts->uBindPort;
         AudioTestSvcHandleOption(pSrv, ATSTCPOPT_BIND_PORT, &Val);
-    }
-
-    if (pTcpOpts->szConnectAddr[0])
-    {
-        Val.psz = pTcpOpts->szConnectAddr;
-        AudioTestSvcHandleOption(pSrv, ATSTCPOPT_CONNECT_ADDRESS, &Val);
-    }
-
-    if (pTcpOpts->uConnectPort)
-    {
+
+        if (pTcpOpts->szBindAddr[0])
+        {
+            Val.psz = pTcpOpts->szBindAddr;
+            AudioTestSvcHandleOption(pSrv, ATSTCPOPT_BIND_ADDRESS, &Val);
+        }
+        else
+        {
+            RTTestFailed(g_hTest, "No bind address specified!\n");
+            return VERR_INVALID_PARAMETER;
+        }
+
+        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Starting server for %s at %s:%RU32 ...\n",
+                     pszDesc, pTcpOpts->szBindAddr, pTcpOpts->uBindPort);
+    }
+
+
+    if (   pTcpOpts->enmConnMode == ATSCONNMODE_BOTH
+        || pTcpOpts->enmConnMode == ATSCONNMODE_CLIENT)
+    {
+        Assert(pTcpOpts->uConnectPort); /* Always set by the caller. */
         Val.u16 = pTcpOpts->uConnectPort;
         AudioTestSvcHandleOption(pSrv, ATSTCPOPT_CONNECT_PORT, &Val);
-    }
-
-    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Starting server for %s at %s:%RU32 ...\n",
-                 pszDesc, pTcpOpts->szBindAddr[0] ? pTcpOpts->szBindAddr : "0.0.0.0", pTcpOpts->uBindPort);
-    if (pTcpOpts->szConnectAddr[0])
-        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Trying %s to connect as client to %s:%RU32 ...\n",
-                     pszDesc, pTcpOpts->szConnectAddr[0] ? pTcpOpts->szConnectAddr : "0.0.0.0", pTcpOpts->uConnectPort);
+
+        if (pTcpOpts->szConnectAddr[0])
+        {
+            Val.psz = pTcpOpts->szConnectAddr;
+            AudioTestSvcHandleOption(pSrv, ATSTCPOPT_CONNECT_ADDRESS, &Val);
+        }
+        else
+        {
+            RTTestFailed(g_hTest, "No connect address specified!\n");
+            return VERR_INVALID_PARAMETER;
+        }
+
+        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Starting server for %s by connecting as client to %s:%RU32 ...\n",
+                     pszDesc, pTcpOpts->szConnectAddr, pTcpOpts->uConnectPort);
+    }
 
     int rc = AudioTestSvcInit(pSrv, pCallbacks);
@@ -897 +914 @@
         && !pTstEnv->TcpOpts.szBindAddr[0])
             RTStrCopy(pTstEnv->TcpOpts.szBindAddr, sizeof(pTstEnv->TcpOpts.szBindAddr), "0.0.0.0");
+
+    /*
+     * Determine connection mode based on set variables.
+     */
+    if (   pTstEnv->TcpOpts.szBindAddr[0]
+        && pTstEnv->TcpOpts.szConnectAddr[0])
+    {
+        pTstEnv->TcpOpts.enmConnMode = ATSCONNMODE_BOTH;
+    }
+    else if (pTstEnv->TcpOpts.szBindAddr[0])
+        pTstEnv->TcpOpts.enmConnMode = ATSCONNMODE_SERVER;
+    else /* "Reversed mode", i.e. used for NATed VMs. */
+        pTstEnv->TcpOpts.enmConnMode = ATSCONNMODE_CLIENT;
 
     /* Set a back reference to the test environment for the callback context. */
@@ -923 +953 @@
             pTstEnv->TcpOpts.uConnectPort = ATS_TCP_DEF_CONNECT_PORT_GUEST;
 
-        /**
-         * Note: Don't set pTstEnv->TcpOpts.szTcpConnectAddr by default here, as this specifies what connection mode
-         *       (client / server / both) we use on the guest.
-         */
-
         /*
          * Start the ATS (Audio Test Service) on the guest side.
@@ -935 +960 @@
          * Note that we have to bind to "0.0.0.0" by default so that the host can connect to it.
          */
-        rc = audioTestEnvConfigureAndStartTcpServer(&pTstEnv->Srv, &Callbacks, "Guest ATS", &pTstEnv->TcpOpts);
+        rc = audioTestEnvConfigureAndStartTcpServer(&pTstEnv->Srv, &Callbacks, "guest", &pTstEnv->TcpOpts);
     }
     else /* Host mode */
@@ -955 +980 @@
         if (RT_SUCCESS(rc))
             rc = audioTestEnvConnectViaTcp(pTstEnv, &pTstEnv->u.Host.AtsClGuest,
-                                           "Host -> Guest ATS", &pTstEnv->TcpOpts);
+                                           "host -> guest", &pTstEnv->TcpOpts);
         if (RT_SUCCESS(rc))
         {
             AUDIOTESTENVTCPOPTS ValKitTcpOpts;
             RT_ZERO(ValKitTcpOpts);
+
+            /* We only connect as client to the Validation Kit audio driver ATS. */
+            ValKitTcpOpts.enmConnMode = ATSCONNMODE_CLIENT;
 
             /* For now we ASSUME that the Validation Kit audio driver ATS runs on the same host as VKAT (this binary) runs on. */
@@ -968 +996 @@
             if (RT_SUCCESS(rc))
                 rc = audioTestEnvConnectViaTcp(pTstEnv, &pTstEnv->u.Host.AtsClValKit,
-                                               "Host -> Validation Kit Host Audio Driver ATS", &ValKitTcpOpts);
+                                               "host -> valkit", &ValKitTcpOpts);
         }
     }

trunk/src/VBox/ValidationKit/utils/audio/vkatInternal.h

@@ -182 +182 @@
 typedef struct AUDIOTESTENVTCPOPTS
 {
+    /** Connection mode(s) to use. */
+    ATSCONNMODE     enmConnMode;
     /** Bind address (server mode). When empty, "0.0.0.0" (any host) will be used. */
     char            szBindAddr[128];