Changeset 31742 in vbox

Timestamp:

Aug 18, 2010 7:52:22 AM (15 years ago)

Author:

vboxsync

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

64919

Message:

FT password

Location:

trunk

Files:

• include/VBox/settings.h (modified) (2 diffs)
• src/VBox/Main/ConsoleImpl.cpp (modified) (1 diff)
• src/VBox/Main/MachineImpl.cpp (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/MachineImpl.h (modified) (1 diff)
• src/VBox/Main/xml/Settings.cpp (modified) (2 diffs)

trunk/include/VBox/settings.h

@@ -879 +879 @@
                && (uFaultToleranceInterval    == c.uFaultToleranceInterval)
                && (strFaultToleranceAddress   == c.strFaultToleranceAddress)
+               && (strFaultTolerancePassword  == c.strFaultTolerancePassword)
                && (fRTCUseUTC                 == c.fRTCUseUTC);
     }
@@ -894 +895 @@
     uint32_t                uFaultTolerancePort;
     com::Utf8Str            strFaultToleranceAddress;
+    com::Utf8Str            strFaultTolerancePassword;
     uint32_t                uFaultToleranceInterval;
     bool                    fRTCUseUTC;

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -7476 +7476 @@
                         Utf8Str strAddress(bstrAddress);
                         const char *pszAddress = strAddress.isEmpty() ? NULL : strAddress.c_str();
+
+                        /** @todo set progress cancel callback! */
 
                         /* Power on the FT enabled VM. */

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2661 +2661 @@
 }
 
+STDMETHODIMP Machine::COMGETTER(FaultTolerancePassword)(BSTR *aPassword)
+{
+    CheckComArgOutPointerValid(aPassword);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    mUserData->s.strFaultTolerancePassword.cloneTo(aPassword);
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(FaultTolerancePassword)(IN_BSTR aPassword)
+{
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    /* @todo deal with running state change. */
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    if (FAILED(rc)) return rc;
+
+    setModified(IsModified_MachineData);
+    mUserData.backup();
+    mUserData->s.strFaultTolerancePassword = aPassword;
+
+    return S_OK;
+}
+
 STDMETHODIMP Machine::COMGETTER(FaultToleranceSyncInterval)(ULONG *aInterval)
 {

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

@@ -3421 +3421 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="7315c8f6-5010-4e2a-9242-c84ead390d55"
+     uuid="70ddc295-39fb-46e2-a93b-854e123b2b97"
      wsmap="managed"
      >
@@ -3973 +3973 @@
     </attribute>
 
+    <attribute name="faultTolerancePassword" type="wstring">
+      <desc>
+        The password the to check for on the standby VM.  This is just a
+        very basic measure to prevent simple hacks and operators accidentally
+        choosing the wrong standby VM.
+      </desc>
+    </attribute>
+      
     <attribute name="faultToleranceSyncInterval" type="unsigned long">
       <desc>

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

@@ -438 +438 @@
     STDMETHOD(COMGETTER(FaultTolerancePort))(ULONG *aPort);
     STDMETHOD(COMSETTER(FaultTolerancePort))(ULONG aPort);
+    STDMETHOD(COMGETTER(FaultTolerancePassword))(BSTR *aPassword);
+    STDMETHOD(COMSETTER(FaultTolerancePassword))(IN_BSTR aPassword);
     STDMETHOD(COMGETTER(FaultToleranceSyncInterval))(ULONG *aInterval);
     STDMETHOD(COMSETTER(FaultToleranceSyncInterval))(ULONG aInterval);

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

@@ -3124 +3124 @@
                 pelmMachineChild->getAttributeValue("address", machineUserData.strFaultToleranceAddress);
                 pelmMachineChild->getAttributeValue("interval", machineUserData.uFaultToleranceInterval);
+                pelmMachineChild->getAttributeValue("password", machineUserData.strFaultTolerancePassword);
             }
             else if (pelmMachineChild->nameEquals("MediaRegistry"))
@@ -4053 +4054 @@
         pelmFaultTolerance->setAttribute("address", machineUserData.strFaultToleranceAddress);
         pelmFaultTolerance->setAttribute("interval", machineUserData.uFaultToleranceInterval);
+        pelmFaultTolerance->setAttribute("password", machineUserData.strFaultTolerancePassword);
     }