Changeset 11442 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

Aug 15, 2008 1:21:42 PM (16 years ago)

Author:

vboxsync

Message:

VBoxHeadless: added -vrdp on|off|config setting to allow to disable the RDP server or to enable it only if enabled in the .xml config

File:

• trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -339 +339 @@
              "   -s, -startvm, --startvm <name|uuid>   Start given VM (required argument)\n"
 #ifdef VBOX_WITH_VRDP
+             "   -v, -vrdp, --vrdp on|off|config       Enable (default) or disable the VRDP\n"
+             "                                         server or don't change the setting\n"
              "   -p, -vrdpport, --vrdpport <port>      Port number the VRDP server will bind\n"
              "                                         to\n"
@@ -409 +411 @@
     ULONG vrdpPort = ~0U;
     const char *vrdpAddress = NULL;
+    const char *vrdpEnabled = NULL;
 #endif
     unsigned fRawR0 = ~0U;
@@ -455 +458 @@
         OPT_CSAM,
         OPT_NO_CSAM,
-        OPT_COMMENT
+        OPT_COMMENT,
     };
 
@@ -467 +470 @@
         { "-vrdpaddress", 'a', RTGETOPT_REQ_STRING },
         { "--vrdpaddress", 'a', RTGETOPT_REQ_STRING },
+        { "-vrdp", 'v', RTGETOPT_REQ_STRING },
+        { "--vrdp", 'v', RTGETOPT_REQ_STRING },
 #endif /* VBOX_WITH_VRDP defined */
         { "-rawr0", OPT_RAW_R0, 0 },
@@ -522 +527 @@
                 vrdpAddress = ValueUnion.psz;
                 break;
+            case 'v':
+                vrdpEnabled = ValueUnion.psz;
+                break;
 #endif /* VBOX_WITH_VRDP defined */
             case OPT_RAW_R0:
@@ -809 +817 @@
 
 #ifdef VBOX_WITH_VRDP
-        Log (("VBoxHeadless: Enabling VRDP server...\n"));
-
+        /* default is to enable the RDP server (backward compatibility) */
+        BOOL fVRDPEnable = true;
+        BOOL fVRDPEnabled;
         ComPtr <IVRDPServer> vrdpServer;
         CHECK_ERROR_BREAK(machine, COMGETTER (VRDPServer) (vrdpServer.asOutParam()));
-
-        /* set VRDP port if requested by the user */
-        if (vrdpPort != ~0U)
-            CHECK_ERROR_BREAK(vrdpServer, COMSETTER(Port)(vrdpPort));
+        CHECK_ERROR_BREAK(vrdpServer, COMGETTER(Enabled) (&fVRDPEnabled));
+
+        if (vrdpEnabled != NULL)
+        {
+            /* -vrdp on|off|config */
+            if (!strcmp(vrdpEnabled, "off") || !strcmp(vrdpEnabled, "disable"))
+                fVRDPEnable = false;
+            else if (!strcmp(vrdpEnabled, "config"))
+            {
+                if (!fVRDPEnabled)
+                    fVRDPEnable = false;
+            }
+            else if (strcmp(vrdpEnabled, "on") && strcmp(vrdpEnabled, "enable"))
+            {
+                RTPrintf("-vrdp requires an argument (on|off|config)\n");
+                break;
+            }
+        }
+
+        if (fVRDPEnable)
+        {
+            Log (("VBoxHeadless: Enabling VRDP server...\n"));
+
+            /* set VRDP port if requested by the user */
+            if (vrdpPort != ~0U)
+                CHECK_ERROR_BREAK(vrdpServer, COMSETTER(Port)(vrdpPort));
+            else
+                CHECK_ERROR_BREAK(vrdpServer, COMGETTER(Port)(&vrdpPort));
+            /* set VRDP address if requested by the user */
+            if (vrdpAddress != NULL)
+            {
+                CHECK_ERROR_BREAK(vrdpServer, COMSETTER(NetAddress)(Bstr(vrdpAddress)));
+            }
+            /* enable VRDP server (only if currently disabled) */
+            if (!fVRDPEnabled)
+            {
+                CHECK_ERROR_BREAK(vrdpServer, COMSETTER(Enabled) (TRUE));
+            }
+        }
         else
-            CHECK_ERROR_BREAK(vrdpServer, COMGETTER(Port)(&vrdpPort));
-        /* set VRDP address if requested by the user */
-        if (vrdpAddress != NULL)
-            CHECK_ERROR_BREAK(vrdpServer, COMSETTER(NetAddress)(Bstr(vrdpAddress)));
-
-        /* enable VRDP server (only if currently disabled) */
-        BOOL fVRDPEnabled;
-        CHECK_ERROR_BREAK(vrdpServer, COMGETTER(Enabled) (&fVRDPEnabled));
-        if (!fVRDPEnabled)
-        {
-            CHECK_ERROR_BREAK(vrdpServer, COMSETTER(Enabled) (TRUE));
+        {
+            /* disable VRDP server (only if currently enabled */
+            if (fVRDPEnabled)
+            {
+                CHECK_ERROR_BREAK(vrdpServer, COMSETTER(Enabled) (FALSE));
+            }
         }
 #endif
         Log (("VBoxHeadless: Powering up the machine...\n"));
 #ifdef VBOX_WITH_VRDP
-        RTPrintf("Listening on port %d\n", !vrdpPort ? VRDP_DEFAULT_PORT : vrdpPort);
+        if (fVRDPEnable)
+            RTPrintf("Listening on port %d\n", !vrdpPort ? VRDP_DEFAULT_PORT : vrdpPort);
 #endif