Changeset 77804 in vbox for trunk/src/VBox/Main/src-server/win

Timestamp:

Mar 20, 2019 8:05:37 AM (6 years ago)

Author:

vboxsync

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

129475

Message:

NetAdp/Win: (bugref:9409) Store host-only adapter configuration in extra data. Create missing adapters when listing/creating/removing adapters.

File:

• trunk/src/VBox/Main/src-server/win/NetIf-win.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-server/win/NetIf-win.cpp

@@ -302 +302 @@
             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 */
@@ -337 +337 @@
                             {
                                 rc = d->iface->updateConfig();
+                                if (SUCCEEDED(rc))
+                                    rc = d->iface->i_updatePersistentConfig();
                             }
                         }
@@ -678 +680 @@
             LogFlowFunc(("CreateHostOnlyNetworkInterface:\n"));
 
-//            Utf8Str name;
-//            vrc = aClient->read(name);
-//            if (RT_FAILURE(vrc)) break;
+            Utf8Str desiredName;
+            vrc = aClient->read(desiredName);
+            if (RT_FAILURE(vrc)) break;
 
             Guid guid;
@@ -689 +691 @@
 #ifdef VBOXNETCFG_DELAYEDRENAME
             Bstr devId;
-            hrc = VBoxNetCfgWinCreateHostOnlyNetworkInterface(NULL, false, guid.asOutParam(), devId.asOutParam(),
+            hrc = VBoxNetCfgWinCreateHostOnlyNetworkInterface(NULL, false, Bstr(desiredName).raw(), guid.asOutParam(), devId.asOutParam(),
                                                               bstrErr.asOutParam());
 #else /* !VBOXNETCFG_DELAYEDRENAME */
-            hrc = VBoxNetCfgWinCreateHostOnlyNetworkInterface(NULL, false, guid.asOutParam(), name.asOutParam(),
+            hrc = VBoxNetCfgWinCreateHostOnlyNetworkInterface(NULL, false, Bstr(desiredName).raw(), guid.asOutParam(), name.asOutParam(),
                                                               bstrErr.asOutParam());
 #endif /* !VBOXNETCFG_DELAYEDRENAME */
@@ -1146 +1148 @@
                                         IHostNetworkInterface **aHostNetworkInterface,
                                         IProgress **aProgress,
-                                        const char *pszName)
-{
-    RT_NOREF(pszName);
+                                        IN_BSTR aName)
+{
 #ifndef VBOX_WITH_NETFLT
     return VERR_NOT_IMPLEMENTED;
@@ -1177 +1178 @@
 
             d->msgCode = SVCHlpMsg::CreateHostOnlyNetworkInterface;
-//            d->name = aName;
+            d->name = aName;
             d->iface = iface;
             d->vBox = pVirtualBox;