Changeset 17710 in vbox

Timestamp:

Mar 11, 2009 4:46:55 PM (16 years ago)

Author:

vboxsync

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

44222

Message:

NetIf/win fixes

Location:

trunk/src/VBox/Main

Files:

• HostNetworkInterfaceImpl.cpp (modified) (4 diffs)
• include/HostNetworkInterfaceImpl.h (modified) (1 diff)
• include/netif.h (modified) (1 diff)
• os2/NetIfList-os2.cpp (modified) (1 diff)
• win/NetIfList-win.cpp (modified) (6 diffs)

trunk/src/VBox/Main/HostNetworkInterfaceImpl.cpp

@@ -359 +359 @@
     CheckComRCReturnRC (autoCaller.rc());
 
-    int rc = NetIfEnableStaticIpConfig(this, aIPAddress, aNetworkMask);
+    int rc = NetIfEnableStaticIpConfig(mVBox, this, aIPAddress, aNetworkMask);
     if (RT_FAILURE(rc))
     {
@@ -382 +382 @@
     CheckComRCReturnRC (autoCaller.rc());
 
-    int rc = NetIfEnableStaticIpConfigV6(this, aIPV6Address, aIPV6MaskPrefixLength);
+    int rc = NetIfEnableStaticIpConfigV6(mVBox, this, aIPV6Address, aIPV6MaskPrefixLength);
     if (RT_FAILURE(rc))
     {
@@ -400 +400 @@
     CheckComRCReturnRC (autoCaller.rc());
 
-    int rc = NetIfEnableDynamicIpConfig(this);
+    int rc = NetIfEnableDynamicIpConfig(mVBox, this);
     if (RT_FAILURE(rc))
     {
@@ -419 +419 @@
 }
 
-HRESULT HostNetworkInterface::getVirtualBox(VirtualBox **ppVBox)
-{
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    if (!ppVBox)
-        return E_INVALIDARG;
-
-    *ppVBox = mVBox;
-    return S_OK;
-}
-
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

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

@@ -89 +89 @@
 
     HRESULT setVirtualBox(VirtualBox *pVBox);
-    HRESULT getVirtualBox(VirtualBox **ppVBox);
 private:
     const Bstr mInterfaceName;

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

@@ -77 +77 @@
 
 int NetIfList(std::list <ComObjPtr <HostNetworkInterface> > &list);
-int NetIfEnableStaticIpConfig(HostNetworkInterface * pIf, ULONG ip, ULONG mask);
-int NetIfEnableStaticIpConfigV6(HostNetworkInterface * pIf, IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength);
-int NetIfEnableDynamicIpConfig(HostNetworkInterface * pIf);
+int NetIfEnableStaticIpConfig(VirtualBox *pVbox, HostNetworkInterface * pIf, ULONG ip, ULONG mask);
+int NetIfEnableStaticIpConfigV6(VirtualBox *pVbox, HostNetworkInterface * pIf, IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength);
+int NetIfEnableDynamicIpConfig(VirtualBox *pVbox, HostNetworkInterface * pIf);
 int NetIfCreateHostOnlyNetworkInterface (VirtualBox *pVbox, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress);
 int NetIfRemoveHostOnlyNetworkInterface (VirtualBox *pVbox, IN_GUID aId, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress);

trunk/src/VBox/Main/os2/NetIfList-os2.cpp

@@ -38 +38 @@
 }
 
-int NetIfEnableStaticIpConfig(HostNetworkInterface * pIf, ULONG ip, ULONG mask)
+int NetIfEnableStaticIpConfig(VirtualBox *pVbox, HostNetworkInterface * pIf, ULONG ip, ULONG mask)
 {
     return VERR_NOT_IMPLEMENTED;
 }
 
-int NetIfEnableStaticIpConfigV6(HostNetworkInterface * pIf, IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength)
+int NetIfEnableStaticIpConfigV6(VirtualBox *pVbox, HostNetworkInterface * pIf, IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength)
 {
     return VERR_NOT_IMPLEMENTED;
 }
 
-int NetIfEnableDynamicIpConfig(HostNetworkInterface * pIf)
+int NetIfEnableDynamicIpConfig(VirtualBox *pVbox, HostNetworkInterface * pIf)
 {
     return VERR_NOT_IMPLEMENTED;

trunk/src/VBox/Main/win/NetIfList-win.cpp

@@ -2274 +2274 @@
 }
 
-int NetIfEnableStaticIpConfig(HostNetworkInterface * pIf, ULONG ip, ULONG mask)
+int NetIfEnableStaticIpConfig(VirtualBox *vBox, HostNetworkInterface * pIf, ULONG ip, ULONG mask)
 {
     HRESULT rc;
@@ -2281 +2281 @@
     if(SUCCEEDED(rc))
     {
-        ComPtr<VirtualBox> vBox;
-        rc = pIf->getVirtualBox (vBox.asOutParam());
-        if(SUCCEEDED(rc))
+//        ComPtr<VirtualBox> vBox;
+//        rc = pIf->getVirtualBox (vBox.asOutParam());
+//        if(SUCCEEDED(rc))
         {
             /* create a progress object */
@@ -2332 +2332 @@
 }
 
-int NetIfEnableStaticIpConfigV6(HostNetworkInterface * pIf, IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength)
+int NetIfEnableStaticIpConfigV6(VirtualBox *vBox, HostNetworkInterface * pIf, IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength)
 {
     HRESULT rc;
@@ -2339 +2339 @@
     if(SUCCEEDED(rc))
     {
-        ComPtr<VirtualBox> vBox;
-        rc = pIf->getVirtualBox (vBox.asOutParam());
-        if(SUCCEEDED(rc))
+//        ComPtr<VirtualBox> vBox;
+//        rc = pIf->getVirtualBox (vBox.asOutParam());
+//        if(SUCCEEDED(rc))
         {
             /* create a progress object */
@@ -2390 +2390 @@
 }
 
-int NetIfEnableDynamicIpConfig(HostNetworkInterface * pIf)
+int NetIfEnableDynamicIpConfig(VirtualBox *vBox, HostNetworkInterface * pIf)
 {
     HRESULT rc;
@@ -2397 +2397 @@
     if(SUCCEEDED(rc))
     {
-        ComPtr<VirtualBox> vBox;
-        rc = pIf->getVirtualBox (vBox.asOutParam());
-        if(SUCCEEDED(rc))
+//        ComPtr<VirtualBox> vBox;
+//        rc = pIf->getVirtualBox (vBox.asOutParam());
+//        if(SUCCEEDED(rc))
         {
             /* create a progress object */