Changeset 2519 in vbox for trunk/src/VBox

Timestamp:

May 7, 2007 6:35:01 AM (18 years ago)

Author:

vboxsync

Message:

added API for VRDP multi connection

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManage.cpp (modified) (5 diffs)
• Main/idl/VirtualBox.xidl (modified) (3 diffs)
• Main/include/VRDPServerImpl.h (modified) (3 diffs)

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

@@ -344 +344 @@
                      "                            [-vrdpport default|<port>]\n"
                      "                            [-vrdpaddress <host>]\n"
-                     "                            [-vrdpauthtype null|external|guest]\n");
+                     "                            [-vrdpauthtype null|external|guest]\n"
+                     "                            [-vrdpmulticon on|off]\n");
         }
         RTPrintf("                            [-usb on|off]\n"
@@ -2705 +2706 @@
     char *vrdpaddress = NULL;
     char *vrdpauthtype = NULL;
+    char *vrdpmulticon = NULL;
 #endif
     int   fUsbEnabled = -1;
@@ -3122 +3124 @@
             i++;
             vrdpauthtype = argv[i];
+        }
+        else if (strcmp(argv[i], "-vrdpmulticon") == 0)
+        {
+            if (argc <= i + 1)
+            {
+                return errorArgument("Missing argument to '%s'", argv[i]);
+            }
+            i++;
+            vrdpmulticon = argv[i];
         }
 #endif /* VBOX_VRDP */
@@ -3866 +3877 @@
             break;
 #ifdef VBOX_VRDP
-        if (vrdp || (vrdpport != UINT16_MAX) || vrdpaddress || vrdpauthtype)
+        if (vrdp || (vrdpport != UINT16_MAX) || vrdpaddress || vrdpauthtype || vrdpmulticon)
         {
             ComPtr<IVRDPServer> vrdpServer;
@@ -3915 +3926 @@
                     {
                         errorArgument("Invalid -vrdpauthtype argument '%s'", vrdpauthtype);
+                        rc = E_FAIL;
+                        break;
+                    }
+                }
+                if (vrdpmulticon)
+                {
+                    if (strcmp(vrdpmulticon, "on") == 0)
+                    {
+                        CHECK_ERROR(vrdpServer, COMSETTER(AllowMultiConnection)(true));
+                    }
+                    else if (strcmp(vrdpmulticon, "off") == 0)
+                    {
+                        CHECK_ERROR(vrdpServer, COMSETTER(AllowMultiConnection)(false));
+                    }
+                    else
+                    {
+                        errorArgument("Invalid -vrdpmulticon argument '%s'", vrdpmulticon);
                         rc = E_FAIL;
                         break;

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

@@ -7 +7 @@
  *
  *   -  out/<platform>/bin/sdk/idl/VirtualBox[_XPCOM].idl, a
- *      pseudo-IDL file that represents the interfaces in IDL;
+ *      COM/XPCOM interface definition file (IDL)
  *
  *   -  out/<platform>/bin/sdk/include/VirtualBox[_XPCOM].h, which
@@ -7182 +7182 @@
     <interface
         name="IVRDPServer" extends="$unknown"
-        uuid="2e88bf9e-2085-421f-9aa2-32088b0378b3"
+        uuid="ed9d31ae-867f-45fc-b727-6740084d1883"
         wsmap="struct"
     >
@@ -7203 +7203 @@
         <attribute name="authTimeout" type="unsigned long">
             <desc>Timeout for guest authentication. Milliseconds.</desc>
+        </attribute>
+
+        <attribute name="allowMultiConnection" type="boolean">
+            <desc>
+                Flag whether multiple simultaneous connections to the VM are permitted.
+                Note that this will be replaced by a more powerful mechanism in the future.
+            </desc>
         </attribute>
 

trunk/src/VBox/Main/include/VRDPServerImpl.h

@@ -47 +47 @@
                     mVRDPAddress == that.mVRDPAddress &&
                     mAuthType == that.mAuthType &&
-                    mAuthTimeout == that.mAuthTimeout);
+                    mAuthTimeout == that.mAuthTimeout &&
+                    mAllowMultiConnection == that.mAllowMultiConnection);
         }
 
@@ -55 +56 @@
         VRDPAuthType_T mAuthType;
         ULONG mAuthTimeout;
+        BOOL mAllowMultiConnection;
     };
 
@@ -88 +90 @@
     STDMETHOD(COMGETTER(AuthTimeout))(ULONG *timeout);
     STDMETHOD(COMSETTER(AuthTimeout))(ULONG timeout);
+    STDMETHOD(COMGETTER(AllowMultiConnection))(BOOL *enabled);
+    STDMETHOD(COMSETTER(AllowMultiConnection))(BOOL enable);
 
     // IVRDPServer methods