Changeset 17494 in vbox for trunk/src/VBox/Main/include

Timestamp:

Mar 6, 2009 4:55:44 PM (16 years ago)

Author:

vboxsync

Message:

NetIf/win: moved Create/Remove hostonly if to NetIf API, some API fixes

Location:

trunk/src/VBox/Main/include

Files:

• HostImpl.h (modified) (3 diffs)
• HostNetworkInterfaceImpl.h (modified) (2 diffs)
• netif.h (modified) (1 diff)

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

@@ -33 +33 @@
 #endif
 #include "HostPower.h"
-
-#ifdef RT_OS_WINDOWS
-# include "win/svchlp.h"
-#endif
 
 #ifdef RT_OS_LINUX
@@ -133 +129 @@
 #endif /* !VBOX_WITH_USB */
 
-#ifdef RT_OS_WINDOWS
-    static int networkInterfaceHelperServer (SVCHlpClient *aClient,
-                                             SVCHlpMsg::Code aMsgCode);
-#endif
-
     // for VirtualBoxSupportErrorInfoImpl
     static const wchar_t *getComponentName() { return L"Host"; }
@@ -162 +153 @@
     }
 #endif /* VBOX_WITH_USB */
-
-#ifdef RT_OS_WINDOWS
-    static int createNetworkInterface (SVCHlpClient *aClient,
-                                       const Utf8Str &aName,
-                                       Guid &aGUID, Utf8Str &aErrMsg);
-    static int removeNetworkInterface (SVCHlpClient *aClient,
-                                       const Guid &aGUID,
-                                       Utf8Str &aErrMsg);
-    static HRESULT networkInterfaceHelperClient (SVCHlpClient *aClient,
-                                                 Progress *aProgress,
-                                                 void *aUser, int *aVrc);
-#endif
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API

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

@@ -63 +63 @@
 #ifdef VBOX_WITH_HOSTNETIF_API
     HRESULT init (Bstr aInterfaceName, HostNetworkInterfaceType_T ifType, struct NETIFINFO *pIfs);
-    HRESULT updateConfig (struct NETIFINFO *pIfs);
+    HRESULT updateConfig ();
 #endif
 
@@ -86 +86 @@
     static const wchar_t *getComponentName() { return L"HostNetworkInterface"; }
 
+    HRESULT setVirtualBox(VirtualBox *pVBox);
+    HRESULT getVirtualBox(VirtualBox **ppVBox);
 private:
     const Bstr mInterfaceName;
     const Guid mGuid;
     HostNetworkInterfaceType_T mIfType;
+
+    ComObjPtr <VirtualBox, ComWeakRef> mVBox;
 
     struct Data

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

@@ -80 +80 @@
 int NetIfEnableStaticIpConfigV6(HostNetworkInterface * pIf, IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength);
 int NetIfEnableDynamicIpConfig(HostNetworkInterface * pIf);
+int NetIfCreateHostOnlyNetworkInterface (VirtualBox *pVbox, IN_BSTR aName, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress);
+int NetIfRemoveHostOnlyNetworkInterface (VirtualBox *pVbox, IN_GUID aId, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress);
+int NetIfGetConfig(HostNetworkInterface * pIf, NETIFINFO *);
 
 DECLINLINE(Bstr) composeIPv6Address(PRTNETADDRIPV6 aAddrPtr)