Changeset 75805 in vbox

Timestamp:

Nov 29, 2018 5:39:47 AM (6 years ago)

Author:

vboxsync

Message:

VBoxGuestCtrlSvc: Some fixes to the new code. bugref:9313

File:

• trunk/src/VBox/HostServices/GuestControl/service.cpp (modified) (8 diffs)

trunk/src/VBox/HostServices/GuestControl/service.cpp

@@ -1101 +1101 @@
         RTListForEachSafe(&pThis->m_PreparedSessions, pCur, pNext, GstCtrlPreparedSession, ListEntry)
         {
+            RTListNodeRemove(&pCur->ListEntry);
             RTMemFree(pCur);
         }
@@ -1206 +1207 @@
         m_fLegacyMode    = false;
         rClientState.m_fIsMaster = true;
+        Log(("[Client %RU32] is master.\n", idClient));
     }
     else
@@ -1470 +1472 @@
     if (!rClientState.mHostCmdList.empty())
     {
-        int rc = mpHelpers->pfnCallComplete(hCall, VERR_NOT_FOUND);
+        int rc = mpHelpers->pfnCallComplete(hCall, VINF_SUCCESS);
         if (RT_SUCCESS(rc))
         {
@@ -1567 +1569 @@
      * Try complete the command.
      */
-    int rc = mpHelpers->pfnCallComplete(hCall, VERR_NOT_FOUND);
+    int rc = mpHelpers->pfnCallComplete(hCall, VINF_SUCCESS);
     if (RT_SUCCESS(rc))
         LogFlow(("Prepared %u with a %#x byte key (%u pending).\n", idSession, cbKey, m_cPreparedSessions));
@@ -1618 +1620 @@
         RTListForEachSafe(&m_PreparedSessions, pCur, pNext, GstCtrlPreparedSession, ListEntry)
         {
+            RTListNodeRemove(&pCur->ListEntry);
             RTMemFree(pCur);
             rc = VINF_SUCCESS;
@@ -1630 +1633 @@
             if (pCur->idSession == idSession)
             {
+                RTListNodeRemove(&pCur->ListEntry);
                 RTMemFree(pCur);
                 m_cPreparedSessions -= 1;
@@ -1696 +1700 @@
                  * We've got a match. Try complete the request and
                  */
-                int rc = mpHelpers->pfnCallComplete(hCall, VERR_NOT_FOUND);
+                int rc = mpHelpers->pfnCallComplete(hCall, VINF_SUCCESS);
                 if (RT_SUCCESS(rc))
                 {
                     rClientState.m_idSession = idSession;
 
+                    RTListNodeRemove(&pCur->ListEntry);
                     RTMemFree(pCur);
                     m_cPreparedSessions -= 1;
+                    Log(("[Client %RU32] accepted session id %u.\n", idClient, idSession));
                 }
                 else
@@ -2018 +2024 @@
 {
     LogFlowFunc(("[Client %RU32] idFunction=%RU32 (%s), cParms=%RU32, paParms=0x%p\n",
-                 idClient, idFunction, GstCtrlHostFnName((eHostFn)idFunction), cParms, paParms));
+                 idClient, idFunction, GstCtrlGuestFnName((eGuestFn)idFunction), cParms, paParms));
     RT_NOREF(tsArrival, pvClient);