Changeset 69782 in vbox

Timestamp:

Nov 20, 2017 6:53:29 PM (7 years ago)

Author:

vboxsync

Message:

VBoxSDS: Plan B it is.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (5 diffs)
• include/VirtualBoxSDSImpl.h (modified) (6 diffs)

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

@@ -24374 +24374 @@
 <if target="midl">
 
-  <!-- VBOX_SDS_PLAN_B start -->
   <!--
   // IVBoxSVC
@@ -24400 +24399 @@
 
   </interface>
-  <!-- VBOX_SDS_PLAN_B end -->
 
   <!--
@@ -24407 +24405 @@
   -->
 
+  <!-- This is now an internal interface, it doesn't need to be dual either. -->
   <interface
     name="IVirtualBoxSDS" extends="$unknown"
-    uuid="28932695-fb72-4708-8904-e1077dac7f9a"
+    uuid="787d20ed-faf3-4170-6697-3a2a7de6e086"
     wsmap="suppress"
-    reservedMethods="4" reservedAttributes="8"
+    reservedMethods="0" reservedAttributes="0"
     >
       <desc>
@@ -24422 +24421 @@
       </desc>
 
-      <method name="getVirtualBox" >
-       <param name="result" type="IVirtualBox" dir="out" >
-        <desc>
-          Reference to the server-side API root object.
-        </desc>
-      </param>
-      <param name="token" type="IToken" dir="out">
-        <desc>
-          Reference to the token object given to client and linked with IVirtualBox.
-          Client should keep it till the end.
-        </desc>
-      </param>
-      </method>
-
-      <!-- VBOX_SDS_PLAN_B start -->
       <method name="registerVBoxSVC">
         <desc>Registers a VBoxSVC instance with the SDS.</desc>
@@ -24461 +24445 @@
         </param>
       </method>
-      <!-- VBOX_SDS_PLAN_B end -->
 
   </interface>

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

@@ -26 +26 @@
 #endif
 
- /**
- * The MediumLockToken class automates cleanup of a Medium lock.
- */
-class ATL_NO_VTABLE VirtualBoxToken :
-    public TokenWrap
-{
-public:
 
-    DECLARE_EMPTY_CTOR_DTOR(VirtualBoxToken)
-
-    HRESULT FinalConstruct();
-    void FinalRelease();
-
-    // public initializer/uninitializer for internal purposes only
-    HRESULT init(const std::wstring& wstrUserName);
-    void uninit();
-
-    /**
-    * Fabrique method to create and initialize COM token object.
-    *
-    * @param aToken         Pointer to result Token COM object.
-    * @param wstrUserName   User name of client for that we create the token
-    */
-    static HRESULT CreateToken(ComPtr<IToken>& aToken, const std::wstring& wstrUserName);
-
-    // Trace COM reference counting in debug mode
-#ifdef RT_STRICT
-    virtual ULONG InternalAddRef();
-    virtual ULONG InternalRelease();
-#endif
-
-private:
-
-    // wrapped IToken methods
-    HRESULT abandon(AutoCaller &aAutoCaller);
-    HRESULT dummy();
-
-    // data
-    struct Data
-    {
-        std::wstring wstrUserName;
-    };
-
-    Data m;
-};
-
-#ifdef VBOX_WITH_SDS_PLAN_B
 /**
  * Per user data.
@@ -112 +66 @@
     }
 };
-#endif
 
 
@@ -121 +74 @@
 #endif
 {
-#ifdef VBOX_WITH_SDS_PLAN_B
 private:
     typedef std::map<com::Utf8Str, VBoxSDSPerUserData *> UserDataMap_T;
@@ -128 +80 @@
     /** Lock protecting m_UserDataMap.*/
     RTCRITSECTRW        m_MapCritSect;
-#endif
 
 public:
@@ -153 +104 @@
 private:
 
-    // Wrapped IVirtualBoxSDS properties
-
-    /**
-    *    Returns the instance of VirtualBox for client.
-    *    It impersonates client and returns his VirtualBox instance
-    *    either from cahce or makes new one.
-    */
-    HRESULT getVirtualBox(ComPtr<IVirtualBox> &aVirtualBox, ComPtr<IToken> &aToken);
-
-    /* SDS plan B interfaces: */
+    // Wrapped IVirtualBoxSDS methods
     HRESULT registerVBoxSVC(const ComPtr<IVBoxSVCRegistration> &aVBoxSVC, LONG aPid, ComPtr<IUnknown> &aExistingVirtualBox);
     HRESULT deregisterVBoxSVC(const ComPtr<IVBoxSVCRegistration> &aVBoxSVC, LONG aPid);
 
-    // Wrapped IVirtualBoxSDS methods
 
     // Private methods
 
     /**
-     * Gets the cliedt user SID of the
+     * Gets the client user SID of the
      */
-    static bool i_getClientUserSID(com::Utf8Str *a_pStrSid, com::Utf8Str *a_pStrUsername);
+    static bool i_getClientUserSid(com::Utf8Str *a_pStrSid, com::Utf8Str *a_pStrUsername);
 
-#ifdef VBOX_WITH_SDS_PLAN_B
     /**
      * Looks up the given user.
@@ -192 +132 @@
      */
     VBoxSDSPerUserData *i_lookupOrCreatePerUserData(com::Utf8Str const &a_rStrUserSid, com::Utf8Str const &a_rStrUsername);
-
-#else
-    /**
-    *  Gets the current user name of current thread
-    */
-    int GetCurrentUserName(std::wstring& wstrUserName);
-
-    /**
-    *  Prints current user name of this thread to the log
-    *  @param prefix    string fragment that will be inserted at the beginning
-    *                   of the logging line
-    */
-    void LogUserName(char *prefix);
-
-    /**
-     * Thread that periodically checks items in cache and cleans obsolete items
-     */
-    static DWORD WINAPI CheckCacheThread(LPVOID);
-
-    // data fields
-    class VirtualBoxCache;
-    static VirtualBoxCache m_cache;
-    friend VirtualBoxToken;
-#endif
 };