diff options
| author | Felix Geyer <debfx-pkg@fobos.de> | 2011-07-29 17:55:18 +0200 |
|---|---|---|
| committer | Felix Geyer <debfx-pkg@fobos.de> | 2011-07-29 17:55:18 +0200 |
| commit | cba113ca2826bc4814be2f69a7704c865a37d4ea (patch) | |
| tree | 511123b10dd1e58e56958520534f5c50e6f570fc /src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp | |
| parent | 6a16f6900dd884e07125b51c9625f6be0a1f9b70 (diff) | |
| download | virtualbox-cba113ca2826bc4814be2f69a7704c865a37d4ea.tar.gz | |
Imported Upstream version 4.1.0-dfsgupstream/4.1.0-dfsg
Diffstat (limited to 'src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp')
| -rw-r--r-- | src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp b/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp index 7e2de25af..62ec75d69 100644 --- a/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp +++ b/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: HostNetworkInterfaceImpl.cpp $ */ +/* $Id: HostNetworkInterfaceImpl.cpp 37353 2011-06-07 14:35:02Z vboxsync $ */ /** @file * @@ -42,12 +42,13 @@ HostNetworkInterface::~HostNetworkInterface() HRESULT HostNetworkInterface::FinalConstruct() { - return S_OK; + return BaseFinalConstruct(); } void HostNetworkInterface::FinalRelease() { uninit (); + BaseFinalRelease(); } // public initializer/uninitializer for internal purposes only @@ -550,7 +551,6 @@ STDMETHODIMP HostNetworkInterface::DhcpRediscover () HRESULT HostNetworkInterface::setVirtualBox(VirtualBox *pVBox) { - HRESULT hrc; AutoCaller autoCaller(this); if (FAILED(autoCaller.rc())) return autoCaller.rc(); unconst(mVBox) = pVBox; @@ -560,7 +560,7 @@ HRESULT HostNetworkInterface::setVirtualBox(VirtualBox *pVBox) if (m.IPAddress == 0 && mIfType == HostNetworkInterfaceType_HostOnly) { Bstr tmpAddr, tmpMask; - hrc = mVBox->GetExtraData(BstrFmt("HostOnly/%ls/IPAddress", mInterfaceName.raw()).raw(), tmpAddr.asOutParam()); + HRESULT hrc = mVBox->GetExtraData(BstrFmt("HostOnly/%ls/IPAddress", mInterfaceName.raw()).raw(), tmpAddr.asOutParam()); hrc = mVBox->GetExtraData(BstrFmt("HostOnly/%ls/IPNetMask", mInterfaceName.raw()).raw(), tmpMask.asOutParam()); if (tmpAddr.isEmpty()) { @@ -572,7 +572,7 @@ HRESULT HostNetworkInterface::setVirtualBox(VirtualBox *pVBox) * change the address on host's interface as well and we want to * postpone the change until VM actually starts. */ - hrc = mVBox->SetExtraData(BstrFmt("HostOnly/%ls/IPAddress", + hrc = mVBox->SetExtraData(BstrFmt("HostOnly/%ls/IPAddress", mInterfaceName.raw()).raw(), tmpAddr.raw()); ComAssertComRCRet(hrc, hrc); @@ -581,7 +581,7 @@ HRESULT HostNetworkInterface::setVirtualBox(VirtualBox *pVBox) if (tmpMask.isEmpty()) { tmpMask = Bstr(VBOXNET_IPV4MASK_DEFAULT); - hrc = mVBox->SetExtraData(BstrFmt("HostOnly/%ls/IPNetMask", + hrc = mVBox->SetExtraData(BstrFmt("HostOnly/%ls/IPNetMask", mInterfaceName.raw()).raw(), Bstr(VBOXNET_IPV4MASK_DEFAULT).raw()); ComAssertComRCRet(hrc, hrc); @@ -593,7 +593,7 @@ HRESULT HostNetworkInterface::setVirtualBox(VirtualBox *pVBox) if (m.IPV6Address.isEmpty()) { Bstr tmpPrefixLen; - hrc = mVBox->GetExtraData(BstrFmt("HostOnly/%ls/IPV6Address", mInterfaceName.raw()).raw(), m.IPV6Address.asOutParam()); + HRESULT hrc = mVBox->GetExtraData(BstrFmt("HostOnly/%ls/IPV6Address", mInterfaceName.raw()).raw(), m.IPV6Address.asOutParam()); if (!m.IPV6Address.isEmpty()) { hrc = mVBox->GetExtraData(BstrFmt("HostOnly/%ls/IPV6PrefixLen", mInterfaceName.raw()).raw(), tmpPrefixLen.asOutParam()); |