Index: /trunk/src/VBox/Frontends/VBoxBFE/NetworkAdapterImpl.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxBFE/NetworkAdapterImpl.cpp (revision 17274) +++ /trunk/src/VBox/Frontends/VBoxBFE/NetworkAdapterImpl.cpp (revision 17275) @@ -306,5 +306,5 @@ } STDMETHODIMP -NetworkAdapter::AttachToHostInterface() +NetworkAdapter::AttachToBridgedNetwork() { AssertMsg(0,("Not implemented yet\n")); Index: /trunk/src/VBox/Frontends/VBoxBFE/NetworkAdapterImpl.h =================================================================== --- /trunk/src/VBox/Frontends/VBoxBFE/NetworkAdapterImpl.h (revision 17274) +++ /trunk/src/VBox/Frontends/VBoxBFE/NetworkAdapterImpl.h (revision 17275) @@ -107,5 +107,5 @@ // INetworkAdapter methods STDMETHOD(AttachToNAT)(); - STDMETHOD(AttachToHostInterface)(); + STDMETHOD(AttachToBridgedNetwork)(); STDMETHOD(AttachToInternalNetwork)(); STDMETHOD(Detach)(); Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (revision 17274) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (revision 17275) @@ -683,5 +683,5 @@ break; } - case NetworkAttachmentType_HostInterface: + case NetworkAttachmentType_Bridged: { Bstr strHostIfDev; Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp (revision 17274) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp (revision 17275) @@ -44,11 +44,11 @@ #ifdef VBOX_WITH_HOSTNETIF_API -static const char *getHostIfTypeText(HostNetworkInterfaceType_T enmType) +static const char *getHostIfTypeText(HostNetworkInterfaceMediumType_T enmType) { switch (enmType) { - case HostNetworkInterfaceType_Ethernet: return "Ethernet"; - case HostNetworkInterfaceType_PPP: return "PPP"; - case HostNetworkInterfaceType_SLIP: return "SLIP"; + case HostNetworkInterfaceMediumType_Ethernet: return "Ethernet"; + case HostNetworkInterfaceMediumType_PPP: return "PPP"; + case HostNetworkInterfaceMediumType_SLIP: return "SLIP"; } return "Unknown"; @@ -326,6 +326,6 @@ networkInterface->COMGETTER(HardwareAddress)(HardwareAddress.asOutParam()); RTPrintf("HardwareAddress: %lS\n", HardwareAddress.raw()); - HostNetworkInterfaceType_T Type; - networkInterface->COMGETTER(Type)(&Type); + HostNetworkInterfaceMediumType_T Type; + networkInterface->COMGETTER(MediumType)(&Type); RTPrintf("Type: %s\n", getHostIfTypeText(Type)); HostNetworkInterfaceStatus_T Status; Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 17274) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 17275) @@ -1384,5 +1384,5 @@ { CHECK_ERROR_RET(nic, COMSETTER(Enabled) (TRUE), 1); - CHECK_ERROR_RET(nic, AttachToHostInterface(), 1); + CHECK_ERROR_RET(nic, AttachToBridgedNetwork(), 1); } else if (strcmp(nics[n], "intnet") == 0) @@ -1391,9 +1391,9 @@ CHECK_ERROR_RET(nic, AttachToInternalNetwork(), 1); } -#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) +#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)) else if (strcmp(nics[n], "hostonly") == 0) { CHECK_ERROR_RET(nic, COMSETTER(Enabled) (TRUE), 1); - CHECK_ERROR_RET(nic, AttachToHostOnlyNetwork(), 1); + CHECK_ERROR_RET(nic, AttachToHostOnlyInterface(), 1); } #endif /* defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp (revision 17274) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp (revision 17275) @@ -2399,5 +2399,5 @@ * an additional symbolic network/interface name field, use * this name instead */ - if (type == KNetworkAttachmentType_HostInterface) + if (type == KNetworkAttachmentType_Bridged) attType = attType.arg (tr ("host interface, %1", "details report (network)").arg (adapter.GetHostInterface())); @@ -3418,6 +3418,6 @@ mNetworkAttachmentTypes [KNetworkAttachmentType_NAT] = tr ("NAT", "NetworkAttachmentType"); - mNetworkAttachmentTypes [KNetworkAttachmentType_HostInterface] = - tr ("Host Interface", "NetworkAttachmentType"); + mNetworkAttachmentTypes [KNetworkAttachmentType_Bridged] = + tr ("Bridged Interface", "NetworkAttachmentType"); mNetworkAttachmentTypes [KNetworkAttachmentType_Internal] = tr ("Internal Network", "NetworkAttachmentType"); Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsNetwork.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsNetwork.cpp (revision 17274) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsNetwork.cpp (revision 17275) @@ -130,6 +130,6 @@ mAdapter.AttachToNAT(); break; - case KNetworkAttachmentType_HostInterface: - mAdapter.AttachToHostInterface(); + case KNetworkAttachmentType_Bridged: + mAdapter.AttachToBridgedNetwork(); break; case KNetworkAttachmentType_Internal: @@ -148,5 +148,5 @@ mAdapter.SetCableConnected (mCbCable->isChecked()); - if (type == KNetworkAttachmentType_HostInterface + if (type == KNetworkAttachmentType_Bridged #if defined (Q_WS_WIN) && defined (VBOX_WITH_NETFLT) || type == KNetworkAttachmentType_HostOnly @@ -257,5 +257,5 @@ #if defined (Q_WS_X11) && !defined (VBOX_WITH_NETFLT) bool enableHostIf = vboxGlobal().toNetworkAttachmentType (aString) == - KNetworkAttachmentType_HostInterface; + KNetworkAttachmentType_Bridged; setTapEnabled (enableHostIf); #endif @@ -312,5 +312,5 @@ mCbNAType->itemText(1), Qt::ToolTipRole); mCbNAType->insertItem (2, - vboxGlobal().toString (KNetworkAttachmentType_HostInterface)); + vboxGlobal().toString (KNetworkAttachmentType_Bridged)); mCbNAType->setItemData (2, mCbNAType->itemText(2), Qt::ToolTipRole); @@ -555,5 +555,5 @@ CHost host = vboxGlobal().virtualBox().GetHost(); CHostNetworkInterface iFace; - CProgress progress = host.CreateHostNetworkInterface (iName, iFace); + CProgress progress = host.CreateHostOnlyNetworkInterface (iName, iFace); if (host.isOk()) { @@ -614,5 +614,5 @@ { /* Delete interface */ - CProgress progress = host.RemoveHostNetworkInterface (iFace.GetId(), iFace); + CProgress progress = host.RemoveHostOnlyNetworkInterface (iFace.GetId(), iFace); if (host.isOk()) { @@ -673,5 +673,6 @@ #if defined(Q_WS_WIN) && defined(VBOX_WITH_NETFLT) /* display real for not host-only and viceversa */ - if((enmAttachmentType == KNetworkAttachmentType_HostOnly) != it->GetReal()) + if((enmAttachmentType == KNetworkAttachmentType_HostOnly) + == (it->GetInterfaceType() == KHostNetworkInterfaceType_HostOnly)) #endif itemsList << new VBoxNIListItem (it->GetName()); @@ -807,5 +808,5 @@ #if defined (Q_WS_WIN) || defined (VBOX_WITH_NETFLT) - if ((type == KNetworkAttachmentType_HostInterface + if ((type == KNetworkAttachmentType_Bridged #if defined (Q_WS_WIN) && defined (VBOX_WITH_NETFLT) || type == KNetworkAttachmentType_HostOnly @@ -885,5 +886,5 @@ KNetworkAttachmentType enmType = vboxGlobal().toNetworkAttachmentType (page->mCbNAType->currentText()); - bool isHostInterfaceAttached = enmType == KNetworkAttachmentType_HostInterface; + bool isHostInterfaceAttached = enmType == KNetworkAttachmentType_Bridged; mNIList->setEnabled (isHostInterfaceAttached); Index: /trunk/src/VBox/Main/ConsoleImpl.cpp =================================================================== --- /trunk/src/VBox/Main/ConsoleImpl.cpp (revision 17274) +++ /trunk/src/VBox/Main/ConsoleImpl.cpp (revision 17275) @@ -4239,5 +4239,5 @@ switch (netattach) { - case NetworkAttachmentType_HostInterface: + case NetworkAttachmentType_Bridged: { #ifdef RT_OS_WINDOWS @@ -5657,5 +5657,5 @@ * @note The caller must lock this object for writing. */ -HRESULT Console::attachToHostInterface(INetworkAdapter *networkAdapter) +HRESULT Console::attachToBridgedInterface(INetworkAdapter *networkAdapter) { #if !defined(RT_OS_LINUX) || defined(VBOX_WITH_NETFLT) @@ -5679,5 +5679,5 @@ NetworkAttachmentType_T attachment; networkAdapter->COMGETTER(AttachmentType)(&attachment); - Assert(attachment == NetworkAttachmentType_HostInterface); + Assert(attachment == NetworkAttachmentType_Bridged); # endif /* VBOX_STRICT */ @@ -5735,5 +5735,5 @@ if (fcntl(maTapFD[slot], F_SETFL, O_NONBLOCK) != -1) { - Log(("attachToHostInterface: %RTfile %ls\n", maTapFD[slot], tapDeviceName.raw())); + Log(("attachToBridgedInterface: %RTfile %ls\n", maTapFD[slot], tapDeviceName.raw())); /* * Here is the right place to communicate the TAP file descriptor and @@ -5788,5 +5788,5 @@ * @note The caller must lock this object for writing. */ -HRESULT Console::detachFromHostInterface(INetworkAdapter *networkAdapter) +HRESULT Console::detachFromBridgedInterface(INetworkAdapter *networkAdapter) { #if !defined(RT_OS_LINUX) || defined(VBOX_WITH_NETFLT) @@ -5808,5 +5808,5 @@ NetworkAttachmentType_T attachment; networkAdapter->COMGETTER(AttachmentType)(&attachment); - Assert(attachment == NetworkAttachmentType_HostInterface); + Assert(attachment == NetworkAttachmentType_Bridged); # endif /* VBOX_STRICT */ @@ -5880,7 +5880,7 @@ NetworkAttachmentType_T attachment; networkAdapter->COMGETTER(AttachmentType)(&attachment); - if (attachment == NetworkAttachmentType_HostInterface) - { - HRESULT rc2 = detachFromHostInterface(networkAdapter); + if (attachment == NetworkAttachmentType_Bridged) + { + HRESULT rc2 = detachFromBridgedInterface(networkAdapter); if (FAILED(rc2) && SUCCEEDED(rc)) rc = rc2; Index: /trunk/src/VBox/Main/ConsoleImpl2.cpp =================================================================== --- /trunk/src/VBox/Main/ConsoleImpl2.cpp (revision 17274) +++ /trunk/src/VBox/Main/ConsoleImpl2.cpp (revision 17275) @@ -1292,10 +1292,10 @@ } - case NetworkAttachmentType_HostInterface: + case NetworkAttachmentType_Bridged: { /* * Perform the attachment if required (don't return on error!) */ - hrc = pConsole->attachToHostInterface(networkAdapter); + hrc = pConsole->attachToBridgedInterface(networkAdapter); if (SUCCEEDED(hrc)) { @@ -1333,5 +1333,5 @@ if(FAILED(hrc)) { - LogRel(("NetworkAttachmentType_HostInterface: COMGETTER(HostInterface) failed, hrc (0x%x)", hrc)); + LogRel(("NetworkAttachmentType_Bridged: COMGETTER(HostInterface) failed, hrc (0x%x)", hrc)); H(); } @@ -1382,5 +1382,5 @@ { AssertBreakpoint(); - LogRel(("NetworkAttachmentType_HostInterface: FindByName failed, rc (0x%x)", rc)); + LogRel(("NetworkAttachmentType_Bridged: FindByName failed, rc (0x%x)", rc)); return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS, N_("Inexistent host networking interface, name '%ls'"), @@ -1388,17 +1388,16 @@ } - BOOL real; - hrc = hostInterface->COMGETTER(Real)(&real); + HostNetworkInterfaceType_T ifType; + hrc = hostInterface->COMGETTER(InterfaceType)(&ifType); if(FAILED(hrc)) { - LogRel(("NetworkAttachmentType_HostOnly: COMGETTER(Real) failed, hrc (0x%x)", hrc)); + LogRel(("NetworkAttachmentType_Bridged: COMGETTER(InterfaceType) failed, hrc (0x%x)", hrc)); H(); } - if(!real) - { - LogRel(("NetworkAttachmentType_HostOnly: COMGETTER(Real) failed, hrc (0x%x)", hrc)); + if(ifType != HostNetworkInterfaceType_Bridged) + { return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS, - N_("Interface ('%ls') is a Host Adapter interface"), + N_("Interface ('%ls') is not a Bridged Adapter interface"), HifName.raw()); } @@ -1408,5 +1407,5 @@ if(FAILED(hrc)) { - LogRel(("NetworkAttachmentType_HostInterface: COMGETTER(Id) failed, hrc (0x%x)", hrc)); + LogRel(("NetworkAttachmentType_Bridged: COMGETTER(Id) failed, hrc (0x%x)", hrc)); H(); } @@ -1691,19 +1690,19 @@ } - BOOL real; - hrc = hostInterface->COMGETTER(Real)(&real); + HostNetworkInterfaceType_T ifType; + hrc = hostInterface->COMGETTER(InterfaceType)(&ifType); if(FAILED(hrc)) { - LogRel(("NetworkAttachmentType_HostOnly: COMGETTER(Real) failed, hrc (0x%x)", hrc)); + LogRel(("NetworkAttachmentType_HostOnly: COMGETTER(InterfaceType) failed, hrc (0x%x)", hrc)); H(); } - if(real) + if(ifType != HostNetworkInterfaceType_HostOnly) { - LogRel(("NetworkAttachmentType_HostOnly: COMGETTER(Real) failed, hrc (0x%x)", hrc)); return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS, - N_("Interface ('%ls') is not a Host Adapter interface"), + N_("Interface ('%ls') is not a Host-Only Adapter interface"), HifName.raw()); } + Guid hostIFGuid; Index: /trunk/src/VBox/Main/HostImpl.cpp =================================================================== --- /trunk/src/VBox/Main/HostImpl.cpp (revision 17274) +++ /trunk/src/VBox/Main/HostImpl.cpp (revision 17275) @@ -610,5 +610,5 @@ ComObjPtr IfObj; IfObj.createObject(); - if (SUCCEEDED(IfObj->init(Bstr(szNICDesc), Guid(Uuid), true))) + if (SUCCEEDED(IfObj->init(Bstr(szNICDesc), Guid(Uuid), HostNetworkInterfaceType_Bridged))) pList->push_back(IfObj); } @@ -725,5 +725,5 @@ iface.createObject(); /* remove the curly bracket at the end */ - if (SUCCEEDED (iface->init (name, Guid (IfGuid), true))) + if (SUCCEEDED (iface->init (name, Guid (IfGuid), HostNetworkInterfaceType_Bridged))) { pPist->push_back (iface); @@ -771,5 +771,5 @@ ComObjPtr IfObj; IfObj.createObject(); - if (SUCCEEDED(IfObj->init(Bstr(pEtherNICs->szName), Guid(pEtherNICs->Uuid), true))) + if (SUCCEEDED(IfObj->init(Bstr(pEtherNICs->szName), Guid(pEtherNICs->Uuid), HostNetworkInterfaceType_Bridged))) list.push_back(IfObj); @@ -926,5 +926,5 @@ /* remove the curly bracket at the end */ szNetworkGUID [strlen(szNetworkGUID) - 1] = '\0'; - if (SUCCEEDED (iface->init (name, Guid (szNetworkGUID + 1), true))) + if (SUCCEEDED (iface->init (name, Guid (szNetworkGUID + 1), HostNetworkInterfaceType_Bridged))) list.push_back (iface); } @@ -1052,5 +1052,5 @@ ComObjPtr IfObj; IfObj.createObject(); - if (SUCCEEDED(IfObj->init(Bstr(pReq->ifr_name), Guid(uuid), true))) + if (SUCCEEDED(IfObj->init(Bstr(pReq->ifr_name), Guid(uuid), HostNetworkInterfaceType_Bridged))) list.push_back(IfObj); } @@ -1359,13 +1359,13 @@ { SVCHlpMsg::Code msgCode; - /* for SVCHlpMsg::CreateHostNetworkInterface */ + /* for SVCHlpMsg::CreateHostOnlyNetworkInterface */ Bstr name; ComObjPtr iface; - /* for SVCHlpMsg::RemoveHostNetworkInterface */ + /* for SVCHlpMsg::RemoveHostOnlyNetworkInterface */ Guid guid; }; STDMETHODIMP -Host::CreateHostNetworkInterface (IN_BSTR aName, +Host::CreateHostOnlyNetworkInterface (IN_BSTR aName, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress) @@ -1407,5 +1407,5 @@ AssertReturn (d.get(), E_OUTOFMEMORY); - d->msgCode = SVCHlpMsg::CreateHostNetworkInterface; + d->msgCode = SVCHlpMsg::CreateHostOnlyNetworkInterface; d->name = aName; d->iface = iface; @@ -1427,5 +1427,5 @@ STDMETHODIMP -Host::RemoveHostNetworkInterface (IN_GUID aId, +Host::RemoveHostOnlyNetworkInterface (IN_GUID aId, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress) @@ -1465,5 +1465,5 @@ AssertReturn (d.get(), E_OUTOFMEMORY); - d->msgCode = SVCHlpMsg::RemoveHostNetworkInterface; + d->msgCode = SVCHlpMsg::RemoveHostOnlyNetworkInterface; d->guid = aId; @@ -3005,7 +3005,7 @@ switch (d->msgCode) { - case SVCHlpMsg::CreateHostNetworkInterface: - { - LogFlowFunc (("CreateHostNetworkInterface:\n")); + case SVCHlpMsg::CreateHostOnlyNetworkInterface: + { + LogFlowFunc (("CreateHostOnlyNetworkInterface:\n")); LogFlowFunc (("Network connection name = '%ls'\n", d->name.raw())); @@ -3027,5 +3027,5 @@ switch (reply) { - case SVCHlpMsg::CreateHostNetworkInterface_OK: + case SVCHlpMsg::CreateHostOnlyNetworkInterface_OK: { /* read the GUID */ @@ -3037,6 +3037,6 @@ /* initialize the object returned to the caller by - * CreateHostNetworkInterface() */ - rc = d->iface->init (d->name, guid, false); + * CreateHostOnlyNetworkInterface() */ + rc = d->iface->init (d->name, guid, HostNetworkInterfaceType_HostOnly); endLoop = true; break; @@ -3066,7 +3066,7 @@ break; } - case SVCHlpMsg::RemoveHostNetworkInterface: - { - LogFlowFunc (("RemoveHostNetworkInterface:\n")); + case SVCHlpMsg::RemoveHostOnlyNetworkInterface: + { + LogFlowFunc (("RemoveHostOnlyNetworkInterface:\n")); LogFlowFunc (("Network connection GUID = {%RTuuid}\n", d->guid.raw())); @@ -3147,7 +3147,7 @@ switch (aMsgCode) { - case SVCHlpMsg::CreateHostNetworkInterface: - { - LogFlowFunc (("CreateHostNetworkInterface:\n")); + case SVCHlpMsg::CreateHostOnlyNetworkInterface: + { + LogFlowFunc (("CreateHostOnlyNetworkInterface:\n")); Utf8Str name; @@ -3162,5 +3162,5 @@ { /* write success followed by GUID */ - vrc = aClient->write (SVCHlpMsg::CreateHostNetworkInterface_OK); + vrc = aClient->write (SVCHlpMsg::CreateHostOnlyNetworkInterface_OK); if (RT_FAILURE (vrc)) break; vrc = aClient->write (guid); @@ -3180,7 +3180,7 @@ break; } - case SVCHlpMsg::RemoveHostNetworkInterface: - { - LogFlowFunc (("RemoveHostNetworkInterface:\n")); + case SVCHlpMsg::RemoveHostOnlyNetworkInterface: + { + LogFlowFunc (("RemoveHostOnlyNetworkInterface:\n")); Guid guid; @@ -3459,3 +3459,37 @@ } +STDMETHODIMP Host::FindHostNetworkInterfacesOfType(HostNetworkInterfaceType type, ComSafeArrayOut (IHostNetworkInterface *, aNetworkInterfaces)) +{ + com::SafeIfaceArray hostNetworkInterfaces; + HRESULT hr = COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces)); + if(FAILED(hr)) + { + return hr; + } + + std::list > list; + + for (size_t i = 0; i < hostNetworkInterfaces.size(); ++i) + { + IHostNetworkInterface * networkInterface = hostNetworkInterfaces[i]; + HostNetworkInterfaceType t; + hr = networkInterface->COMGETTER(InterfaceType)(&t); + if(FAILED(hr)) + { + return hr; + } + + if(t == type) + { + list.push_back (networkInterface); + } + } + + SafeIfaceArray filteredNetworkInterfaces (list); + filteredNetworkInterfaces.detachTo (ComSafeArrayOutArg (aNetworkInterfaces)); + + return S_OK; +} + + /* vi: set tabstop=4 shiftwidth=4 expandtab: */ Index: /trunk/src/VBox/Main/HostNetworkInterfaceImpl.cpp =================================================================== --- /trunk/src/VBox/Main/HostNetworkInterfaceImpl.cpp (revision 17274) +++ /trunk/src/VBox/Main/HostNetworkInterfaceImpl.cpp (revision 17275) @@ -51,5 +51,5 @@ * @param aGuid GUID of the host network interface */ -HRESULT HostNetworkInterface::init (Bstr aInterfaceName, Guid aGuid, BOOL aReal) +HRESULT HostNetworkInterface::init (Bstr aInterfaceName, Guid aGuid, HostNetworkInterfaceType_T ifType) { LogFlowThisFunc (("aInterfaceName={%ls}, aGuid={%s}\n", @@ -65,5 +65,5 @@ unconst (mInterfaceName) = aInterfaceName; unconst (mGuid) = aGuid; - mReal = aReal; + mIfType = ifType; @@ -112,5 +112,5 @@ * @param aGuid GUID of the host network interface */ -HRESULT HostNetworkInterface::init (Bstr aInterfaceName, BOOL aReal, PNETIFINFO pIf) +HRESULT HostNetworkInterface::init (Bstr aInterfaceName, HostNetworkInterfaceType_T ifType, PNETIFINFO pIf) { // LogFlowThisFunc (("aInterfaceName={%ls}, aGuid={%s}\n", @@ -127,5 +127,5 @@ unconst (mInterfaceName) = aInterfaceName; unconst (mGuid) = pIf->Uuid; - mReal = aReal; + mIfType = ifType; m.IPAddress = pIf->IPAddress.u; @@ -135,5 +135,5 @@ m.hardwareAddress = composeHardwareAddress(&pIf->MACAddress); #ifdef RT_OS_WINDOWS - m.type = (HostNetworkInterfaceType)pIf->enmType; + m.mediumType = (HostNetworkInterfaceMediumType)pIf->enmMediumType; m.status = (HostNetworkInterfaceStatus)pIf->enmStatus; #else /* !RT_OS_WINDOWS */ @@ -285,5 +285,5 @@ * @param aType address of result pointer */ -STDMETHODIMP HostNetworkInterface::COMGETTER(Type) (HostNetworkInterfaceType_T *aType) +STDMETHODIMP HostNetworkInterface::COMGETTER(MediumType) (HostNetworkInterfaceMediumType_T *aType) { CheckComArgOutPointerValid(aType); @@ -292,5 +292,5 @@ CheckComRCReturnRC (autoCaller.rc()); - *aType = m.type; + *aType = m.mediumType; return S_OK; @@ -316,17 +316,17 @@ /** - * Returns true if this is a "real" adapter, false if this is a Virtualbox Host Adapter - * - * @returns COM status code - * @param aReal address of result pointer - */ -STDMETHODIMP HostNetworkInterface::COMGETTER(Real) (BOOL *aReal) -{ - CheckComArgOutPointerValid(aReal); - - AutoCaller autoCaller (this); - CheckComRCReturnRC (autoCaller.rc()); - - *aReal = mReal; + * Returns network interface type + * + * @returns COM status code + * @param aType address of result pointer + */ +STDMETHODIMP HostNetworkInterface::COMGETTER(InterfaceType) (HostNetworkInterfaceType_T *aType) +{ + CheckComArgOutPointerValid(aType); + + AutoCaller autoCaller (this); + CheckComRCReturnRC (autoCaller.rc()); + + *aType = mIfType; return S_OK; Index: /trunk/src/VBox/Main/NetworkAdapterImpl.cpp =================================================================== --- /trunk/src/VBox/Main/NetworkAdapterImpl.cpp (revision 17274) +++ /trunk/src/VBox/Main/NetworkAdapterImpl.cpp (revision 17275) @@ -713,5 +713,5 @@ } -STDMETHODIMP NetworkAdapter::AttachToHostInterface() +STDMETHODIMP NetworkAdapter::AttachToBridgedNetwork() { AutoCaller autoCaller (this); @@ -725,5 +725,5 @@ /* don't do anything if we're already host interface attached */ - if (mData->mAttachmentType != NetworkAttachmentType_HostInterface) + if (mData->mAttachmentType != NetworkAttachmentType_Bridged) { mData.backup(); @@ -732,5 +732,5 @@ detach(); - mData->mAttachmentType = NetworkAttachmentType_HostInterface; + mData->mAttachmentType = NetworkAttachmentType_Bridged; /* leave the lock before informing callbacks */ @@ -925,5 +925,5 @@ CheckComRCReturnRC (rc); - rc = AttachToHostInterface(); + rc = AttachToBridgedNetwork(); CheckComRCReturnRC (rc); } @@ -1034,5 +1034,5 @@ break; } - case NetworkAttachmentType_HostInterface: + case NetworkAttachmentType_Bridged: { Key attachmentNode = aAdapterNode.createKey ("HostInterface"); @@ -1200,5 +1200,5 @@ break; } - case NetworkAttachmentType_HostInterface: + case NetworkAttachmentType_Bridged: { /* reset handle and device name */ Index: /trunk/src/VBox/Main/darwin/NetIfList-darwin.cpp =================================================================== --- /trunk/src/VBox/Main/darwin/NetIfList-darwin.cpp (revision 17274) +++ /trunk/src/VBox/Main/darwin/NetIfList-darwin.cpp (revision 17275) @@ -68,5 +68,5 @@ PNETIFINFO pNew = (PNETIFINFO)RTMemAllocZ(RT_OFFSETOF(NETIFINFO, szName[cbNameLen])); pNew->MACAddress = pEtherNICs->Mac; - pNew->enmType = NETIF_T_ETHERNET; + pNew->enmMediumType = NETIF_T_ETHERNET; pNew->Uuid = pEtherNICs->Uuid; Assert(sizeof(pNew->szShortName) > sizeof(pEtherNICs->szBSDName)); @@ -126,5 +126,5 @@ ComObjPtr IfObj; IfObj.createObject(); - if (SUCCEEDED(IfObj->init(Bstr(pEtherNICs->szName), TRUE, pNew))) + if (SUCCEEDED(IfObj->init(Bstr(pEtherNICs->szName), HostNetworkInterfaceType_Bridged, pNew))) list.push_back(IfObj); RTMemFree(pNew); Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl =================================================================== --- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 17274) +++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 17275) @@ -6364,6 +6364,6 @@ @@ -6421,7 +6421,18 @@ + + + Network interface type. + + + + + @@ -6460,5 +6471,5 @@ - + Type of protocol encapsulation used. @@ -6468,7 +6479,6 @@ - - True if this is a real interface false - if this is a Virtualbox Host Adapter interface. + + specifies the host interface type. @@ -6476,5 +6486,5 @@ @@ -6624,7 +6634,7 @@ - - - Creates a new adapter for Host Interface Networking. + + + Creates a new adapter for Host Only Networking. Host network interface @a name already exists. @@ -6647,7 +6657,7 @@ - - - Removes the given host network interface. + + + Removes the given Host Only Networking interface. No host network interface matching @a id found. @@ -6830,4 +6840,15 @@ Found host network interface object. + + + + + Searches through all host network interfaces and returns a list of interfaces of the specified type + + + type of the host network interfaces to search for. + + + Found host network interface objects. @@ -10290,5 +10311,5 @@ @@ -10300,5 +10321,5 @@ - + @@ -10324,5 +10345,5 @@ @@ -10412,7 +10433,7 @@ - - - Attach the network adapter to a host interface. + + + Attach the network adapter to a bridged host interface. Index: /trunk/src/VBox/Main/include/ConsoleImpl.h =================================================================== --- /trunk/src/VBox/Main/include/ConsoleImpl.h (revision 17274) +++ /trunk/src/VBox/Main/include/ConsoleImpl.h (revision 17275) @@ -403,6 +403,6 @@ HRESULT callTapSetupApplication(bool isStatic, RTFILE tapFD, Bstr &tapDevice, Bstr &tapSetupApplication); - HRESULT attachToHostInterface(INetworkAdapter *networkAdapter); - HRESULT detachFromHostInterface(INetworkAdapter *networkAdapter); + HRESULT attachToBridgedInterface(INetworkAdapter *networkAdapter); + HRESULT detachFromBridgedInterface(INetworkAdapter *networkAdapter); HRESULT powerDownHostInterfaces(); Index: /trunk/src/VBox/Main/include/HostImpl.h =================================================================== --- /trunk/src/VBox/Main/include/HostImpl.h (revision 17274) +++ /trunk/src/VBox/Main/include/HostImpl.h (revision 17275) @@ -100,8 +100,8 @@ #ifdef RT_OS_WINDOWS - STDMETHOD(CreateHostNetworkInterface) (IN_BSTR aName, + STDMETHOD(CreateHostOnlyNetworkInterface) (IN_BSTR aName, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress); - STDMETHOD(RemoveHostNetworkInterface) (IN_GUID aId, + STDMETHOD(RemoveHostOnlyNetworkInterface) (IN_GUID aId, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress); @@ -115,4 +115,5 @@ STDMETHOD(FindHostNetworkInterfaceByName) (IN_BSTR aName, IHostNetworkInterface **networkInterface); STDMETHOD(FindHostNetworkInterfaceById) (IN_GUID id, IHostNetworkInterface **networkInterface); + STDMETHOD(FindHostNetworkInterfacesOfType) (HostNetworkInterfaceType type, ComSafeArrayOut (IHostNetworkInterface *, aNetworkInterfaces)); // public methods only for internal purposes Index: /trunk/src/VBox/Main/include/HostNetworkInterfaceImpl.h =================================================================== --- /trunk/src/VBox/Main/include/HostNetworkInterfaceImpl.h (revision 17274) +++ /trunk/src/VBox/Main/include/HostNetworkInterfaceImpl.h (revision 17275) @@ -60,7 +60,7 @@ // public initializer/uninitializer for internal purposes only - HRESULT init (Bstr interfaceName, Guid guid, BOOL aReal); + HRESULT init (Bstr interfaceName, Guid guid, HostNetworkInterfaceType_T ifType); #ifdef VBOX_WITH_HOSTNETIF_API - HRESULT init (Bstr aInterfaceName, BOOL aReal, struct NETIFINFO *pIfs); + HRESULT init (Bstr aInterfaceName, HostNetworkInterfaceType_T ifType, struct NETIFINFO *pIfs); #endif @@ -73,7 +73,7 @@ STDMETHOD(COMGETTER(IPV6NetworkMask)) (BSTR *aIPV6Mask); STDMETHOD(COMGETTER(HardwareAddress)) (BSTR *aHardwareAddress); - STDMETHOD(COMGETTER(Type)) (HostNetworkInterfaceType_T *aType); + STDMETHOD(COMGETTER(MediumType)) (HostNetworkInterfaceMediumType_T *aType); STDMETHOD(COMGETTER(Status)) (HostNetworkInterfaceStatus_T *aStatus); - STDMETHOD(COMGETTER(Real)) (BOOL *aReal); + STDMETHOD(COMGETTER(InterfaceType)) (HostNetworkInterfaceType_T *aType); // for VirtualBoxSupportErrorInfoImpl @@ -83,10 +83,10 @@ const Bstr mInterfaceName; const Guid mGuid; - BOOL mReal; + HostNetworkInterfaceType_T mIfType; struct Data { Data() : IPAddress (0), networkMask (0), - type (HostNetworkInterfaceType_Unknown), + mediumType (HostNetworkInterfaceMediumType_Unknown), status(HostNetworkInterfaceStatus_Down){} @@ -96,5 +96,5 @@ Bstr IPV6NetworkMask; Bstr hardwareAddress; - HostNetworkInterfaceType_T type; + HostNetworkInterfaceMediumType_T mediumType; HostNetworkInterfaceStatus_T status; } m; Index: /trunk/src/VBox/Main/include/NetworkAdapterImpl.h =================================================================== --- /trunk/src/VBox/Main/include/NetworkAdapterImpl.h (revision 17274) +++ /trunk/src/VBox/Main/include/NetworkAdapterImpl.h (revision 17275) @@ -127,5 +127,5 @@ // INetworkAdapter methods STDMETHOD(AttachToNAT)(); - STDMETHOD(AttachToHostInterface)(); + STDMETHOD(AttachToBridgedNetwork)(); STDMETHOD(AttachToInternalNetwork)(); STDMETHOD(AttachToHostOnlyNetwork)(); Index: /trunk/src/VBox/Main/include/netif.h =================================================================== --- /trunk/src/VBox/Main/include/netif.h (revision 17274) +++ /trunk/src/VBox/Main/include/netif.h (revision 17275) @@ -62,5 +62,5 @@ RTNETADDRIPV6 IPv6NetMask; RTMAC MACAddress; - NETIFTYPE enmType; + NETIFTYPE enmMediumType; NETIFSTATUS enmStatus; RTUUID Uuid; Index: /trunk/src/VBox/Main/linux/NetIfList-linux.cpp =================================================================== --- /trunk/src/VBox/Main/linux/NetIfList-linux.cpp (revision 17274) +++ /trunk/src/VBox/Main/linux/NetIfList-linux.cpp (revision 17275) @@ -52,8 +52,8 @@ { case ARPHRD_ETHER: - pInfo->enmType = NETIF_T_ETHERNET; + pInfo->enmMediumType = NETIF_T_ETHERNET; break; default: - pInfo->enmType = NETIF_T_UNKNOWN; + pInfo->enmMediumType = NETIF_T_UNKNOWN; break; } @@ -142,9 +142,9 @@ if (RT_FAILURE(rc)) break; - if (Info.enmType == NETIF_T_ETHERNET) + if (Info.enmMediumType == NETIF_T_ETHERNET) { ComObjPtr IfObj; IfObj.createObject(); - if (SUCCEEDED(IfObj->init(Bstr(pszName), TRUE, &Info))) + if (SUCCEEDED(IfObj->init(Bstr(pszName), HostNetworkInterfaceType_Bridged, &Info))) list.push_back(IfObj); } Index: /trunk/src/VBox/Main/solaris/NetIfList-solaris.cpp =================================================================== --- /trunk/src/VBox/Main/solaris/NetIfList-solaris.cpp (revision 17274) +++ /trunk/src/VBox/Main/solaris/NetIfList-solaris.cpp (revision 17275) @@ -186,9 +186,9 @@ Uuid.Gen.au8Node[5] = Info.MACAddress.au8[5]; Info.Uuid = Uuid; - Info.enmType = NETIF_T_ETHERNET; + Info.enmMediumType = NETIF_T_ETHERNET; ComObjPtr IfObj; IfObj.createObject(); - if (SUCCEEDED(IfObj->init(Bstr(szNICDesc), TRUE, &Info))) + if (SUCCEEDED(IfObj->init(Bstr(szNICDesc), HostNetworkInterfaceType_Bridged, &Info))) pList->push_back(IfObj); } Index: /trunk/src/VBox/Main/win/NetIfList-win.cpp =================================================================== --- /trunk/src/VBox/Main/win/NetIfList-win.cpp (revision 17274) +++ /trunk/src/VBox/Main/win/NetIfList-win.cpp (revision 17275) @@ -361,4 +361,40 @@ } +static HRESULT VBoxNetCfgWinEnableDHCP(IWbemServices * pSvc, IWbemClassObject *pObj, in_addr* aIp, in_addr * aMask, UINT cIp) +{ + IWbemClassObject * pClass; + BSTR ClassName = SysAllocString(L"Win32_NetworkAdapterConfiguration"); + HRESULT hr; + if(ClassName) + { + hr = pSvc->GetObject(ClassName, 0, NULL, &pClass, NULL); + if(SUCCEEDED(hr)) + { + BSTR ObjPath; + hr = netIfAdapterConfigPath(pObj, &ObjPath); + if(SUCCEEDED(hr)) + { + IWbemClassObject * pOutParams; + + hr = netIfExecMethod(pSvc, pClass, ObjPath, + bstr_t(L"EnableDHCP"), NULL, NULL, 0, &pOutParams); + if(SUCCEEDED(hr)) + { + } + SysFreeString(ObjPath); + } + pClass->Release(); + } + SysFreeString(ClassName); + } + else + { + DWORD dwError = GetLastError(); + Assert(0); + hr = HRESULT_FROM_WIN32( dwError ); + } + + return hr; +} static int collectNetIfInfo(Bstr &strName, PNETIFINFO pInfo) @@ -448,5 +484,5 @@ else memcpy(pInfo->MACAddress.au8, pAdapter->PhysicalAddress, sizeof(pInfo->MACAddress)); - pInfo->enmType = NETIF_T_ETHERNET; + pInfo->enmMediumType = NETIF_T_ETHERNET; pInfo->enmStatus = pAdapter->OperStatus == IfOperStatusUp ? NETIF_S_UP : NETIF_S_DOWN; RTStrFree(pszUuid); @@ -464,5 +500,5 @@ # define VBOX_APP_NAME L"VirtualBox" -static int vboxNetWinAddComponent(std::list > * pPist, INetCfgComponent * pncc, bool bReal) +static int vboxNetWinAddComponent(std::list > * pPist, INetCfgComponent * pncc, HostNetworkInterfaceType enmType) { LPWSTR lpszName; @@ -496,5 +532,5 @@ iface.createObject(); /* remove the curly bracket at the end */ - if (SUCCEEDED (iface->init (name, bReal, &Info))) + if (SUCCEEDED (iface->init (name, enmType, &Info))) { pPist->push_back (iface); @@ -624,5 +660,5 @@ if(!_wcsnicmp(pId, L"sun_VBoxNetAdp", sizeof(L"sun_VBoxNetAdp")/2)) { - vboxNetWinAddComponent(&list, pMpNcc, false); + vboxNetWinAddComponent(&list, pMpNcc, HostNetworkInterfaceType_HostOnly); } CoTaskMemFree(pId); @@ -765,5 +801,5 @@ } - if (SUCCEEDED (iface->init (name, TRUE, &Info))) + if (SUCCEEDED (iface->init (name, HostNetworkInterfaceType_Bridged, &Info))) list.push_back (iface); } @@ -841,5 +877,5 @@ if(uComponentStatus == 0) { - vboxNetWinAddComponent(&list, pMpNcc, true); + vboxNetWinAddComponent(&list, pMpNcc, HostNetworkInterfaceType_Bridged); } } Index: /trunk/src/VBox/Main/win/svchlp.cpp =================================================================== --- /trunk/src/VBox/Main/win/svchlp.cpp (revision 17274) +++ /trunk/src/VBox/Main/win/svchlp.cpp (revision 17275) @@ -272,6 +272,6 @@ switch (msgCode) { - case SVCHlpMsg::CreateHostNetworkInterface: - case SVCHlpMsg::RemoveHostNetworkInterface: + case SVCHlpMsg::CreateHostOnlyNetworkInterface: + case SVCHlpMsg::RemoveHostOnlyNetworkInterface: { vrc = Host::networkInterfaceHelperServer (this, msgCode); Index: /trunk/src/VBox/Main/win/svchlp.h =================================================================== --- /trunk/src/VBox/Main/win/svchlp.h (revision 17274) +++ /trunk/src/VBox/Main/win/svchlp.h (revision 17275) @@ -38,7 +38,7 @@ Error, /* Utf8Str string (may be null but must present) */ - CreateHostNetworkInterface = 100, /* see usage in code */ - CreateHostNetworkInterface_OK, /* see usage in code */ - RemoveHostNetworkInterface, /* see usage in code */ + CreateHostOnlyNetworkInterface = 100, /* see usage in code */ + CreateHostOnlyNetworkInterface_OK, /* see usage in code */ + RemoveHostOnlyNetworkInterface, /* see usage in code */ }; };