Changeset 17679 in vbox

Timestamp:

Mar 11, 2009 11:39:18 AM (16 years ago)

Author:

vboxsync

Message:

Main/Hostonly: not specify name on Create

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageHostonly.cpp (modified) (3 diffs)
• Frontends/VirtualBox/include/VBoxProblemReporter.h (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxProblemReporter.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxVMSettingsNetwork.cpp (modified) (2 diffs)
• Main/HostImpl.cpp (modified) (2 diffs)
• Main/generic/NetIf-generic.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/HostImpl.h (modified) (1 diff)
• Main/include/netif.h (modified) (1 diff)
• Main/win/NetIfList-win.cpp (modified) (12 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHostonly.cpp

@@ -54 +54 @@
 static int handleCreate(HandlerArg *a, int iStart, int *pcProcessed)
 {
-    if (a->argc - iStart < 1)
-        return errorSyntax(USAGE_HOSTONLYIFS, "Not enough parameters");
+//    if (a->argc - iStart < 1)
+//        return errorSyntax(USAGE_HOSTONLYIFS, "Not enough parameters");
 
     int index = iStart;
     HRESULT rc;
-    Bstr name(a->argv[iStart]);
-    index++;
+//    Bstr name(a->argv[iStart]);
+//    index++;
 
     ComPtr<IHost> host;
@@ -68 +68 @@
     ComPtr<IProgress> progress;
 
-    CHECK_ERROR(host, CreateHostOnlyNetworkInterface (name, hif.asOutParam(), progress.asOutParam()));
+    CHECK_ERROR(host, CreateHostOnlyNetworkInterface (hif.asOutParam(), progress.asOutParam()));
 
     showProgress(progress);
@@ -87 +87 @@
         return 1;
     }
+
+    Bstr name;
+    CHECK_ERROR(hif, COMGETTER(Name) (name.asOutParam()));
+
+    RTPrintf("Interface '%lS' was successfully created\n", name.raw());
 
     return 0;

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -300 +300 @@
 #if defined Q_WS_WIN
     int confirmDeletingHostInterface (const QString &aName, QWidget *aParent = 0);
-    void cannotCreateHostInterface (const CHost &aHost, const QString &aName,
+    void cannotCreateHostInterface (const CHost &aHost,
                                     QWidget *aParent = 0);
     void cannotCreateHostInterface (const CProgress &aProgress, const QString &aName,

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

@@ -1439 +1439 @@
 
 void VBoxProblemReporter::cannotCreateHostInterface (
-    const CHost &host, const QString &name, QWidget *parent)
+    const CHost &host, QWidget *parent)
 {
     message (parent ? parent : mainWindowShown(), Error,
-        tr ("Failed to create the host network interface <b>%1</b>.")
-            .arg (name),
+        tr ("Failed to create the host network interface ."),
         formatErrorInfo (host));
 }

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

@@ -546 +546 @@
     }
 
-    /* Creating add host interface dialog */
-    VBoxAddNIDialog dlg (this, ifaceName.arg (++ ifaceNumber));
-    if (dlg.exec() != QDialog::Accepted)
-        return;
-    QString iName = dlg.getName();
-
     /* Create interface */
     CHost host = vboxGlobal().virtualBox().GetHost();
     CHostNetworkInterface iFace;
-    CProgress progress = host.CreateHostOnlyNetworkInterface (iName, iFace);
+    CProgress progress = host.CreateHostOnlyNetworkInterface (iFace);
     if (host.isOk())
     {
+        QString iName = iFace.GetName();
+
         vboxProblem().showModalProgressDialog (progress, iName, this);
         /* Add&Select newly created interface */
@@ -566 +562 @@
     }
     else
-        vboxProblem().cannotCreateHostInterface (host, iName, this);
+        vboxProblem().cannotCreateHostInterface (host, this);
 
     emit listChanged();

trunk/src/VBox/Main/HostImpl.cpp

@@ -1316 +1316 @@
 
 STDMETHODIMP
-Host::CreateHostOnlyNetworkInterface (IN_BSTR aName,
-                                  IHostNetworkInterface **aHostNetworkInterface,
+Host::CreateHostOnlyNetworkInterface (IHostNetworkInterface **aHostNetworkInterface,
                                   IProgress **aProgress)
 {
-    CheckComArgNotNull(aName);
     CheckComArgOutPointerValid(aHostNetworkInterface);
     CheckComArgOutPointerValid(aProgress);
@@ -1327 +1325 @@
     CHECK_READY();
 
-    /* first check whether an interface with the given name already exists */
-    {
-        ComPtr <IHostNetworkInterface> iface;
-        if (SUCCEEDED (FindHostNetworkInterfaceByName (aName, iface.asOutParam())))
-            return setError (E_INVALIDARG,
-                             tr ("Host network interface '%ls' already exists"), aName);
-    }
-
-    int r = NetIfCreateHostOnlyNetworkInterface (mParent, aName, aHostNetworkInterface, aProgress);
+    int r = NetIfCreateHostOnlyNetworkInterface (mParent, aHostNetworkInterface, aProgress);
     if(RT_SUCCESS(r))
     {

trunk/src/VBox/Main/generic/NetIf-generic.cpp

@@ -38 +38 @@
 }
 
-int NetIfCreateHostOnlyNetworkInterface (VirtualBox *pVbox, IN_BSTR aName, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress)
+int NetIfCreateHostOnlyNetworkInterface (VirtualBox *pVbox, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress)
 {
     return VERR_NOT_IMPLEMENTED;

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

@@ -6609 +6609 @@
   <interface
      name="IHost" extends="$unknown"
-     uuid="378cf146-6cd6-4dbc-bc60-cbd2004d99c5"
+     uuid="651f04ec-b2a6-4008-b979-3a01c0fc72cc"
      wsmap="managed"
      >
@@ -6764 +6764 @@
         </result>
       </desc>
-      <param name="name" type="wstring" dir="in">
-        <desc>
-          Adapter name.
-        </desc>
-      </param>
       <param name="hostInterface" type="IHostNetworkInterface" dir="out">
         <desc>

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

@@ -96 +96 @@
 #ifdef RT_OS_WINDOWS
 
-    STDMETHOD(CreateHostOnlyNetworkInterface) (IN_BSTR aName,
-                                           IHostNetworkInterface **aHostNetworkInterface,
+    STDMETHOD(CreateHostOnlyNetworkInterface) (IHostNetworkInterface **aHostNetworkInterface,
                                            IProgress **aProgress);
     STDMETHOD(RemoveHostOnlyNetworkInterface) (IN_GUID aId,

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 NetIfCreateHostOnlyNetworkInterface (VirtualBox *pVbox, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress);
 int NetIfRemoveHostOnlyNetworkInterface (VirtualBox *pVbox, IN_GUID aId, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress);
 int NetIfGetConfig(HostNetworkInterface * pIf, NETIFINFO *);

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

@@ -64 +64 @@
 #include <cfgmgr32.h>
 
+#define VBOX_APP_NAME L"VirtualBox"
 
 static HRESULT netIfWinCreateIWbemServices(IWbemServices ** ppSvc)
@@ -861 +862 @@
             vrc = aClient->write (d->msgCode);
             if (RT_FAILURE (vrc)) break;
-            vrc = aClient->write (Utf8Str (d->name));
-            if (RT_FAILURE (vrc)) break;
+//            vrc = aClient->write (Utf8Str (d->name));
+//            if (RT_FAILURE (vrc)) break;
 
             /* wait for a reply */
@@ -879 +880 @@
                         /* read the GUID */
                         Guid guid;
+                        Utf8Str name;
+                        vrc = aClient->read (name);
+                        if (RT_FAILURE (vrc)) break;
                         vrc = aClient->read (guid);
                         if (RT_FAILURE (vrc)) break;
@@ -886 +890 @@
                         /* initialize the object returned to the caller by
                          * CreateHostOnlyNetworkInterface() */
-                        rc = d->iface->init (d->name, guid, HostNetworkInterfaceType_HostOnly);
+                        rc = d->iface->init (Bstr(name), guid, HostNetworkInterfaceType_HostOnly);
                         endLoop = true;
                         break;
@@ -1273 +1277 @@
 /* static */
 static int createNetworkInterface (SVCHlpClient *aClient,
-                                  const Utf8Str &aName,
+                                  BSTR * pName,
                                   Guid &aGUID, Utf8Str &aErrMsg)
 {
     LogFlowFuncEnter();
-    LogFlowFunc (("Network connection name = '%s'\n", aName.raw()));
+//    LogFlowFunc (("Network connection name = '%s'\n", aName.raw()));
 
     AssertReturn (aClient, VERR_INVALID_POINTER);
-    AssertReturn (!aName.isNull(), VERR_INVALID_PARAMETER);
+//    AssertReturn (!aName.isNull(), VERR_INVALID_PARAMETER);
 
     int vrc = VINF_SUCCESS;
@@ -1509 +1513 @@
                                &dwValueType, (LPBYTE) pCfgGuidString, &cbSize);
         RegCloseKey (hkey);
-
-        ret = RenameConnection (pCfgGuidString, Bstr (aName));
-        if (FAILED (ret))
-            SetErrBreak (("Failed to set interface name (ret=0x%08X, "
-                          "pCfgGuidString='%ls', cbSize=%d)",
-                           ret, pCfgGuidString, cbSize));
     }
     while (0);
@@ -1548 +1546 @@
         LogFlowFunc (("Network connection GUID = {%RTuuid}\n", aGUID.raw()));
         Assert (!aGUID.isEmpty());
+
+        INetCfg              *pNc;
+        INetCfgComponent     *pMpNcc;
+        LPWSTR               lpszApp;
+
+        HRESULT hr = VBoxNetCfgWinQueryINetCfg( FALSE,
+                           VBOX_APP_NAME,
+                           &pNc,
+                           &lpszApp );
+        if(hr == S_OK)
+        {
+            hr = VBoxNetCfgWinGetComponentByGuid(pNc,
+                                            &GUID_DEVCLASS_NET,
+                                            aGUID.asOutParam(),
+                                            &pMpNcc);
+            if(hr == S_OK)
+            {
+                LPWSTR name;
+                hr = pMpNcc->GetDisplayName(&name);
+                if(hr == S_OK)
+                {
+                    Bstr str(name);
+                    str.detachTo(pName);
+
+                    CoTaskMemFree (name);
+                }
+
+                VBoxNetCfgWinReleaseRef(pMpNcc);
+            }
+            VBoxNetCfgWinReleaseINetCfg(pNc, FALSE);
+        }
+
+        if(hr != S_OK)
+        {
+            vrc = VERR_GENERAL_FAILURE;
+        }
+
     }
 
@@ -1785 +1820 @@
             LogFlowFunc (("CreateHostOnlyNetworkInterface:\n"));
 
-            Utf8Str name;
-            vrc = aClient->read (name);
-            if (RT_FAILURE (vrc)) break;
+//            Utf8Str name;
+//            vrc = aClient->read (name);
+//            if (RT_FAILURE (vrc)) break;
 
             Guid guid;
             Utf8Str errMsg;
-            vrc = createNetworkInterface (aClient, name, guid, errMsg);
+            Bstr name;
+            vrc = createNetworkInterface (aClient, name.asOutParam(), guid, errMsg);
 
             if (RT_SUCCESS (vrc))
@@ -1797 +1833 @@
                 /* write success followed by GUID */
                 vrc = aClient->write (SVCHlpMsg::CreateHostOnlyNetworkInterface_OK);
+                if (RT_FAILURE (vrc)) break;
+                vrc = aClient->write (Utf8Str (name));
                 if (RT_FAILURE (vrc)) break;
                 vrc = aClient->write (guid);
@@ -2006 +2044 @@
 
 /* end */
-
-# define VBOX_APP_NAME L"VirtualBox"
 
 static int vboxNetWinAddComponent(std::list <ComObjPtr <HostNetworkInterface> > * pPist, INetCfgComponent * pncc, HostNetworkInterfaceType enmType)
@@ -2143 +2179 @@
 }
 
-int NetIfCreateHostOnlyNetworkInterface (VirtualBox *pVBox, IN_BSTR aName,
+int NetIfCreateHostOnlyNetworkInterface (VirtualBox *pVBox,
                                   IHostNetworkInterface **aHostNetworkInterface,
                                   IProgress **aProgress)
@@ -2174 +2210 @@
 
             d->msgCode = SVCHlpMsg::CreateHostOnlyNetworkInterface;
-            d->name = aName;
+//            d->name = aName;
             d->iface = iface;