Changeset 23998 in vbox for trunk/src

Timestamp:

Oct 22, 2009 6:34:15 PM (15 years ago)

Author:

vboxsync

Message:

VRDP port range API: user manual, frontends.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (4 diffs)
• Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (2 diffs)
• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (1 diff)
• Frontends/VirtualBox/ui/VBoxVMSettingsDisplay.ui (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (1 diff)

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

@@ -116 +116 @@
         refcnt = 0;
 #endif
+        mLastVRDPPort = -1;
     }
 
@@ -210 +211 @@
                 LONG port;
                 info->COMGETTER(Port)(&port);
-                if (port != 0)
-                    RTPrintf("Listening on port %d\n", port);
-                else
-                    RTPrintf("VRDP server failed to start\n");
+                if (port != mLastVRDPPort)
+                {
+                    if (port == -1)
+                        RTPrintf("VRDP server is inactive.\n");
+                    else if (port == 0)
+                        RTPrintf("VRDP server failed to start.\n");
+                    else
+                        RTPrintf("Listening on port %d.\n", port);
+
+                    mLastVRDPPort = port;
+                }
             }
         }
@@ -276 +284 @@
     long refcnt;
 #endif
+    long mLastVRDPPort;
 };
 
@@ -351 +360 @@
              "   -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"
+             "   -p, -vrdpport, --vrdpport <ports>     Comma-separated list of ports the VRDP\n"
+             "                                         server can bind to. Use a dash between\n"
+             "                                         two port numbers to specify a range\n"
              "   -a, -vrdpaddress, --vrdpaddress <ip>  Interface IP the VRDP will bind to \n"
 #endif

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -225 +225 @@
         {
             RTPrintf("                            [--vrdp on|off]\n"
-                     "                            [--vrdpport default|<port>]\n"
+                     "                            [--vrdpport default|<ports>]\n"
                      "                            [--vrdpaddress <host>]\n"
                      "                            [--vrdpauthtype null|external|guest]\n"
@@ -298 +298 @@
         if (fVRDP)
         {
-            RTPrintf("                            vrdp on|off] |\n");
-            RTPrintf("                            vrdpport default|<port>] |\n");
+            RTPrintf("                            vrdp on|off |\n");
+            RTPrintf("                            vrdpport default|<ports> |\n");
         }
         RTPrintf("                            setvideomodehint <xres> <yres> <bpp> [display] |\n"

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -665 +665 @@
 #endif
 #ifdef VBOX_WITH_VRDP
-             "  --vrdp <port>            Listen for VRDP connections on port (default if not specified)\n"
+             "  --vrdp <ports>           Listen for VRDP connections on one of specified ports (default if not specified)\n"
 #endif
              "  --discardstate           Discard saved state (if present) and revert to last snapshot (if present)\n"

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDisplay.ui

@@ -288 +288 @@
               <widget class="QLineEdit" name="mLeVRDPPort">
                <property name="whatsThis">
-                <string>Displays the VRDP Server port number. You may specify &lt;tt&gt;0&lt;/tt&gt; (zero) to reset the port to the default value.</string>
+                <string>The VRDP Server port number. You may specify &lt;tt&gt;0&lt;/tt&gt; (zero), which means port 3389, the standard port for RDP.</string>
                </property>
               </widget>

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -11948 +11948 @@
     <attribute name="ports" type="wstring">
       <desc>
-        VRDP server port numbers.
+        VRDP server port numbers. The server will try to bind to one of free ports from the list. 
         <note>
           This is a string of comma separated TCP port numbers or port number ranges.
-          The server will try to bind to one of ports from the list. Example
-          <tt>3000,3010-3012,3015</tt>
+          Example <tt>5000,5010-5012,5015</tt>
         </note>
       </desc>