Changeset 27926 in vbox

Timestamp:

Apr 1, 2010 8:58:39 AM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Update (VBoxService).

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxServiceControl.cpp (modified) (3 diffs)
• VBoxServiceControlExec.cpp (added)
• VBoxServiceInternal.h (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

@@ -57 +57 @@
 ifdef VBOX_WITH_GUEST_CONTROL
  VBoxService_SOURCES    += \
-        VBoxServiceControl.cpp
+        VBoxServiceControl.cpp \
+        VBoxServiceControlExec.cpp
 endif
 ifdef VBOX_WITH_GUEST_PROPS

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

@@ -26 +26 @@
 *******************************************************************************/
 #include <iprt/assert.h>
-#include <iprt/ctype.h>
-#include <iprt/env.h>
-#include <iprt/file.h>
+#include <iprt/getopt.h>
 #include <iprt/mem.h>
-#include <iprt/path.h>
-#include <iprt/param.h>
-#include <iprt/process.h>
-#include <iprt/string.h>
 #include <iprt/semaphore.h>
 #include <iprt/thread.h>
-#include <VBox/version.h>
 #include <VBox/VBoxGuestLib.h>
 #include <VBox/HostServices/GuestControlSvc.h>
@@ -100 +93 @@
 }
 
-int VBoxServiceControlHandleCmdExec(uint32_t u32ClientId, uint32_t uNumParms)
+
+static int VBoxServiceControlHandleCmdExec(uint32_t u32ClientId, uint32_t uNumParms)
 {
     VBoxServiceVerbose(3, "VBoxServiceControlHandleCmdExec: Called uNumParms=%ld\n", uNumParms);
 
-    char szCmd[_1K];
-    uint32_t uFlags;
-    char szArgs[_1K];
-    uint32_t uNumArgs;
-    char szEnv[_64K];
-    uint32_t cbEnv = sizeof(szEnv);
-    uint32_t uNumEnvVars;
-    char szStdIn[_1K];
-    char szStdOut[_1K];
-    char szStdErr[_1K];
-    char szUser[128];
-    char szPassword[128];
-    uint32_t uTimeLimitMS;
+    VBOXSERVICECTRLPROCDATA execData;
+    execData.cbEnv = sizeof(execData.szEnv);
 
     int rc = VbglR3GuestCtrlGetHostCmdExec(u32ClientId, uNumParms,
-                                           szCmd, sizeof(szCmd),
-                                           &uFlags,
-                                           szArgs, sizeof(szArgs), &uNumArgs,
-                                           szEnv, &cbEnv, &uNumEnvVars,
-                                           szStdIn, sizeof(szStdIn),
-                                           szStdOut, sizeof(szStdOut),
-                                           szStdErr, sizeof(szStdErr),
-                                           szUser, sizeof(szUser),
-                                           szPassword, sizeof(szPassword),
-                                           &uTimeLimitMS);
-    return 0;
+                                           execData.szCmd, sizeof(execData.szCmd),
+                                           &execData.uFlags,
+                                           execData.szArgs, sizeof(execData.szArgs), &execData.uNumArgs,
+                                           execData.szEnv, &execData.cbEnv, &execData.uNumEnvVars,
+                                           execData.szStdIn, sizeof(execData.szStdIn),
+                                           execData.szStdOut, sizeof(execData.szStdOut),
+                                           execData.szStdErr, sizeof(execData.szStdErr),
+                                           execData.szUser, sizeof(execData.szUser),
+                                           execData.szPassword, sizeof(execData.szPassword),
+                                           &execData.uTimeLimitMS);
+    if (RT_SUCCESS(rc))
+    {
+        /* Adjust time limit value. */
+        execData.uTimeLimitMS = UINT32_MAX ? 
+            RT_INDEFINITE_WAIT : execData.uTimeLimitMS;
+
+        /* Prepare argument list. */
+        char **ppaArg;
+        int iArgs;
+        rc = RTGetOptArgvFromString(&ppaArg, &iArgs, execData.szArgs, NULL);
+        Assert(execData.uNumArgs == iArgs);
+        if (RT_SUCCESS(rc))
+        {
+            /* Prepare environment list. */
+            char **ppaEnv;
+            if (execData.uNumEnvVars)
+            {
+                ppaEnv = (char**)RTMemAlloc(execData.uNumEnvVars * sizeof(char*));
+                AssertPtr(ppaEnv);
+
+                char *pcCur = execData.szEnv;
+                uint32_t i = 0;
+                while (pcCur < execData.szEnv + execData.cbEnv)
+                {
+                    if (RTStrAPrintf(&ppaEnv[i++], "%s", pcCur) < 0)
+                    {
+                        rc = VERR_NO_MEMORY;
+                        break;
+                    }
+                    pcCur += strlen(pcCur) + 1; /* Skip terminating zero. */
+                }
+            }
+
+            if (RT_SUCCESS(rc))
+            {
+                /* Do the actual execution. */
+                rc = VBoxServiceControlExecProcess(&execData, ppaArg, ppaEnv);
+                for (uint32_t i = 0; i < execData.uNumEnvVars; i++)
+                    RTStrFree(ppaEnv[i]);
+                RTMemFree(ppaEnv);
+            }
+            RTGetOptArgvFree(ppaArg);
+        }
+    }
+    return rc;
 }
 
@@ -168 +195 @@
                     break;
             }
+            break; /* DEBUG BREAK */
         }
     

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -125 +125 @@
 #endif /* RT_OS_WINDOWS */
 
+#ifdef VBOX_WITH_GUEST_CONTROL
+/* Structure for holding process execution data. */
+typedef struct _VBoxServiceControlProcessData
+{
+    char szCmd[_1K];
+    uint32_t uFlags;
+    char szArgs[_1K];
+    uint32_t uNumArgs;
+    char szEnv[_64K];
+    uint32_t cbEnv;
+    uint32_t uNumEnvVars;
+    char szStdIn[_1K];
+    char szStdOut[_1K];
+    char szStdErr[_1K];
+    char szUser[128];
+    char szPassword[128];
+    uint32_t uTimeLimitMS;
+} VBOXSERVICECTRLPROCDATA;
+/** Pointer to execution data. */
+typedef VBOXSERVICECTRLPROCDATA *PVBOXSERVICECTRLPROCDATA;
+/**
+ * For buffering process input supplied by the client.
+ */
+typedef struct _VBoxServiceControlStdInBuf
+{
+    /** The mount of buffered data. */
+    size_t  cb;
+    /** The current data offset. */
+    size_t  off;
+    /** The data buffer. */
+    char   *pch;
+    /** The amount of allocated buffer space. */
+    size_t  cbAllocated;
+    /** Send further input into the bit bucket (stdin is dead). */
+    bool    fBitBucket;
+    /** The CRC-32 for standard input (received part). */
+    uint32_t uCrc32;
+} VBOXSERVICECTRLSTDINBUF;
+/** Pointer to a standard input buffer. */
+typedef VBOXSERVICECTRLSTDINBUF *PVBOXSERVICECTRLSTDINBUF;
+#endif
+
 RT_C_DECLS_BEGIN
 
@@ -167 +209 @@
 #endif /* RT_OS_WINDOWS */
 
+#ifdef VBOX_WITH_GUEST_CONTROL
+extern int  VBoxServiceControlExecProcess(PVBOXSERVICECTRLPROCDATA pExecData,
+                                          const char * const      *papszArgs,
+                                          const char * const      *papszEnv);
+#endif
+
 #ifdef VBOXSERVICE_MANAGEMENT
 extern uint32_t VBoxServiceBalloonQueryChunks(void);