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

Timestamp:

Mar 13, 2009 3:51:55 PM (16 years ago)

Author:

vboxsync

Message:

VBoxManage hostonly-related fixes.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

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

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

@@ -181 +181 @@
                  "                            [-nicspeed<1-N> <kbps>]\n"
                  "                            [-bridgeadapter<1-N> none|<devicename>]\n"
-#if (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT))
+#if defined(VBOX_WITH_NETFLT)
                  "                            [-hostonlyadapter<1-N> none|<devicename>]\n"
 #endif

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

@@ -717 +717 @@
                     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

@@ -443 +443 @@
             i++;
         }
-        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 */
+        else if (strncmp(a->argv[i], "-hostifdev", 10) == 0) /* backward compatibility */
         {
             unsigned n = parseNum(&a->argv[i][10], NetworkAdapterCount, "NIC");
+            if (!n)
+                return 1;
+            if (a->argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", a->argv[i]);
+            hostifdev[n - 1] = a->argv[i + 1];
+            i++;
+        }
+        else if (  strncmp(a->argv[i], "-bridgeadapter", 14) == 0)
+        {
+            unsigned n = parseNum(&a->argv[i][14], NetworkAdapterCount, "NIC");
+            if (!n)
+                return 1;
+            if (a->argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", a->argv[i]);
+            hostifdev[n - 1] = a->argv[i + 1];
+            i++;
+        }
+        else if (strncmp(a->argv[i], "-hostonlyadapter", 16) == 0)
+        {
+            unsigned n = parseNum(&a->argv[i][16], NetworkAdapterCount, "NIC");
             if (!n)
                 return 1;