Changeset 90912 in vbox for trunk/src/VBox/Devices/Audio
- Timestamp:
- Aug 26, 2021 1:38:34 PM (4 years ago)
- svn:sync-xref-src-repo-rev:
- 146548
- Location:
- trunk/src/VBox/Devices/Audio
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Audio/AudioTestService.h
r90830 r90912 178 178 int AudioTestSvcShutdown(PATSSERVER pThis); 179 179 180 /** 181 * Enumeration for the server connection mode. 182 * Only applies to certain transport implementation like TCP/IP. 183 */ 184 typedef enum ATSCONNMODE 185 { 186 /** Both: Uses parallel client and server connection methods (via threads). */ 187 ATSCONNMODE_BOTH = 0, 188 /** Client only: Connects to a server. */ 189 ATSCONNMODE_CLIENT, 190 /** Server only: Listens for new incoming client connections. */ 191 ATSCONNMODE_SERVER, 192 /** 32bit hack. */ 193 ATSCONNMODE_32BIT_HACK = 0x7fffffff 194 } ATSCONNMODE; 195 180 196 /** TCP/IP options for the ATS server. 181 197 * @todo Make this more abstract later. */ 182 198 enum ATSTCPOPT 183 199 { 184 ATSTCPOPT_ MODE = 5000,200 ATSTCPOPT_CONN_MODE = 5000, 185 201 ATSTCPOPT_BIND_ADDRESS, 186 202 ATSTCPOPT_BIND_PORT, -
trunk/src/VBox/Devices/Audio/AudioTestServiceTcp.cpp
r90887 r90912 68 68 69 69 /** 70 * Enumeration for the TCP/IP connection mode.71 */72 typedef enum ATSTCPMODE73 {74 /** Both: Uses parallel client and server connection methods (via threads). */75 ATSTCPMODE_BOTH = 0,76 /** Client only: Connects to a server. */77 ATSTCPMODE_CLIENT,78 /** Server only: Listens for new incoming client connections. */79 ATSTCPMODE_SERVER80 } ATSTCPMODE;81 82 /**83 70 * Structure for keeping Audio Test Service (ATS) transport instance-specific data. 84 71 */ … … 88 75 RTCRITSECT CritSect; 89 76 /** Connection mode to use. */ 90 ATS TCPMODE enmMode;77 ATSCONNMODE enmConnMode; 91 78 /** The addresses to bind to. Empty string means any. */ 92 79 char szBindAddr[256]; … … 314 301 int rc; 315 302 316 LogFunc(("enm Mode=%#x\n", pThis->enmMode));317 318 if (pThis->enm Mode == ATSTCPMODE_SERVER)303 LogFunc(("enmConnMode=%#x\n", pThis->enmConnMode)); 304 305 if (pThis->enmConnMode == ATSCONNMODE_SERVER) 319 306 { 320 307 pClient->fFromServer = true; … … 322 309 LogFunc(("RTTcpServerListen2 -> %Rrc\n", rc)); 323 310 } 324 else if (pThis->enm Mode == ATSTCPMODE_CLIENT)311 else if (pThis->enmConnMode == ATSCONNMODE_CLIENT) 325 312 { 326 313 pClient->fFromServer = false; … … 339 326 else 340 327 { 341 Assert(pThis->enm Mode == ATSTCPMODE_BOTH);328 Assert(pThis->enmConnMode == ATSCONNMODE_BOTH); 342 329 343 330 /* … … 731 718 int rc = VINF_SUCCESS; 732 719 733 if (pThis->enm Mode != ATSTCPMODE_CLIENT)720 if (pThis->enmConnMode != ATSCONNMODE_CLIENT) 734 721 { 735 722 rc = RTTcpServerCreateEx(pThis->szBindAddr[0] ? pThis->szBindAddr : NULL, pThis->uBindPort, &pThis->pTcpServer); … … 771 758 switch (ch) 772 759 { 773 case ATSTCPOPT_MODE: 774 if (!strcmp(pVal->psz, "both")) 775 pThis->enmMode = ATSTCPMODE_BOTH; 776 else if (!strcmp(pVal->psz, "client")) 777 pThis->enmMode = ATSTCPMODE_CLIENT; 778 else if (!strcmp(pVal->psz, "server")) 779 pThis->enmMode = ATSTCPMODE_SERVER; 780 else 781 return RTMsgErrorRc(VERR_INVALID_PARAMETER, "Invalid TCP mode: '%s'\n", pVal->psz); 760 case ATSTCPOPT_CONN_MODE: 761 pThis->enmConnMode = (ATSCONNMODE)pVal->u32; 782 762 return VINF_SUCCESS; 783 763 … … 818 798 { 819 799 RTStrmPrintf(pStream, 820 " --tcp- mode <both|client|server>\n"821 " Selects the mode of operation.\n"822 " Default: both\n"823 " --tcp-bind-addr ess<address>\n"800 " --tcp-conn-mode <0=both|1=client|2=server>\n" 801 " Selects the connection mode.\n" 802 " Default: 0 (both)\n" 803 " --tcp-bind-addr[ess] <address>\n" 824 804 " The address(es) to listen to TCP connection on. Empty string\n" 825 805 " means any address, this is the default.\n" … … 827 807 " The port to listen to TCP connections on.\n" 828 808 " Default: %u\n" 829 " --tcp-connect-addr ess<address>\n"809 " --tcp-connect-addr[ess] <address>\n" 830 810 " The address of the server to try connect to in client mode.\n" 831 811 " Default: " ATS_TCP_DEF_CONNECT_GUEST_STR "\n" … … 839 819 static const RTGETOPTDEF g_TcpOpts[] = 840 820 { 841 { "--tcp-mode", ATSTCPOPT_MODE, RTGETOPT_REQ_STRING }, 821 { "--tcp-conn-mode", ATSTCPOPT_CONN_MODE, RTGETOPT_REQ_STRING }, 822 { "--tcp-bind-addr", ATSTCPOPT_BIND_ADDRESS, RTGETOPT_REQ_STRING }, 842 823 { "--tcp-bind-address", ATSTCPOPT_BIND_ADDRESS, RTGETOPT_REQ_STRING }, 843 824 { "--tcp-bind-port", ATSTCPOPT_BIND_PORT, RTGETOPT_REQ_UINT16 }, 825 { "--tcp-connect-addr", ATSTCPOPT_CONNECT_ADDRESS, RTGETOPT_REQ_STRING }, 844 826 { "--tcp-connect-address", ATSTCPOPT_CONNECT_ADDRESS, RTGETOPT_REQ_STRING }, 845 827 { "--tcp-connect-port", ATSTCPOPT_CONNECT_PORT, RTGETOPT_REQ_UINT16 } -
trunk/src/VBox/Devices/Audio/DrvHostAudioValidationKit.cpp
r90765 r90912 1114 1114 RT_ZERO(Val); 1115 1115 1116 Val. psz = "server"; /** @ŧodo No client connection mode needed here (yet). Make this configurable via CFGM. */1117 rc2 = AudioTestSvcHandleOption(&pThis->Srv, ATSTCPOPT_ MODE, &Val);1116 Val.u32 = ATSCONNMODE_SERVER; /** @todo No client connection mode needed here (yet). Make this configurable via CFGM. */ 1117 rc2 = AudioTestSvcHandleOption(&pThis->Srv, ATSTCPOPT_CONN_MODE, &Val); 1118 1118 AssertRC(rc2); 1119 1119 -
trunk/src/VBox/Devices/Audio/testcase/tstAudioTestService.cpp
r90555 r90912 84 84 85 85 Val.psz = "server"; 86 rc = AudioTestSvcHandleOption(&Srv, ATSTCPOPT_ MODE, &Val);86 rc = AudioTestSvcHandleOption(&Srv, ATSTCPOPT_CONN_MODE, &Val); 87 87 RTTEST_CHECK_RC_OK(hTest, rc); 88 88 … … 118 118 119 119 Val.psz = "client"; 120 rc = AudioTestSvcClientHandleOption(&Client, ATSTCPOPT_ MODE, &Val);120 rc = AudioTestSvcClientHandleOption(&Client, ATSTCPOPT_CONN_MODE, &Val); 121 121 RTTEST_CHECK_RC_OK(hTest, rc); 122 122
Note:
See TracChangeset
for help on using the changeset viewer.