Changeset 17323 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 4, 2009 7:34:16 AM (16 years ago)

Author:

vboxsync

Message:

VBoxManage: additional hostif->bridged, hostonly fixes for windows

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageInfo.cpp (modified) (2 diffs)
• VBoxManageModifyVM.cpp (modified) (1 diff)

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

@@ -176 +176 @@
                  "                            [-nictracefile<1-N> <filename>]\n"
                  "                            [-nicspeed<1-N> <kbps>]\n"
-                 "                            [-bridgeddev<1-N> none|<devicename>]\n"
+                 "                            [-bridgeadapter<1-N> none|<devicename>]\n"
 #if (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT))
-                 "                            [-hostonlydev<1-N> none|<devicename>]\n"
+                 "                            [-hostonlyadapter<1-N> none|<devicename>]\n"
 #endif
                  "                            [-intnet<1-N> <network name>]\n"

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

@@ -685 +685 @@
                     case NetworkAttachmentType_Bridged:
                     {
-                        Bstr strBridgedDev;
-                        nic->COMGETTER(HostInterface)(strBridgedDev.asOutParam());
+                        Bstr strBridgeAdp;
+                        nic->COMGETTER(HostInterface)(strBridgeAdp.asOutParam());
                         if (details == VMINFO_MACHINEREADABLE)
                         {
-                            RTPrintf("bridgeddev%d=\"%lS\"\n", currentNIC + 1, strBridgedDev.raw());
+                            RTPrintf("bridgeadapter%d=\"%lS\"\n", currentNIC + 1, strBridgeAdp.raw());
                             strAttachment = "bridged";
                         }
                         else
-                            strAttachment = Utf8StrFmt("Bridged Interface '%lS'", strBridgedDev.raw());
+                            strAttachment = Utf8StrFmt("Bridged Interface '%lS'", strBridgeAdp.raw());
                         break;
                     }
@@ -711 +711 @@
                     case NetworkAttachmentType_HostOnly:
                     {
+#if (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT))
+                        Bstr strHostonlyAdp;
+                        nic->COMGETTER(HostInterface)(strHostonlyAdp.asOutParam());
+#endif
                         if (details == VMINFO_MACHINEREADABLE)
                         {
+#if (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT))
+                            RTPrintf("hostonlyadapter%d=\"%lS\"\n", currentNIC + 1, strHostonlyAdp.raw());
+#endif
                             strAttachment = "hostonly";
                         }
                         else
+#if (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT))
+                            strAttachment = Utf8StrFmt("Host-only Interface '%lS'", strHostonlyAdp.raw());
+#else
                             strAttachment = "Host-only Network";
+#endif
                         break;
                     }

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

@@ -442 +442 @@
             i++;
         }
-        else if (  strncmp(a->argv[i], "-bridgeddev", 11) == 0
-                || strncmp(a->argv[i], "-hostonlydev", 12) == 0
+        else if (  strncmp(a->argv[i], "-bridgeadapter", 11) == 0
+                || strncmp(a->argv[i], "-hostonlyadapter", 12) == 0
                 || strncmp(a->argv[i], "-hostifdev", 10) == 0) /* backward compatibility */
         {