Changeset 91042 in vbox

Timestamp:

Aug 31, 2021 6:34:40 PM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: Got rid of the embedded (and probably wrong) failure reply struct and replaced it with ATSPKTREPFAIL so that clients also can interpret it more easily. ​bugref:10008

File:

• trunk/src/VBox/Devices/Audio/AudioTestServiceClient.cpp (modified) (2 diffs)

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

@@ -165 +165 @@
         else if (RTStrNCmp(Reply.szOp, "FAILED  ", ATSPKT_OPCODE_MAX_LEN) == 0)
         {
+            LogRelFunc(("Received error from server (cbPayload=%zu)\n", Reply.cbPayload));
+
             if (Reply.cbPayload)
             {
-                if (Reply.cbPayload == sizeof(ATSPKTREPFAIL))
+                if (   Reply.cbPayload >=  sizeof(int) /* At least the rc must be present. */
+                    && Reply.cbPayload <= sizeof(ATSPKTREPFAIL) - sizeof(ATSPKTHDR))
                 {
-                    PATSPKTREPFAIL pRep = (PATSPKTREPFAIL)Reply.pvPayload;
+                    rc = *(int *)Reply.pvPayload; /* Reach error code back to caller. */
+
+                    const char *pcszMsg = (char *)Reply.pvPayload + sizeof(int);
                     /** @todo Check NULL termination of pcszMsg? */
 
-                    LogRelFunc(("Received error: %s (%Rrc)\n", pRep->ach, pRep->rc));
-
-                    rc = pRep->rc; /* Reach error code back to caller. */
+                    LogRelFunc(("Error message: %s (%Rrc)\n", pcszMsg, rc));
                 }
                 else
@@ -192 +195 @@
     }
 
+    LogRelFlowFuncLeaveRC(rc);
     return rc;
 }