Changeset 16967 in vbox

Timestamp:

Feb 20, 2009 10:03:55 AM (16 years ago)

Author:

vboxsync

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

43133

Message:

NetAdp: added a Real property to the IHostNetworkInterface, make the interface name be honored in VM settings

Location:

trunk/src/VBox

Files:

• Devices/Network/DrvIntNet.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxVMSettingsNetwork.cpp (modified) (3 diffs)
• Main/ConsoleImpl2.cpp (modified) (2 diffs)
• Main/HostImpl.cpp (modified) (7 diffs)
• Main/HostNetworkInterfaceImpl.cpp (modified) (5 diffs)
• Main/NetworkAdapterImpl.cpp (modified) (3 diffs)
• Main/idl/VirtualBox.xidl (modified) (3 diffs)
• Main/include/HostImpl.h (modified) (1 diff)
• Main/include/HostNetworkInterfaceImpl.h (modified) (3 diffs)
• Main/include/netif.h (modified) (1 diff)
• Main/win/NetIfList-win.cpp (modified) (5 diffs)
• Main/xml/VirtualBox-settings-common.xsd (modified) (1 diff)

trunk/src/VBox/Devices/Network/DrvIntNet.cpp

@@ -1038 +1038 @@
 # endif
 
-        if (OpenReq.enmTrunkType == kIntNetTrunkType_NetFlt)
-        {
-            /*
-             * <Describe what this does here or/and in the function docs of drvIntNetWinIfGuidToBindName>.
-             */
-            char szBindName[INTNET_MAX_TRUNK_NAME];
-            rc = drvIntNetWinIfGuidToBindName(OpenReq.szTrunk, szBindName, INTNET_MAX_TRUNK_NAME);
-            AssertLogRelMsgRCReturn(rc, ("drvIntNetWinIfGuidToBindName failed, rc=%Rrc", rc), rc);
-            strcpy(OpenReq.szTrunk, szBindName);
-        }
-        else
-        {
-            strcpy(OpenReq.szTrunk, "dummy name");
-        }
+        /*
+         * <Describe what this does here or/and in the function docs of drvIntNetWinIfGuidToBindName>.
+         */
+        char szBindName[INTNET_MAX_TRUNK_NAME];
+        rc = drvIntNetWinIfGuidToBindName(OpenReq.szTrunk, szBindName, INTNET_MAX_TRUNK_NAME);
+        AssertLogRelMsgRCReturn(rc, ("drvIntNetWinIfGuidToBindName failed, rc=%Rrc", rc), rc);
+        strcpy(OpenReq.szTrunk, szBindName);
     }
 #endif /* WINDOWS && NETFLT */

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsNetwork.cpp

@@ -156 +156 @@
     mAdapter.SetCableConnected (mCbCable->isChecked());
 
-    if (type == KNetworkAttachmentType_HostInterface)
+    if (type == KNetworkAttachmentType_HostInterface
+#if defined (Q_WS_WIN) && defined (VBOX_WITH_NETFLT)
+            || type == KNetworkAttachmentType_HostOnly
+#endif
+            )
     {
 #if defined (Q_WS_WIN) || defined (VBOX_WITH_NETFLT)
@@ -715 +719 @@
     /* Load current inner list */
     QList<QTreeWidgetItem*> itemsList;
-    CHostNetworkInterfaceVector interfaces =
-#if defined(Q_WS_WIN) && defined(VBOX_WITH_NETFLT)
-            enmAttachmentType == KNetworkAttachmentType_HostOnly ?
-                    vboxGlobal().virtualBox().GetHost().GetTapInterfaces()
-                    :
-#endif
-                    vboxGlobal().virtualBox().GetHost().GetNetworkInterfaces();
+    CHostNetworkInterfaceVector interfaces = vboxGlobal().virtualBox().GetHost().GetNetworkInterfaces();
     for (CHostNetworkInterfaceVector::ConstIterator it = interfaces.begin();
          it != interfaces.end(); ++it)
-        itemsList << new VBoxNIListItem (it->GetName());
+    {
+#if defined(Q_WS_WIN) && defined(VBOX_WITH_NETFLT)
+        /* display real for not host-only and viceversa */
+        if((enmAttachmentType == KNetworkAttachmentType_HostOnly) != it->GetReal())
+#endif
+            itemsList << new VBoxNIListItem (it->GetName());
+    }
 
     /* Save current list item name */
@@ -855 +859 @@
 
 #if defined (Q_WS_WIN) || defined (VBOX_WITH_NETFLT)
-        if (type == KNetworkAttachmentType_HostInterface &&
-            page->interfaceName().isNull())
+        if ((type == KNetworkAttachmentType_HostInterface
+#if defined (Q_WS_WIN) && defined (VBOX_WITH_NETFLT)
+                || type == KNetworkAttachmentType_HostOnly
+#endif
+                ) && page->interfaceName().isNull())
         {
             valid = false;

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1370 +1370 @@
                                           N_("Inexistent host networking interface, name '%ls'"),
                                           HifName.raw());
+                    }
+
+                    BOOL real;
+                    hrc = hostInterface->COMGETTER(Real)(&real);
+                    if(FAILED(hrc))
+                    {
+                        LogRel(("NetworkAttachmentType_HostOnly: COMGETTER(Real) failed, hrc (0x%x)", hrc));
+                        H();
+                    }
+
+                    if(!real)
+                    {
+                        LogRel(("NetworkAttachmentType_HostOnly: COMGETTER(Real) failed, hrc (0x%x)", hrc));
+                        return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS,
+                                                              N_("Interface ('%ls') is a Host Adapter interface"),
+                                                              HifName.raw());
                     }
 
