Changeset 28833 in vbox

Timestamp:

Apr 27, 2010 2:42:14 PM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Bugfixes.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxService/VBoxServiceControl.cpp (modified) (3 diffs)
• Additions/common/VBoxService/VBoxServiceControlExec.cpp (modified) (2 diffs)
• Main/GuestImpl.cpp (modified) (2 diffs)

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

@@ -147 +147 @@
                                            szUser, szPassword, uTimeLimitMS);
     }
+
+    VBoxServiceVerbose(4, "Control: VBoxServiceControlHandleCmdStartProcess returned with %Rrc\n", rc);
     return rc;
 }
@@ -188 +190 @@
             AssertPtr(pData);
 
-            uint32_t cbRead = _4K; /* Try reading 4k. */
-            uint8_t *pBuf = (uint8_t*)RTMemAlloc(cbRead);
+            uint32_t cbSize = _4K;
+            uint32_t cbRead = cbSize;
+            uint8_t *pBuf = (uint8_t*)RTMemAlloc(cbSize);
             if (pBuf)
             {
-                rc = VBoxServiceControlExecReadPipeBufferContent(&pData->stdOut, pBuf, cbRead, &cbRead);
+                rc = VBoxServiceControlExecReadPipeBufferContent(&pData->stdOut, pBuf, cbSize, &cbRead);
                 if (RT_SUCCESS(rc))
                 {
@@ -208 +211 @@
             rc = VERR_NOT_FOUND; /* PID not found! */
     }
+    VBoxServiceVerbose(4, "Control: VBoxServiceControlHandleCmdGetOutput returned with %Rrc\n", rc);
     return rc;
 }

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

@@ -264 +264 @@
      * and that it's now OK to send input to the process.
      */
-    VBoxServiceVerbose(3, "Control: Process started: PID=%u, CID=%u\n",
-                       pData->uPID, pThread->uContextID);
+    VBoxServiceVerbose(3, "Control: Process started: PID=%u, CID=%u, User=%s, PW=%s\n",
+                       pData->uPID, pThread->uContextID, pData->pszUser, pData->pszPassword);
     rc = VbglR3GuestCtrlExecReportStatus(pThread->uClientID, pThread->uContextID,
                                          pData->uPID, PROC_STS_STARTED, 0 /* u32Flags */,
@@ -545 +545 @@
     }
     else
+    {
         pbBuffer = NULL;
+        *pcbToRead = 0;
+    }
     return VINF_SUCCESS;
 }

trunk/src/VBox/Main/GuestImpl.cpp

@@ -582 +582 @@
         pCBData->u32Flags = pData->u32Flags;
 
-        /* Allocate data buffer and copy it */
-        if (pData->cbData && pData->pvData)
-        {
+        /* Make sure we really got something! */
+        if (   pData->cbData
+            && pData->pvData)
+        {
+            /* Allocate data buffer and copy it */
             pCBData->pvData = RTMemAlloc(pData->cbData);
             AssertReturn(pCBData->pvData, VERR_NO_MEMORY);
             memcpy(pCBData->pvData, pData->pvData, pData->cbData);
             pCBData->cbData = pData->cbData;
+        }
+        else
+        {
+            pCBData->pvData = NULL;
+            pCBData->cbData = 0;
         }
         ASMAtomicWriteBool(&it->bCalled, true);
@@ -1039 +1046 @@
                 } while (!it->bCalled);
     
-                AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    
-                /* Did we get some output? */
-                pData = (HOSTEXECOUTCALLBACKDATA*)it->pvData;
-                Assert(it->cbData == sizeof(HOSTEXECOUTCALLBACKDATA));
-                AssertPtr(pData);
-    
-                if (   it->bCalled
-                    && pData->cbData
-                    && pData->pvData)
+                if (it->bCalled)
                 {
-                    /* Do we need to resize the array? */
-                    if (pData->cbData > cbData)
-                        outputData.resize(pData->cbData);
-    
-                    /* Fill output in supplied out buffer. */
-                    memcpy(outputData.raw(), pData->pvData, pData->cbData);
-                    outputData.resize(pData->cbData); /* Shrink to fit actual buffer size. */
+                    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+        
+                    /* Did we get some output? */
+                    pData = (HOSTEXECOUTCALLBACKDATA*)it->pvData;
+                    Assert(it->cbData == sizeof(HOSTEXECOUTCALLBACKDATA));
+                    AssertPtr(pData);
+        
+                    if (pData->cbData)
+                    {
+                        /* Do we need to resize the array? */
+                        if (pData->cbData > cbData)
+                            outputData.resize(pData->cbData);
+        
+                        /* Fill output in supplied out buffer. */
+                        memcpy(outputData.raw(), pData->pvData, pData->cbData);
+                        outputData.resize(pData->cbData); /* Shrink to fit actual buffer size. */
+                    }
+                    else
+                        vrc = VERR_NO_DATA; /* This is not an error we want to report to COM. */
                 }
-                else
-                    vrc = VERR_NO_DATA; /* This is not an error we want to report to COM. */
+                else /* If callback not called within time ... well, that's a timeout! */
+                    vrc = VERR_TIMEOUT;
+
+                if (RT_FAILURE(vrc))
+                {
+                    if (vrc == VERR_NO_DATA)
+                    {
+                        /* This is not an error we want to report to COM. */
+                    }
+                    else if (vrc == VERR_TIMEOUT)
+                    {
+                        rc = setError(VBOX_E_IPRT_ERROR,
+                                      tr("The guest did not output within time (%ums)"), aTimeoutMS);
+                    }
+                    else
+                    {
+                        rc = setError(E_UNEXPECTED,
+                                      tr("The service call failed with error %Rrc"), vrc);
+                    }
+                }
             }
             else