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

Timestamp:

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

Author:

vboxsync

Message:

VBoxManage: hostif->bridged, hostonly fixes for windows

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxManageHelp.cpp (modified) (3 diffs)
• VBoxManageInfo.cpp (modified) (1 diff)
• VBoxManageList.cpp (modified) (6 diffs)
• VBoxManageModifyVM.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -43 +43 @@
         $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API)
  VBoxManage_DEFS.win   = _WIN32_WINNT=0x0500
+ifdef VBOX_WITH_NETFLT
+ VBoxManage_DEFS += VBOX_WITH_NETFLT
+endif 
  VBoxManage_SOURCES = \
         VBoxManage.cpp \

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

@@ -76 +76 @@
     {
         RTPrintf("VBoxManage list [--long|-l] vms|runningvms|ostypes|hostdvds|hostfloppies|\n"
-                 "                            hostifs|hostinfo|hddbackends|hdds|dvds|floppies|\n"
+#if (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT))
+                "                            bridgedifs|hostonlyifs|hostinfo|hddbackends|hdds|dvds|floppies|\n"
+#else
+                "                            bridgedifs|hostinfo|hddbackends|hdds|dvds|floppies|\n"
+#endif
+
                  "                            usbhost|usbfilters|systemproperties\n"
                  "\n");
@@ -157 +162 @@
                  "                            [-floppy disabled|empty|<uuid>|\n"
                  "                                     <filename>|host:<drive>]\n"
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
-                 "                            [-nic<1-N> none|null|nat|hostif|intnet|hostonly]\n"
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT))
+                 "                            [-nic<1-N> none|null|nat|bridged|intnet|hostonly]\n"
 #else /* !RT_OS_LINUX && !RT_OS_DARWIN */
-                 "                            [-nic<1-N> none|null|nat|hostif|intnet]\n"
+                 "                            [-nic<1-N> none|null|nat|bridged|intnet]\n"
 #endif /* !RT_OS_LINUX && !RT_OS_DARWIN  */
                  "                            [-nictype<1-N> Am79C970A|Am79C973"
@@ -171 +176 @@
                  "                            [-nictracefile<1-N> <filename>]\n"
                  "                            [-nicspeed<1-N> <kbps>]\n"
-                 "                            [-hostifdev<1-N> none|<devicename>]\n"
+                 "                            [-bridgeddev<1-N> none|<devicename>]\n"
+#if (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT))
+                 "                            [-hostonlydev<1-N> none|<devicename>]\n"
+#endif
                  "                            [-intnet<1-N> <network name>]\n"
                  "                            [-natnet<1-N> <network>|default]\n"

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

@@ -685 +685 @@
                     case NetworkAttachmentType_Bridged:
                     {
-                        Bstr strHostIfDev;
-                        nic->COMGETTER(HostInterface)(strHostIfDev.asOutParam());
+                        Bstr strBridgedDev;
+                        nic->COMGETTER(HostInterface)(strBridgedDev.asOutParam());
                         if (details == VMINFO_MACHINEREADABLE)
                         {
-                            RTPrintf("hostifdev%d=\"%lS\"\n", currentNIC + 1, strHostIfDev.raw());
-                            strAttachment = "hostif";
+                            RTPrintf("bridgeddev%d=\"%lS\"\n", currentNIC + 1, strBridgedDev.raw());
+                            strAttachment = "bridged";
                         }
                         else
-                            strAttachment = Utf8StrFmt("Host Interface '%lS'", strHostIfDev.raw());
+                            strAttachment = Utf8StrFmt("Bridged Interface '%lS'", strBridgedDev.raw());
                         break;
                     }

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

@@ -44 +44 @@
 
 #ifdef VBOX_WITH_HOSTNETIF_API
