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

Timestamp:

May 5, 2010 10:59:38 PM (15 years ago)

Author:

vboxsync

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

61177

Message:

FE/VBoxManage: add support for VDE networking. Contributed by Renzo Davoli, VirtualSquare?, University of Bologna

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

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

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

@@ -41 +41 @@
         $(if $(VBOX_WITH_SCSI), VBOX_WITH_SCSI) \
         $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS) \
-        $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL) \
-        $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API)
+        $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL) \
+        $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API) \
+        $(if $(VBOX_WITH_VDE), VBOX_WITH_VDE)
  VBoxManage_DEFS.win   = _WIN32_WINNT=0x0500
  ifdef VBOX_DYNAMIC_NET_ATTACH

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

@@ -185 +185 @@
                  "                            [--biospxedebug on|off]\n"
                  "                            [--boot<1-4> none|floppy|dvd|disk|net>]\n"
-#if 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|bridged|intnet]\n"
-#endif /* !RT_OS_LINUX && !RT_OS_DARWIN  */
+                 "                            [--nic<1-N> none|null|nat|bridged|intnet"
+#if defined(VBOX_WITH_NETFLT) /* RT_OS_LINUX || RT_OS_DARWIN */
+                 "|hostonly"
+#endif
+#ifdef VBOX_WITH_VDE
+                 "|vde"
+#endif
+                 "]\n"
                  "                            [--nictype<1-N> Am79C970A|Am79C973"
 #ifdef VBOX_WITH_E1000
@@ -209 +212 @@
                  "                            [--intnet<1-N> <network name>]\n"
                  "                            [--natnet<1-N> <network>|default]\n"
+#ifdef VBOX_WITH_VDE
+                 "                            [--vdenet<1-N> <network>|default]\n"
+#endif
                  "                            [--natsettings<1-N> \"[<mtu>],[<socksnd>],[<sockrcv>],\n"
                  "                                                         [<tcpsnd>],[<tcprcv>]\"]\n"

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

@@ -893 +893 @@
                     }
 #endif
+#ifdef VBOX_WITH_VDE
+                    case NetworkAttachmentType_VDE:
+                    {
+                        Bstr strVDEAdp;
+                        nic->COMGETTER(VDENetwork)(strVDEAdp.asOutParam());
+                        if (details == VMINFO_MACHINEREADABLE)
+                        {
+                            RTPrintf("vdenet%d=\"%lS\"\n", currentNIC + 1, strVDEAdp.raw());
+                            strAttachment = "VDE";
+                        }
+                        else
+                            strAttachment = Utf8StrFmt("VDE Network '%lS'", strVDEAdp.raw());
+                        break;
+                    }
+#endif
                     default:
                         strAttachment = "unknown";

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

@@ -112 +112 @@
     MODIFYVM_INTNET,
     MODIFYVM_NATNET,
+#ifdef VBOX_WITH_VDE
+    MODIFYVM_VDENET,
+#endif
     MODIFYVM_NATBINDIP,
     MODIFYVM_NATSETTINGS,
@@ -220 +223 @@
     { "--intnet",                   MODIFYVM_INTNET,                    RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--natnet",                   MODIFYVM_NATNET,                    RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
+#ifdef VBOX_WITH_VDE
+    { "--vdenet",                   MODIFYVM_VDENET,                    RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
+#endif
     { "--natbindip",                MODIFYVM_NATBINDIP,                 RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--natsettings",              MODIFYVM_NATSETTINGS,               RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
@@ -1191 +1197 @@
                 }
 #endif
+#ifdef VBOX_WITH_VDE
+                else if (!strcmp(ValueUnion.psz, "vde"))
+                {
+
+                    CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
+                    CHECK_ERROR(nic, AttachToVDE());
+                }
+#endif
                 else
                 {
@@ -1249 +1263 @@
             }
 
+#ifdef VBOX_WITH_VDE
+            case MODIFYVM_VDENET:
+            {
+                ComPtr<INetworkAdapter> nic;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                if (!strcmp(ValueUnion.psz, "default"))
+                {
+                    CHECK_ERROR(nic, COMSETTER(VDENetwork)(NULL));
+                }
+                else
+                {
+                    CHECK_ERROR(nic, COMSETTER(VDENetwork)(Bstr(ValueUnion.psz)));
+                }
+                break;
+            }
+#endif
             case MODIFYVM_NATNET:
             {