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

Timestamp:

Mar 18, 2009 4:58:40 PM (16 years ago)

Author:

vboxsync

Message:

VBoxManage: defines consistency for dhcpserver and hostonlyif commands

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.cpp (modified) (1 diff)
• VBoxManageDHCPServer.cpp (modified) (1 diff)
• VBoxManageHelp.cpp (modified) (5 diffs)
• VBoxManageInfo.cpp (modified) (2 diffs)
• VBoxManageModifyVM.cpp (modified) (4 diffs)

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

@@ -1725 +1725 @@
         { "import",           handleImportAppliance },
         { "export",           handleExportAppliance },
+#if defined(VBOX_WITH_NETFLT)
         { "hostonlyif",       handleHostonlyIf },
+#endif
         { "dhcpserver",       handleDHCPServer},
         { NULL,               NULL }

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

@@ -1 @@
-/* $Id$ */
+/* $Id: VBoxManageDHCPServer.cpp 44622 2009-03-17 13:48:59Z misha $ */
 /** @file
- * VBoxManage - Implementation of hostonlyif command.
+ * VBoxManage - Implementation of dhcpserver command.
  */
 

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

@@ -76 +76 @@
     {
         RTPrintf("VBoxManage list [--long|-l] vms|runningvms|ostypes|hostdvds|hostfloppies|\n"
-#if (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT))
+#if defined(VBOX_WITH_NETFLT)
                 "                            bridgedifs|hostonlyifs|dhcpservers|hostinfo|\n"
 #else
@@ -155 +155 @@
                  "                            [-floppy disabled|empty|<uuid>|\n"
                  "                                     <filename>|host:<drive>]\n"
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT))
+#if defined(VBOX_WITH_NETFLT)
                  "                            [-nic<1-N> none|null|nat|bridged|intnet|hostonly]\n"
 #else /* !RT_OS_LINUX && !RT_OS_DARWIN */
@@ -489 +489 @@
                  "\n");
     }
-#if !defined(RT_OS_WINDOWS) || defined(VBOX_WITH_NETFLT)
+#if defined(VBOX_WITH_NETFLT)
     if (u64Cmd & USAGE_HOSTONLYIFS)
     {
@@ -504 +504 @@
 #endif
 
-#if !defined(RT_OS_WINDOWS) || defined(VBOX_WITH_NETFLT)
     if (u64Cmd & USAGE_DHCPSERVER)
     {
         RTPrintf("VBoxManage dhcpserver       add|modify -netname <network_name> |\n"
+#if defined(VBOX_WITH_NETFLT)
                  "                                        -ifname <hostonly_if_name>\n"
+#endif
                  "                                [-ip <ip_address>\n"
                  "                                 -netmask <network_mask>\n"
@@ -515 +516 @@
                  "                                [-enable | -disable]\n"
                  "VBoxManage dhcpserver       remove -netname <network_name> |\n"
+#if defined(VBOX_WITH_NETFLT)
                  "                                   -ifname <hostonly_if_name>\n"
-                 "\n");
-    }
-#endif
+#endif
+                 "\n");
+    }
 }
 

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

@@ -715 +715 @@
                         break;
                     }
+#if defined(VBOX_WITH_NETFLT)
                     case NetworkAttachmentType_HostOnly:
                     {
@@ -728 +729 @@
                         break;
                     }
+#endif
                     default:
                         strAttachment = "unknown";

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

@@ -464 +464 @@
             i++;
         }
+#if defined(VBOX_WITH_NETFLT)
         else if (strncmp(a->argv[i], "-hostonlyadapter", 16) == 0)
         {
@@ -474 +475 @@
             i++;
         }
+#endif
         else if (strncmp(a->argv[i], "-intnet", 7) == 0)
         {
@@ -1455 +1457 @@
                     CHECK_ERROR_RET(nic, AttachToInternalNetwork(), 1);
                 }
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT))
+#if defined(VBOX_WITH_NETFLT)
                 else if (strcmp(nics[n], "hostonly") == 0)
                 {
@@ -1462 +1464 @@
                     CHECK_ERROR_RET(nic, AttachToHostOnlyInterface(), 1);
                 }
-#endif /* defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) */
+#endif
                 else
                 {