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

Timestamp:

Feb 4, 2009 11:26:01 AM (16 years ago)

Author:

vboxsync

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

42425

Message:

#2954 & #3569: Linux TAP driver is embedded to vboxnetflt. API, VBoxManage and VirtualBox now provide host-only network attachment on Linux.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManage.cpp (modified) (1 diff)
• VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• VBoxManage/VBoxManageModifyVM.cpp (modified) (1 diff)
• VirtualBox/src/VBoxGlobal.cpp (modified) (1 diff)
• VirtualBox/src/VBoxVMSettingsNetwork.cpp (modified) (2 diffs)

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

@@ -361 +361 @@
                  "                            [-floppy disabled|empty|<uuid>|\n"
                  "                                     <filename>|host:<drive>]\n"
+#ifdef RT_OS_LINUX
+                 "                            [-nic<1-N> none|null|nat|hostif|intnet|hostonly]\n"
+#else /* !RT_OS_LINUX */
                  "                            [-nic<1-N> none|null|nat|hostif|intnet]\n"
+#endif /* !RT_OS_LINUX */
                  "                            [-nictype<1-N> Am79C970A|Am79C973"
 #ifdef VBOX_WITH_E1000

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

@@ -699 +699 @@
                         break;
                     }
+                    case NetworkAttachmentType_HostOnly:
+                    {
+                        if (details == VMINFO_MACHINEREADABLE)
+                        {
+                            strAttachment = "hostonly";
+                        }
+                        else
+                            strAttachment = "Host-only Network";
+                        break;
+                    }
                     default:
                         strAttachment = "unknown";

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

@@ -1388 +1388 @@
                     CHECK_ERROR_RET(nic, AttachToInternalNetwork(), 1);
                 }
+#ifdef RT_OS_LINUX
+                else if (strcmp(nics[n], "hostonly") == 0)
+                {
+                    CHECK_ERROR_RET(nic, COMSETTER(Enabled) (TRUE), 1);
+                    CHECK_ERROR_RET(nic, AttachToHostOnlyNetwork(), 1);
+                }
+#endif /* RT_OS_LINUX */
                 else
                 {

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -3421 +3421 @@
     mNetworkAttachmentTypes [KNetworkAttachmentType_Internal] =
         tr ("Internal Network", "NetworkAttachmentType");
+    mNetworkAttachmentTypes [KNetworkAttachmentType_HostOnly] =
+        tr ("Host-only Network", "NetworkAttachmentType");
 
     mClipboardTypes [KClipboardMode_Disabled] =

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsNetwork.cpp

@@ -143 +143 @@
         case KNetworkAttachmentType_Internal:
             mAdapter.AttachToInternalNetwork();
+            break;
+        case KNetworkAttachmentType_HostOnly:
+            mAdapter.AttachToHostOnlyNetwork();
             break;
         default:
@@ -352 +355 @@
     mCbNAType->setItemData (3,
         mCbNAType->itemText(3), Qt::ToolTipRole);
+#ifdef RT_OS_LINUX
+    mCbNAType->insertItem (4,
+        vboxGlobal().toString (KNetworkAttachmentType_HostOnly));
+    mCbNAType->setItemData (4,
+        mCbNAType->itemText(4), Qt::ToolTipRole);
+#endif /* RT_OS_LINUX */
     /* Set the old value */
     mCbNAType->setCurrentIndex (currentAttachment);