Changeset 33386 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Oct 24, 2010 3:57:55 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

66973

Message:

VRDE: API changes for the VRDP server separation.

Location:

trunk/src/VBox/Main/xml

Files:

• Settings.cpp (modified) (8 diffs)
• VirtualBox-settings-common.xsd (modified) (3 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1229 +1229 @@
                         pelmGlobalChild->getAttributeValue("defaultMachineFolder", systemProperties.strDefaultMachineFolder);
                         pelmGlobalChild->getAttributeValue("defaultHardDiskFormat", systemProperties.strDefaultHardDiskFormat);
-                        pelmGlobalChild->getAttributeValue("remoteDisplayAuthLibrary", systemProperties.strRemoteDisplayAuthLibrary);
+                        if (!pelmGlobalChild->getAttributeValue("VRDEAuthLibrary", systemProperties.strVRDEAuthLibrary))
+                            // pre-1.11 used @remoteDisplayAuthLibrary instead
+                            pelmGlobalChild->getAttributeValue("remoteDisplayAuthLibrary", systemProperties.strVRDEAuthLibrary);
                         pelmGlobalChild->getAttributeValue("webServiceAuthLibrary", systemProperties.strWebServiceAuthLibrary);
+                        pelmGlobalChild->getAttributeValue("defaultVRDELibrary", systemProperties.strDefaultVRDELibrary);
                         pelmGlobalChild->getAttributeValue("LogHistoryCount", systemProperties.ulLogHistoryCount);
                     }
@@ -1335 +1338 @@
     if (systemProperties.strDefaultHardDiskFormat.length())
         pelmSysProps->setAttribute("defaultHardDiskFormat", systemProperties.strDefaultHardDiskFormat);
-    if (systemProperties.strRemoteDisplayAuthLibrary.length())
-        pelmSysProps->setAttribute("remoteDisplayAuthLibrary", systemProperties.strRemoteDisplayAuthLibrary);
+    if (systemProperties.strVRDEAuthLibrary.length())
+        pelmSysProps->setAttribute("VRDEAuthLibrary", systemProperties.strVRDEAuthLibrary);
     if (systemProperties.strWebServiceAuthLibrary.length())
         pelmSysProps->setAttribute("webServiceAuthLibrary", systemProperties.strWebServiceAuthLibrary);
+    if (systemProperties.strDefaultVRDELibrary.length())
+        pelmSysProps->setAttribute("defaultVRDELibrary", systemProperties.strDefaultVRDELibrary);
     pelmSysProps->setAttribute("LogHistoryCount", systemProperties.ulLogHistoryCount);
 
@@ -1365 +1370 @@
  * machine settings have really changed and thus need to be written out to disk.
  */