@@ -1637 +1653 @@
                 rc = CFGMR3InsertString(pLunL0, "Driver", "IntNet");            RC_CHECK();
                 rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg);                 RC_CHECK();
+#if defined(RT_OS_WINDOWS)
+                Bstr HifName;
+                hrc = networkAdapter->COMGETTER(HostInterface)(HifName.asOutParam());
+                if(FAILED(hrc))
+                {
+                    LogRel(("NetworkAttachmentType_HostOnly: COMGETTER(HostInterface) failed, hrc (0x%x)", hrc));
+                    H();
+                }
+
+                Utf8Str HifNameUtf8(HifName);
+                const char *pszHifName = HifNameUtf8.raw();
+                ComPtr<IHostNetworkInterface> hostInterface;
+                rc = host->FindHostNetworkInterfaceByName(HifName, hostInterface.asOutParam());
+                if (!SUCCEEDED(rc))
+                {
+                    AssertBreakpoint();
+                    LogRel(("NetworkAttachmentType_HostOnly: FindByName failed, rc (0x%x)", rc));
+                    return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS,
+                                      N_("Inexistent host networking interface, name '%ls'"),
+                                      HifName.raw());
+                }
+
+                BOOL real;
+                hrc = hostInterface->COMGETTER(Real)(&real);
+                if(FAILED(hrc))
+                {
+                    LogRel(("NetworkAttachmentType_HostOnly: COMGETTER(Real) failed, hrc (0x%x)", hrc));
+                    H();
+                }
+
+                if(real)
+                {
+                    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"),
+                                                          HifName.raw());
+                }
+
+                Guid hostIFGuid;
+                hrc = hostInterface->COMGETTER(Id)(hostIFGuid.asOutParam());
+                if(FAILED(hrc))
+                {
+                    LogRel(("NetworkAttachmentType_HostOnly: COMGETTER(Id) failed, hrc (0x%x)", hrc));
+                    H();
+                }
+                char szDriverGUID[RTUUID_STR_LENGTH];
+                strcpy(szDriverGUID , hostIFGuid.toString().raw());
+                const char *pszTrunk = szDriverGUID;
+
+                /* TODO: set the proper Trunk and Network values, currently the driver uses the first adapter instance */
+                rc = CFGMR3InsertInteger(pCfg, "TrunkType", kIntNetTrunkType_NetAdp); RC_CHECK();
+                rc = CFGMR3InsertString(pCfg, "Trunk", pszTrunk);               RC_CHECK();
+                char szNetwork[80];
+                RTStrPrintf(szNetwork, sizeof(szNetwork), "HostInterfaceNetworking-%s", pszHifName);
+                rc = CFGMR3InsertString(pCfg, "Network", szNetwork);            RC_CHECK();
+#elif defined(RT_OS_DARWIN)
                 rc = CFGMR3InsertString(pCfg, "Trunk", "vboxnet0");             RC_CHECK();
                 rc = CFGMR3InsertString(pCfg, "Network", "HostInterfaceNetworking-vboxnet0"); RC_CHECK();
