Changeset 71405 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 20, 2018 2:20:36 PM (7 years ago)

Author:

vboxsync

Message:

Guest Control/VBoxService: Cleaned up / shortened VGSvcGstCtrlSessionHandler().

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (13 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -995 +995 @@
     bool const fImpersonated = RT_BOOL(pSession->fFlags & (  VBOXSERVICECTRLSESSION_FLAG_SPAWN
                                                            | VBOXSERVICECTRLSESSION_FLAG_ANONYMOUS));
-    int rc;
+    int rc = VERR_NOT_SUPPORTED; /* Play safe by default. */
+
     switch (uMsg)
     {
@@ -1007 +1008 @@
             if (fImpersonated)
                 rc = vgsvcGstCtrlSessionHandleDirRemove(pSession, pHostCtx);
-            else
-                rc = VERR_NOT_SUPPORTED;
             break;
 
@@ -1034 +1033 @@
             if (fImpersonated)
                 rc = vgsvcGstCtrlSessionHandleFileOpen(pSession, pHostCtx);
-            else
-                rc = VERR_NOT_SUPPORTED;
             break;
 
@@ -1041 +1038 @@
             if (fImpersonated)
                 rc = vgsvcGstCtrlSessionHandleFileClose(pSession, pHostCtx);
-            else
-                rc = VERR_NOT_SUPPORTED;
             break;
 
@@ -1048 +1043 @@
             if (fImpersonated)
                 rc = vgsvcGstCtrlSessionHandleFileRead(pSession, pHostCtx, pvScratchBuf, cbScratchBuf);
-            else
-                rc = VERR_NOT_SUPPORTED;
             break;
 
@@ -1055 +1048 @@
             if (fImpersonated)
                 rc = vgsvcGstCtrlSessionHandleFileReadAt(pSession, pHostCtx, pvScratchBuf, cbScratchBuf);
-            else
-                rc = VERR_NOT_SUPPORTED;
             break;
 
@@ -1062 +1053 @@
             if (fImpersonated)
                 rc = vgsvcGstCtrlSessionHandleFileWrite(pSession, pHostCtx, pvScratchBuf, cbScratchBuf);
-            else
-                rc = VERR_NOT_SUPPORTED;
             break;
 
@@ -1069 +1058 @@
             if (fImpersonated)
                 rc = vgsvcGstCtrlSessionHandleFileWriteAt(pSession, pHostCtx, pvScratchBuf, cbScratchBuf);
-            else
-                rc = VERR_NOT_SUPPORTED;
             break;
 
@@ -1076 +1063 @@
             if (fImpersonated)
                 rc = vgsvcGstCtrlSessionHandleFileSeek(pSession, pHostCtx);
-            else
-                rc = VERR_NOT_SUPPORTED;
             break;
 
@@ -1083 +1068 @@
             if (fImpersonated)
                 rc = vgsvcGstCtrlSessionHandleFileTell(pSession, pHostCtx);
-            else
-                rc = VERR_NOT_SUPPORTED;
             break;
 
@@ -1090 +1073 @@
             if (fImpersonated)
                 rc = vgsvcGstCtrlSessionHandlePathRename(pSession, pHostCtx);
-            else
-                rc = VERR_NOT_SUPPORTED;
             break;
 
@@ -1097 +1078 @@
             if (fImpersonated)
                 rc = vgsvcGstCtrlSessionHandlePathUserDocuments(pSession, pHostCtx);
-            else
-                rc = VERR_NOT_SUPPORTED;
             break;
 
@@ -1104 +1083 @@
             if (fImpersonated)
                 rc = vgsvcGstCtrlSessionHandlePathUserHome(pSession, pHostCtx);
-            else
-                rc = VERR_NOT_SUPPORTED;
             break;
 
-        default:
-            rc = VbglR3GuestCtrlMsgSkip(pHostCtx->uClientID);
-            VGSvcVerbose(3, "Unsupported message (uMsg=%RU32, cParms=%RU32) from host, skipping\n", uMsg, pHostCtx->uNumParms);
+        default: /* Not supported, see next code block. */
             break;
     }
+
+    if (rc == VERR_NOT_SUPPORTED)
+    {
+        VGSvcVerbose(3, "Unsupported message (uMsg=%RU32, cParms=%RU32) from host, skipping\n", uMsg, pHostCtx->uNumParms);
+
+        /* Tell the host service to skip the message. */
+        VbglR3GuestCtrlMsgSkip(pHostCtx->uClientID);
+
+        rc = VINF_SUCCESS;
+    }
+    /* Note: Other replies must be reported to the host service by the appropriate command handlers above. */
 
     if (RT_FAILURE(rc))