-bool VRDPSettings::operator==(const VRDPSettings& v) const
+bool VRDESettings::operator==(const VRDESettings& v) const
 {
     return (    (this == &v)
@@ -1595 +1600 @@
                   && (keyboardHidType           == h.keyboardHidType)
                   && (chipsetType               == h.chipsetType)
-                  && (vrdpSettings              == h.vrdpSettings)
+                  && (vrdeSettings              == h.vrdeSettings)
                   && (biosSettings              == h.biosSettings)
                   && (usbController             == h.usbController)
@@ -2426 +2431 @@
         else if (pelmHwChild->nameEquals("RemoteDisplay"))
         {
-            pelmHwChild->getAttributeValue("enabled", hw.vrdpSettings.fEnabled);
-            pelmHwChild->getAttributeValue("port", hw.vrdpSettings.strPort);
-            pelmHwChild->getAttributeValue("netAddress", hw.vrdpSettings.strNetAddress);
+            pelmHwChild->getAttributeValue("enabled", hw.vrdeSettings.fEnabled);
+            pelmHwChild->getAttributeValue("port", hw.vrdeSettings.strPort);
+            pelmHwChild->getAttributeValue("netAddress", hw.vrdeSettings.strNetAddress);
 
             Utf8Str strAuthType;
@@ -2436 +2441 @@
                 strAuthType.toUpper();
                 if (strAuthType == "NULL")
-                    hw.vrdpSettings.authType = VRDPAuthType_Null;
+                    hw.vrdeSettings.authType = AuthType_Null;
                 else if (strAuthType == "GUEST")
-                    hw.vrdpSettings.authType = VRDPAuthType_Guest;
+                    hw.vrdeSettings.authType = AuthType_Guest;
                 else if (strAuthType == "EXTERNAL")
-                    hw.vrdpSettings.authType = VRDPAuthType_External;
+                    hw.vrdeSettings.authType = AuthType_External;
                 else
                     throw ConfigFileError(this, pelmHwChild, N_("Invalid value '%s' in RemoteDisplay/@authType attribute"), strAuthType.c_str());
             }
 
-            pelmHwChild->getAttributeValue("authTimeout", hw.vrdpSettings.ulAuthTimeout);
-            pelmHwChild->getAttributeValue("allowMultiConnection", hw.vrdpSettings.fAllowMultiConnection);
-            pelmHwChild->getAttributeValue("reuseSingleConnection", hw.vrdpSettings.fReuseSingleConnection);
+            pelmHwChild->getAttributeValue("authTimeout", hw.vrdeSettings.ulAuthTimeout);
+            pelmHwChild->getAttributeValue("allowMultiConnection", hw.vrdeSettings.fAllowMultiConnection);
+            pelmHwChild->getAttributeValue("reuseSingleConnection", hw.vrdeSettings.fReuseSingleConnection);
 
             const xml::ElementNode *pelmVideoChannel;
             if ((pelmVideoChannel = pelmHwChild->findChildElement("VideoChannel")))
             {
-                pelmVideoChannel->getAttributeValue("enabled", hw.vrdpSettings.fVideoChannel);
-                pelmVideoChannel->getAttributeValue("quality", hw.vrdpSettings.ulVideoChannelQuality);
-                hw.vrdpSettings.ulVideoChannelQuality = RT_CLAMP(hw.vrdpSettings.ulVideoChannelQuality, 10, 100);
+                pelmVideoChannel->getAttributeValue("enabled", hw.vrdeSettings.fVideoChannel);
+                pelmVideoChannel->getAttributeValue("quality", hw.vrdeSettings.ulVideoChannelQuality);
+                hw.vrdeSettings.ulVideoChannelQuality = RT_CLAMP(hw.vrdeSettings.ulVideoChannelQuality, 10, 100);
             }
         }
@@ -3341 +3346 @@
         pelmDisplay->setAttribute("accelerate2DVideo", hw.fAccelerate2DVideo);
 
-    xml::ElementNode *pelmVRDP = pelmHardware->createChild("RemoteDisplay");
-    pelmVRDP->setAttribute("enabled", hw.vrdpSettings.fEnabled);
-    Utf8Str strPort = hw.vrdpSettings.strPort;
+    xml::ElementNode *pelmVRDE = pelmHardware->createChild("RemoteDisplay");
+    pelmVRDE->setAttribute("enabled", hw.vrdeSettings.fEnabled);
+    Utf8Str strPort = hw.vrdeSettings.strPort;
     if (!strPort.length())
         strPort = "3389";
-    pelmVRDP->setAttribute("port", strPort);
-    if (hw.vrdpSettings.strNetAddress.length())
-        pelmVRDP->setAttribute("netAddress", hw.vrdpSettings.strNetAddress);
+    pelmVRDE->setAttribute("port", strPort);
+    if (hw.vrdeSettings.strNetAddress.length())
+        pelmVRDE->setAttribute("netAddress", hw.vrdeSettings.strNetAddress);
     const char *pcszAuthType;
-    switch (hw.vrdpSettings.authType)
-    {
-        case VRDPAuthType_Guest:    pcszAuthType = "Guest";    break;
-        case VRDPAuthType_External: pcszAuthType = "External"; break;
-        default: /*case VRDPAuthType_Null:*/ pcszAuthType = "Null"; break;
-    }
-    pelmVRDP->setAttribute("authType", pcszAuthType);
-
-    if (hw.vrdpSettings.ulAuthTimeout != 0)
-        pelmVRDP->setAttribute("authTimeout", hw.vrdpSettings.ulAuthTimeout);
-    if (hw.vrdpSettings.fAllowMultiConnection)
-        pelmVRDP->setAttribute("allowMultiConnection", hw.vrdpSettings.fAllowMultiConnection);
-    if (hw.vrdpSettings.fReuseSingleConnection)
-        pelmVRDP->setAttribute("reuseSingleConnection", hw.vrdpSettings.fReuseSingleConnection);
+    switch (hw.vrdeSettings.authType)
+    {
+        case AuthType_Guest:    pcszAuthType = "Guest";    break;
+        case AuthType_External: pcszAuthType = "External"; break;
+        default: /*case AuthType_Null:*/ pcszAuthType = "Null"; break;
+    }
+    pelmVRDE->setAttribute("authType", pcszAuthType);
+
+    if (hw.vrdeSettings.ulAuthTimeout != 0)
+        pelmVRDE->setAttribute("authTimeout", hw.vrdeSettings.ulAuthTimeout);
+    if (hw.vrdeSettings.fAllowMultiConnection)
+        pelmVRDE->setAttribute("allowMultiConnection", hw.vrdeSettings.fAllowMultiConnection);
+    if (hw.vrdeSettings.fReuseSingleConnection)
+        pelmVRDE->setAttribute("reuseSingleConnection", hw.vrdeSettings.fReuseSingleConnection);
 
     if (m->sv >= SettingsVersion_v1_10)
     {
-        xml::ElementNode *pelmVideoChannel = pelmVRDP->createChild("VideoChannel");
-        pelmVideoChannel->setAttribute("enabled", hw.vrdpSettings.fVideoChannel);
-        pelmVideoChannel->setAttribute("quality", hw.vrdpSettings.ulVideoChannelQuality);
+        xml::ElementNode *pelmVideoChannel = pelmVRDE->createChild("VideoChannel");
+        pelmVideoChannel->setAttribute("enabled", hw.vrdeSettings.fVideoChannel);
+        pelmVideoChannel->setAttribute("quality", hw.vrdeSettings.ulVideoChannelQuality);
     }
 
@@ -4317 +4322 @@
         if (   (hardwareMachine.ioSettings.fIoCacheEnabled != true)
             || (hardwareMachine.ioSettings.ulIoCacheSize != 5)
-                // and VRDP video channel
-            || (hardwareMachine.vrdpSettings.fVideoChannel)
+                // and remote desktop video redirection channel
+            || (hardwareMachine.vrdeSettings.fVideoChannel)
                 // and page fusion
             || (hardwareMachine.fPageFusionEnabled)

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

@@ -208 +208 @@
 
 
-<xsd:simpleType name="TVRDPAuthType">
+<xsd:simpleType name="TAuthType">
   <xsd:restriction base="xsd:string">
     <xsd:enumeration value="Null"/>
@@ -356 +356 @@
   <xsd:attribute name="defaultHardDiskFolder" type="TLocalFile"/>
   <xsd:attribute name="defaultHardDiskFormat" type="TNonEmptyString"/>
-  <xsd:attribute name="remoteDisplayAuthLibrary" type="TLocalFile"/>
+  <xsd:attribute name="VRDEAuthLibrary" type="TLocalFile"/>
   <xsd:attribute name="webServiceAuthLibrary" type="TLocalFile"/>
+  <xsd:attribute name="defaultVRDELibrary" type="TLocalFile"/>
   <xsd:attribute name="HWVirtExEnabled" type="xsd:boolean"/>
   <xsd:attribute name="LogHistoryCount" type="xsd:unsignedInt" default="3"/>
@@ -542 +543 @@
   <xsd:attribute name="port" type="xsd:token" default="0"/>
   <xsd:attribute name="netAddress" type="xsd:token" default=""/>
-  <xsd:attribute name="authType" type="TVRDPAuthType" default="Null"/>
+  <xsd:attribute name="authType" type="TAuthType" default="Null"/>
   <xsd:attribute name="authTimeout" type="xsd:unsignedInt" default="5000"/>
   <xsd:attribute name="allowMultiConnection" type="xsd:boolean" default="false"/>