-#if defined(RT_OS_WINDOWS) || defined(RT_OS_DARWIN)
-                /* TODO: set the proper Trunk and Network values, currently the driver uses the first adapter instance */
                 rc = CFGMR3InsertInteger(pCfg, "TrunkType", kIntNetTrunkType_NetAdp); RC_CHECK();
 #else
+                rc = CFGMR3InsertString(pCfg, "Trunk", "vboxnet0");             RC_CHECK();
+                rc = CFGMR3InsertString(pCfg, "Network", "HostInterfaceNetworking-vboxnet0"); RC_CHECK();
                 rc = CFGMR3InsertInteger(pCfg, "TrunkType", kIntNetTrunkType_NetFlt); RC_CHECK();
 #endif

trunk/src/VBox/Main/HostImpl.cpp

@@ -614 +614 @@
     ComObjPtr<HostNetworkInterface> IfObj;
     IfObj.createObject();
-    if (SUCCEEDED(IfObj->init(Bstr(szNICDesc), Guid(Uuid))))
+    if (SUCCEEDED(IfObj->init(Bstr(szNICDesc), Guid(Uuid), true)))
         pList->push_back(IfObj);
 }
@@ -729 +729 @@
             iface.createObject();
             /* remove the curly bracket at the end */
-            if (SUCCEEDED (iface->init (name, Guid (IfGuid))))
+            if (SUCCEEDED (iface->init (name, Guid (IfGuid), true)))
             {
                 pPist->push_back (iface);
@@ -744 +744 @@
     return rc;
 }
-
-STDMETHODIMP Host::COMGETTER(TapInterfaces) (ComSafeArrayOut (IHostNetworkInterface *, aNetworkInterfaces))
-{
-    if (ComSafeArrayOutIsNull (aNetworkInterfaces))
-        return E_POINTER;
-
-    AutoWriteLock alock (this);
-    CHECK_READY();
-
-    std::list <ComObjPtr <HostNetworkInterface> > list;
-#ifdef VBOX_WITH_HOSTNETIF_API
-    int rc = NetIfListTap(list);
-    if (rc)
-    {
-        Log(("Failed to get host tap network interface list with rc=%Vrc\n", rc));
-    }
-#else
-#endif
-    SafeIfaceArray <IHostNetworkInterface> networkInterfaces (list);
-    networkInterfaces.detachTo (ComSafeArrayOutArg (aNetworkInterfaces));
-
-    return S_OK;
-}
-#else /* !defined(RT_OS_WINDOWS) || !defined(VBOX_WITH_NETFLT) */
-STDMETHODIMP Host::COMGETTER(TapInterfaces) (ComSafeArrayOut (IHostNetworkInterface *, aNetworkInterfaces))
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-#endif /* !defined(RT_OS_WINDOWS) && !defined(VBOX_WITH_NETFLT) */
-
+#endif /* defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT) */
 /**
  * Returns a list of host network interfaces.
@@ -804 +775 @@
         ComObjPtr<HostNetworkInterface> IfObj;
         IfObj.createObject();
-        if (SUCCEEDED(IfObj->init(Bstr(pEtherNICs->szName), Guid(pEtherNICs->Uuid))))
+        if (SUCCEEDED(IfObj->init(Bstr(pEtherNICs->szName), Guid(pEtherNICs->Uuid), true)))
             list.push_back(IfObj);
 
@@ -959 +930 @@
                     /* remove the curly bracket at the end */
                     szNetworkGUID [strlen(szNetworkGUID) - 1] = '\0';
-                    if (SUCCEEDED (iface->init (name, Guid (szNetworkGUID + 1))))
+                    if (SUCCEEDED (iface->init (name, Guid (szNetworkGUID + 1), true)))
                         list.push_back (iface);
                 }
@@ -1085 +1056 @@
                         ComObjPtr<HostNetworkInterface> IfObj;
                         IfObj.createObject();
-                        if (SUCCEEDED(IfObj->init(Bstr(pReq->ifr_name), Guid(uuid))))
+                        if (SUCCEEDED(IfObj->init(Bstr(pReq->ifr_name), Guid(uuid), true)))
                             list.push_back(IfObj);
                     }
@@ -3071 +3042 @@
                         /* initialize the object returned to the caller by
                          * CreateHostNetworkInterface() */
-                        rc = d->iface->init (d->name, guid);
+                        rc = d->iface->init (d->name, guid, false);
                         endLoop = true;
                         break;