-static const char *getHostIfTypeText(HostNetworkInterfaceMediumType_T enmType)
+static const char *getHostIfMediumTypeText(HostNetworkInterfaceMediumType_T enmType)
 {
     switch (enmType)
@@ -73 +73 @@
     LISTHOSTDVDS,
     LISTHOSTFLOPPIES,
-    LISTHOSTIFS,
+    LISTBRIDGEDIFS,
+#if (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT))
+    LISTHOSTONLYIFS,
+#endif
     LISTHOSTINFO,
     LISTHDDBACKENDS,
@@ -92 +95 @@
         { "hostdvds",           LISTHOSTDVDS, RTGETOPT_REQ_NOTHING },
         { "hostfloppies",       LISTHOSTFLOPPIES, RTGETOPT_REQ_NOTHING },
-        { "hostifs",            LISTHOSTIFS, RTGETOPT_REQ_NOTHING },
+        { "hostifs",             LISTBRIDGEDIFS, RTGETOPT_REQ_NOTHING }, /* backward compatibility */
+        { "bridgedifs",          LISTBRIDGEDIFS, RTGETOPT_REQ_NOTHING },
+        #if (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT))
+        { "hostonlyifs",          LISTHOSTONLYIFS, RTGETOPT_REQ_NOTHING },
+#endif
         { "hostinfo",           LISTHOSTINFO, RTGETOPT_REQ_NOTHING },
         { "hddbackends",        LISTHDDBACKENDS, RTGETOPT_REQ_NOTHING },
@@ -128 +135 @@
             case LISTHOSTDVDS:
             case LISTHOSTFLOPPIES:
-            case LISTHOSTIFS:
+            case LISTBRIDGEDIFS:
+#if (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT))
+            case LISTHOSTONLYIFS:
+#endif
             case LISTHOSTINFO:
             case LISTHDDBACKENDS:
@@ -283 +293 @@
         break;
 
-        case LISTHOSTIFS:
+        case LISTBRIDGEDIFS:
+#if (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT))
+        case LISTHOSTONLYIFS:
+#endif
         {
             ComPtr<IHost> host;
             CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam()));
             com::SafeIfaceArray <IHostNetworkInterface> hostNetworkInterfaces;
+#if (defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT))
+            CHECK_ERROR(host,
+                    FindHostNetworkInterfacesOfType (
+                            command == LISTBRIDGEDIFS ? HostNetworkInterfaceType_Bridged : HostNetworkInterfaceType_HostOnly,
+                            ComSafeArrayAsOutParam (hostNetworkInterfaces)));
+#else
             CHECK_ERROR(host,
                         COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces)));
+#endif
             for (size_t i = 0; i < hostNetworkInterfaces.size(); ++i)
             {
@@ -334 +354 @@
                 HostNetworkInterfaceMediumType_T Type;
                 networkInterface->COMGETTER(MediumType)(&Type);
-                RTPrintf("Type:            %s\n", getHostIfTypeText(Type));
+                RTPrintf("MediumType:            %s\n", getHostIfMediumTypeText(Type));
                 HostNetworkInterfaceStatus_T Status;
                 networkInterface->COMGETTER(Status)(&Status);

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

@@ -442 +442 @@
             i++;
         }
-        else if (strncmp(a->argv[i], "-hostifdev", 10) == 0)
+        else if (  strncmp(a->argv[i], "-bridgeddev", 11) == 0
+                || strncmp(a->argv[i], "-hostonlydev", 12) == 0
+                || strncmp(a->argv[i], "-hostifdev", 10) == 0) /* backward compatibility */
         {
             unsigned n = parseNum(&a->argv[i][10], NetworkAdapterCount, "NIC");
@@ -1381 +1383 @@
                     CHECK_ERROR_RET(nic, AttachToNAT(), 1);
                 }
-                else if (strcmp(nics[n], "hostif") == 0)
+                else if (  strcmp(nics[n], "bridged") == 0
+                        || strcmp(nics[n], "hostif") == 0) /* backward compatibility */
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(Enabled) (TRUE), 1);