儲存庫 vbox 的更動 12126

時間撮記:

2008-9-5 下午12:28:36 (16 年 以前)

作者:

vboxsync

訊息:

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

位置:

trunk/src/VBox

檔案:

• Frontends/VBoxManage/VBoxManage.cpp (修改) (8 筆差異)
• Main/ConsoleImpl.cpp (修改) (3 筆差異)
• Main/idl/VirtualBox.xidl (修改) (2 筆差異)
• Main/include/ConsoleImpl.h (修改) (1 筆差異)
• Main/include/ConsoleVRDPServer.h (修改) (1 筆差異)
• Main/include/VRDPServerImpl.h (修改) (3 筆差異)
• Main/xml/VirtualBox-settings-common.xsd (修改) (1 筆差異)

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

@@ -425 +425 @@
                      "                            [-vrdpaddress <host>]\n"
                      "                            [-vrdpauthtype null|external|guest]\n"
-                     "                            [-vrdpmulticon on|off]\n");
+                     "                            [-vrdpmulticon on|off]\n"
+                     "                            [-vrdpreusecon on|off]\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";
-                RTPrintf("VRDP:            enabled (Address %lS, Port %d, MultiConn: %s, Authentication type: %s)\n", address.raw(), port, fMultiCon ? "on" : "off", strAuthType);
+                RTPrintf("VRDP:            enabled (Address %lS, Port %d, MultiConn: %s, ReuseSingleConn: %s, Authentication type: %s)\n", address.raw(), port, fMultiCon ? "on" : "off", fReuseCon ? "on" : "off", strAuthType);
             }
         }
@@ -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
-        if (vrdp || (vrdpport != UINT16_MAX) || vrdpaddress || vrdpauthtype || vrdpmulticon)
+        if (vrdp || (vrdpport != UINT16_MAX) || vrdpaddress || vrdpauthtype || vrdpmulticon || 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();
 
-    if (result == VRDPAuthAccessGranted)
-    {
-        LogRel(("VRDPAUTH: Access granted.\n"));
-        return VINF_SUCCESS;
-    }
-
-    /* Reject. */
-    LogRel(("VRDPAUTH: Access denied.\n"));
-    return VERR_ACCESS_DENIED;
+    if (result != VRDPAuthAccessGranted)
+    {
+        /* Reject. */
+        LogRel(("VRDPAUTH: Access denied.\n"));
+        return VERR_ACCESS_DENIED;
+    }
+
+    LogRel(("VRDPAUTH: Access granted.\n"));
+
+    /* Multiconnection check must be made after authentication, so bad clients would not interfere with a good one. */
+    BOOL allowMultiConnection = FALSE;
+    hrc = mVRDPServer->COMGETTER(AllowMultiConnection) (&allowMultiConnection);
+    AssertComRCReturn (hrc, VERR_ACCESS_DENIED);
+    
+    BOOL reuseSingleConnection = FALSE;
+    hrc = mVRDPServer->COMGETTER(ReuseSingleConnection) (&reuseSingleConnection);
+    AssertComRCReturn (hrc, VERR_ACCESS_DENIED);
+
+    LogFlowFunc(("allowMultiConnection %d, reuseSingleConnection = %d, mcVRDPClients = %d, mu32SingleRDPClientId = %d\n", allowMultiConnection, reuseSingleConnection, mcVRDPClients, mu32SingleRDPClientId));
+
+    if (allowMultiConnection == FALSE)
+    {
+        /* Note: the 'mcVRDPClients' 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)
+        {
+            Assert(mcVRDPClients == 1);
+            /* There is a client already.
+             * If required drop the existing client connection and let the connecting one in.
+             */
+            if (reuseSingleConnection)
+            {
+                LogRel(("VRDPAUTH: Multiple connections are not enabled. Disconnecting existing client.\n"));
+                mConsoleVRDPServer->DisconnectClient (mu32SingleRDPClientId, false);
+            }
+            else
+            {
+                /* Reject. */
+                LogRel(("VRDPAUTH: Multiple connections are not enabled. Access denied.\n"));
+                return VERR_ACCESS_DENIED;
+            }
+        }
+
+        /* Save the connected client id. From now on it will be necessary to disconnect this one. */
+        mu32SingleRDPClientId = u32ClientId;
+    }
+
+    return VINF_SUCCESS;
 }
 

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

@@ -9680 +9680 @@
   <interface
      name="IVRDPServer" extends="$unknown"
-     uuid="ed9d31ae-867f-45fc-b727-6740084d1883"
+     uuid="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 &&
-                    mAllowMultiConnection == that.mAllowMultiConnection);
+                    mAllowMultiConnection == that.mAllowMultiConnection &&
+                    mReuseSingleConnection == that.mReuseSingleConnection);
         }
 
@@ -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>