Changeset 12126

Timestamp:

09/05/08 14:28:36 (3 months ago)

Author:

vboxsync

Message:

Drop existing RDP connection and allow the new client to connect, configurable, default off.

Files:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (8 diffs)
• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (3 diffs)
• trunk/src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• trunk/src/VBox/Main/include/ConsoleImpl.h (modified) (1 diff)
• trunk/src/VBox/Main/include/ConsoleVRDPServer.h (modified) (1 diff)
• trunk/src/VBox/Main/include/VRDPServerImpl.h (modified) (3 diffs)
• trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd (modified) (1 diff)

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

@@ -425 +425 @@
-                     "                            [-vrdpaddress <host>]\n"
-                     "                            [-vrdpauthtype null|external|guest]\n"
-
+
+
-        }
-        RTPrintf("                            [-usb on|off]\n"
@@ -1648 +1649 @@
-            BOOL fMultiCon;
-            vrdpServer->COMGETTER(AllowMultiConnection)(&fMultiCon);
+            BOOL fReuseCon;
+            vrdpServer->COMGETTER(ReuseSingleConnection)(&fReuseCon);
-            VRDPAuthType_T vrdpAuthType;
-            const char *strAuthType;
@@ -1673 +1676 @@
-                RTPrintf("vrdpauthtype=\"%s\"\n", strAuthType);
-                RTPrintf("vrdpmulticon=\"%s\"\n", fMultiCon ? "on" : "off");
+                RTPrintf("vrdpreusecon=\"%s\"\n", fReuseCon ? "on" : "off");
-            }
-            else
@@ -1678 +1682 @@
-                if (address.isEmpty())
-                    address = "0.0.0.0";
-Authentication type: %s)\n", address.raw(), port, fMulti
+ReuseSingleConn: %s, Authentication type: %s)\n", address.raw(), port, fMultiCon ? "on" : "off", fReuse
-            }
-        }
@@ -3794 +3798 @@
-    char *vrdpauthtype = NULL;
-    char *vrdpmulticon = NULL;
+    char *vrdpreusecon = NULL;
-#endif
-    int   fUsbEnabled = -1;
@@ -4246 +4251 @@
-            i++;
-            vrdpmulticon = argv[i];
+        }
+        else if (strcmp(argv[i], "-vrdpreusecon") == 0)
+        {
+            if (argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", argv[i]);
+            i++;
+            vrdpreusecon = argv[i];
-        }
-#endif /* VBOX_WITH_VRDP */
@@ -5334 +5346 @@
-
-#ifdef VBOX_WITH_VRDP
-
+ || vrdpreusecon
-        {
-            ComPtr<IVRDPServer> vrdpServer;
@@ -5400 +5412 @@
-                    {
-                        errorArgument("Invalid -vrdpmulticon argument '%s'", vrdpmulticon);
+                        rc = E_FAIL;
+                        break;
+                    }
+                }
+                if (vrdpreusecon)
+                {
+                    if (strcmp(vrdpreusecon, "on") == 0)
+                    {
+                        CHECK_ERROR(vrdpServer, COMSETTER(ReuseSingleConnection)(true));
+                    }
+                    else if (strcmp(vrdpreusecon, "off") == 0)
+                    {
+                        CHECK_ERROR(vrdpServer, COMSETTER(ReuseSingleConnection)(false));
+                    }
+                    else
+                    {
+                        errorArgument("Invalid -vrdpreusecon argument '%s'", vrdpreusecon);
-                        rc = E_FAIL;
-                        break;

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -332 +332 @@
-    mcAudioRefs = 0;
-    mcVRDPClients = 0;
+    mu32SingleRDPClientId = 0;
-
-    unconst (mVMMDev) = new VMMDev(this);
@@ -512 +513 @@
-                    )
-            ));
-
-    /* Multiconnection check. */
-    BOOL allowMultiConnection = FALSE;
-    hrc = mVRDPServer->COMGETTER(AllowMultiConnection) (&allowMultiConnection);
-    AssertComRCReturn (hrc, VERR_ACCESS_DENIED);
-
-    LogFlowFunc(("allowMultiConnection %d, mcVRDPClients = %d\n", allowMultiConnection, mcVRDPClients));
-
-    if (allowMultiConnection == FALSE)
-    {
-        /* Note: the variable is incremented in ClientConnect callback, which is called when the client
-         * is successfully connected, that is after the ClientLogon callback. Therefore the mcVRDPClients
-         * value is 0 for first client.
-         */
-        if (mcVRDPClients > 0)
-        {
-            /* Reject. */
-            LogRel(("VRDPAUTH: Multiple connections are not enabled. Access denied.\n"));
-            return VERR_ACCESS_DENIED;
-        }
-    }
-
-    switch (authType)
@@ -627 +607 @@
-    LogFlowFuncLeave();
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

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

@@ -9680 +9680 @@
-  <interface
-     name="IVRDPServer" extends="$unknown"
-ed9d31ae-867f-45fc-b727-6740084d1883
+f4584ae7-6bce-474b-83d6-17d235e6aa89
-     wsmap="managed"
-     >
@@ -9716 +9716 @@
-        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>
+
+    <attribute name="reuseSingleConnection" type="boolean">
+      <desc>
+        Flag whether the existing connection must be dropped and a new connection
+        must be established by the VRDP server, when a new client connects in single
+        connection mode.
-      </desc>
-    </attribute>

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

@@ -472 +472 @@
-    int mcAudioRefs;
-    volatile uint32_t mcVRDPClients;
+    uint32_t mu32SingleRDPClientId; /* The id of a connected client in the single connection mode. */
-
-    static const char *sSSMConsoleUnit;

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

@@ -98 +98 @@
-
-    void EnableConnections (void);
+    void DisconnectClient (uint32_t u32ClientId, bool fReconnect);
-    void MousePointerUpdate (const VRDPCOLORPOINTER *pPointer);
-    void MousePointerHide (void);

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

@@ -49 +49 @@
-                    mAuthType == that.mAuthType &&
-                    mAuthTimeout == that.mAuthTimeout &&
-
+
+
-        }
-
@@ -58 +59 @@
-        ULONG mAuthTimeout;
-        BOOL mAllowMultiConnection;
+        BOOL mReuseSingleConnection;
-    };
-
@@ -97 +99 @@
-    STDMETHOD(COMGETTER(AllowMultiConnection)) (BOOL *aAllowMultiConnection);
-    STDMETHOD(COMSETTER(AllowMultiConnection)) (BOOL aAllowMultiConnection);
+    STDMETHOD(COMGETTER(ReuseSingleConnection)) (BOOL *aReuseSingleConnection);
+    STDMETHOD(COMSETTER(ReuseSingleConnection)) (BOOL aReuseSingleConnection);
-
-    // IVRDPServer methods

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -472 +472 @@
-  <xsd:attribute name="authTimeout" type="xsd:unsignedInt" default="5000"/>
-  <xsd:attribute name="allowMultiConnection" type="xsd:boolean" default="false"/>
+  <xsd:attribute name="reuseSingleConnection" type="xsd:boolean" default="false"/>
-</xsd:complexType>
-