trunk/src/VBox/Main/HostNetworkInterfaceImpl.cpp

@@ -51 +51 @@
  * @param   aGuid GUID of the host network interface
  */
-HRESULT HostNetworkInterface::init (Bstr aInterfaceName, Guid aGuid)
+HRESULT HostNetworkInterface::init (Bstr aInterfaceName, Guid aGuid, BOOL aReal)
 {
     LogFlowThisFunc (("aInterfaceName={%ls}, aGuid={%s}\n",
@@ -65 +65 @@
     unconst (mInterfaceName) = aInterfaceName;
     unconst (mGuid) = aGuid;
+    mReal = aReal;
+
 
     /* Confirm a successful initialization */
@@ -110 +112 @@
  * @param   aGuid GUID of the host network interface
  */
-HRESULT HostNetworkInterface::init (Bstr aInterfaceName, PNETIFINFO pIf)
+HRESULT HostNetworkInterface::init (Bstr aInterfaceName, BOOL aReal, PNETIFINFO pIf)
 {
 //    LogFlowThisFunc (("aInterfaceName={%ls}, aGuid={%s}\n",
@@ -125 +127 @@
     unconst (mInterfaceName) = aInterfaceName;
     unconst (mGuid) = pIf->Uuid;
+    mReal = aReal;
+
     m.IPAddress = pIf->IPAddress.u;
     m.networkMask = pIf->IPNetMask.u;
@@ -311 +315 @@
 }
 
+/**
+ * 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;
+
+    return S_OK;
+
+}
+
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/NetworkAdapterImpl.cpp

@@ -943 +943 @@
     if (!(attachmentNode = aAdapterNode.findKey ("HostOnlyNetwork")).isNull())
     {
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
+        Bstr name = attachmentNode.stringValue ("name");
+        /* name can be empty, but not null */
+        ComAssertRet (!name.isNull(), E_FAIL);
+
+        rc = COMSETTER(HostInterface) (name);
+        CheckComRCReturnRC (rc);
+#endif
+
         /* Host Interface Networking */
         rc = AttachToHostOnlyNetwork();
@@ -1042 +1051 @@
         {
             Key attachmentNode = aAdapterNode.createKey ("HostOnlyNetwork");
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
+            Assert (!mData->mHostInterface.isNull());
+            attachmentNode.setValue <Bstr> ("name", mData->mHostInterface);
+#endif
             break;
         }
@@ -1200 +1213 @@
         case NetworkAttachmentType_HostOnly:
         {
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
+            /* reset handle and device name */
+            mData->mHostInterface = "";
+#endif
             break;
         }

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

@@ -6441 +6441 @@
   <interface
      name="IHostNetworkInterface" extends="$unknown"
-     uuid="832720ac-2df6-41d4-a867-a0b40df14c7f"
+     uuid="4fc2445f-fb73-4f55-b3b4-ecee47c7077b"
      wsmap="managed"
      >
@@ -6485 +6485 @@
       <desc>Status of the interface.</desc>
     </attribute>
+    
+    <attribute name="real" type="boolean" readonly="yes">
+      <desc>True if this is a real interface false 
+      if this is a Virtualbox Host Adapter interface.</desc>
+    </attribute>
   </interface>
 
@@ -6555 +6560 @@
     <attribute name="networkInterfaces" type="IHostNetworkInterface" safearray="yes" readonly="yes">
       <desc>List of host network interfaces currently defined on the host.</desc>
-    </attribute>
-
-    <attribute name="tapInterfaces" type="IHostNetworkInterface" safearray="yes" readonly="yes">
-      <desc>List of host tap interfaces currently defined on the host.</desc>
     </attribute>
 

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

@@ -98 +98 @@
 
     // IHost methods
-    STDMETHOD(COMGETTER(TapInterfaces))(ComSafeArrayOut (IHostNetworkInterface *, aNetworkInterfaces));
 #ifdef RT_OS_WINDOWS
 

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

@@ -60 +60 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (Bstr interfaceName, Guid guid);
+    HRESULT init (Bstr interfaceName, Guid guid, BOOL aReal);
 #ifdef VBOX_WITH_HOSTNETIF_API
-    HRESULT init (Bstr aInterfaceName, struct NETIFINFO *pIfs);
+    HRESULT init (Bstr aInterfaceName, BOOL aReal, struct NETIFINFO *pIfs);
 #endif
 
@@ -75 +75 @@
     STDMETHOD(COMGETTER(Type)) (HostNetworkInterfaceType_T *aType);
     STDMETHOD(COMGETTER(Status)) (HostNetworkInterfaceStatus_T *aStatus);
+    STDMETHOD(COMGETTER(Real)) (BOOL *aReal);
 
     // for VirtualBoxSupportErrorInfoImpl
@@ -82 +83 @@
     const Bstr mInterfaceName;
     const Guid mGuid;
+    BOOL mReal;
+
     struct Data
     {
         Data() : IPAddress (0), networkMask (0),
             type (HostNetworkInterfaceType_Unknown),
-            status(HostNetworkInterfaceStatus_Down) {}
-        
+            status(HostNetworkInterfaceStatus_Down){}
+
         ULONG IPAddress;
         ULONG networkMask;

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

@@ -77 +77 @@
 int NetIfList(std::list <ComObjPtr <HostNetworkInterface> > &list);
 
-#if defined(VBOX_WITH_NETFLT) && defined(RT_OS_WINDOWS)
-int NetIfListTap(std::list <ComObjPtr <HostNetworkInterface> > &list);
 #endif
 
-#endif
-

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

@@ -151 +151 @@
 # define VBOX_APP_NAME L"VirtualBox"
 
-static int vboxNetWinAddComponent(std::list <ComObjPtr <HostNetworkInterface> > * pPist, INetCfgComponent * pncc)
+static int vboxNetWinAddComponent(std::list <ComObjPtr <HostNetworkInterface> > * pPist, INetCfgComponent * pncc, bool bReal)
 {
     LPWSTR              lpszName;
@@ -183 +183 @@
             iface.createObject();
             /* remove the curly bracket at the end */
-            if (SUCCEEDED (iface->init (name, &Info)))
+            if (SUCCEEDED (iface->init (name, bReal, &Info)))
             {
                 pPist->push_back (iface);
@@ -268 +268 @@
 }
 #endif /* #ifndef VBOX_WITH_NETFLT */
+
+
+static int NetIfListHostAdapters(std::list <ComObjPtr <HostNetworkInterface> > &list)
+{
+#ifndef VBOX_WITH_NETFLT
+    /* VBoxNetAdp is available only when VBOX_WITH_NETFLT is enabled */
+    return VERR_NOT_IMPLEMENTED;
+#else /* #  if defined VBOX_WITH_NETFLT */
+    INetCfg              *pNc;
+    INetCfgComponent     *pMpNcc;
+    LPWSTR               lpszApp = NULL;
+    HRESULT              hr;
+    IEnumNetCfgComponent  *pEnumComponent;
+
+    /* we are using the INetCfg API for getting the list of miniports */
+    hr = VBoxNetCfgWinQueryINetCfg( FALSE,
+                       VBOX_APP_NAME,
+                       &pNc,
+                       &lpszApp );
+    Assert(hr == S_OK);
+    if(hr == S_OK)
+    {
+        hr = VBoxNetCfgWinGetComponentEnum(pNc, &GUID_DEVCLASS_NET, &pEnumComponent);
+        if(hr == S_OK)
+        {
+            while((hr = VBoxNetCfgWinGetNextComponent(pEnumComponent, &pMpNcc)) == S_OK)
+            {
+                ULONG uComponentStatus;
+                hr = pMpNcc->GetDeviceStatus(&uComponentStatus);
+#ifndef DEBUG_bird
+                Assert(hr == S_OK);
+#endif
+                if(hr == S_OK)
+                {
+                    if(uComponentStatus == 0)
+                    {
+                        LPWSTR pId;
+                        hr = pMpNcc->GetId(&pId);
+                        Assert(hr == S_OK);
+                        if(hr == S_OK)
+                        {
+                            if(!_wcsnicmp(pId, L"sun_VBoxNetAdp", sizeof(L"sun_VBoxNetAdp")/2))
+                            {
+                                vboxNetWinAddComponent(&list, pMpNcc, false);
+                            }
+                            CoTaskMemFree(pId);
+                        }
+                    }
+                }
+                VBoxNetCfgWinReleaseRef(pMpNcc);
+            }
+            Assert(hr == S_OK || hr == S_FALSE);
+
+            VBoxNetCfgWinReleaseRef(pEnumComponent);
+        }
+        else
+        {
+            LogRel(("failed to get the sun_VBoxNetFlt component, error (0x%x)", hr));
+        }
+
+        VBoxNetCfgWinReleaseINetCfg(pNc, FALSE);
+    }
+    else if(lpszApp)
+    {
+        CoTaskMemFree(lpszApp);
+    }
+#endif /* #  if defined VBOX_WITH_NETFLT */
+    return VINF_SUCCESS;
+}
 
 int NetIfList(std::list <ComObjPtr <HostNetworkInterface> > &list)
@@ -401 +470 @@
                                     ULONG uComponentStatus;
                                     hr = pMpNcc->GetDeviceStatus(&uComponentStatus);
-#ifndef DEBUG_bird
-                                    Assert(hr == S_OK);
-#endif
+//#ifndef DEBUG_bird
+//                                    Assert(hr == S_OK);
+//#endif
                                     if(hr == S_OK)
                                     {
                                         if(uComponentStatus == 0)
                                         {
-                                            vboxNetWinAddComponent(&list, pMpNcc);
+                                            vboxNetWinAddComponent(&list, pMpNcc, true);
                                         }
                                     }
@@ -435 +504 @@
         VBoxNetCfgWinReleaseINetCfg(pNc, FALSE);
     }
+
+    NetIfListHostAdapters(list);
 #endif /* #  if defined VBOX_WITH_NETFLT */
     return VINF_SUCCESS;
 }
-
-int NetIfListTap(std::list <ComObjPtr <HostNetworkInterface> > &list)
-{
-#ifndef VBOX_WITH_NETFLT
-    /* VBoxNetAdp is available only when VBOX_WITH_NETFLT is enabled */
-    return VERR_NOT_IMPLEMENTED;
-#else /* #  if defined VBOX_WITH_NETFLT */
-    INetCfg              *pNc;
-    INetCfgComponent     *pMpNcc;
-    LPWSTR               lpszApp = NULL;
-    HRESULT              hr;
-    IEnumNetCfgComponent  *pEnumComponent;
-
-    /* we are using the INetCfg API for getting the list of miniports */
-    hr = VBoxNetCfgWinQueryINetCfg( FALSE,
-                       VBOX_APP_NAME,
-                       &pNc,
-                       &lpszApp );
-    Assert(hr == S_OK);
-    if(hr == S_OK)
-    {
-        hr = VBoxNetCfgWinGetComponentEnum(pNc, &GUID_DEVCLASS_NET, &pEnumComponent);
-        if(hr == S_OK)
-        {
-            while((hr = VBoxNetCfgWinGetNextComponent(pEnumComponent, &pMpNcc)) == S_OK)
-            {
-                ULONG uComponentStatus;
-                hr = pMpNcc->GetDeviceStatus(&uComponentStatus);
-#ifndef DEBUG_bird
-                Assert(hr == S_OK);
-#endif
-                if(hr == S_OK)
-                {
-                    if(uComponentStatus == 0)
-                    {
-                        LPWSTR pId;
-                        hr = pMpNcc->GetId(&pId);
-                        Assert(hr == S_OK);
-                        if(hr == S_OK)
-                        {
-                            if(!_wcsnicmp(pId, L"sun_VBoxNetAdp", sizeof(L"sun_VBoxNetAdp")/2))
-                            {
-                                vboxNetWinAddComponent(&list, pMpNcc);
-                            }
-                            CoTaskMemFree(pId);
-                        }
-                    }
-                }
-                VBoxNetCfgWinReleaseRef(pMpNcc);
-            }
-            Assert(hr == S_OK || hr == S_FALSE);
-
-            VBoxNetCfgWinReleaseRef(pEnumComponent);
-        }
-        else
-        {
-            LogRel(("failed to get the sun_VBoxNetFlt component, error (0x%x)", hr));
-        }
-
-        VBoxNetCfgWinReleaseINetCfg(pNc, FALSE);
-    }
-    else if(lpszApp)
-    {
-        CoTaskMemFree(lpszApp);
-    }
-#endif /* #  if defined VBOX_WITH_NETFLT */
-    return VINF_SUCCESS;
-}

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -607 +607 @@
     <xsd:element name="HostOnlyNetwork">
       <xsd:complexType>
+        <xsd:attribute name="name" type="xsd:string" use="optional"/>
       </xsd:complexType>
     </xsd:element>