Changeset 16509 in vbox

Timestamp:

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

Author:

vboxsync

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

Files:

• Frontends/VBoxManage/VBoxManage.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxVMSettingsNetwork.cpp (modified) (2 diffs)
• HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (3 diffs)
• Main/ConsoleImpl2.cpp (modified) (1 diff)
• Main/NetworkAdapterImpl.cpp (modified) (4 diffs)
• Main/idl/VirtualBox.xidl (modified) (4 diffs)
• Main/include/NetworkAdapterImpl.h (modified) (1 diff)
• Main/xml/VirtualBox-settings-common.xsd (modified) (1 diff)

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);

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

@@ -158 +158 @@
 
 
+/*
+ * TAP-related part
+ */
+
+#define VBOX_TAP_NAME "vboxnet%d"
+
+struct net_device *g_pNetDev;
+
+struct VBoxTapPriv
+{
+    struct net_device_stats Stats;
+};
+typedef struct VBoxTapPriv VBOXTAPPRIV;
+typedef VBOXTAPPRIV *PVBOXTAPPRIV;
+
+static int vboxTapOpen(struct net_device *pNetDev)
+{
+    netif_start_queue(pNetDev);
+    printk("vboxTapOpen returns 0\n");
+    return 0;
+}
+
+static int vboxTapStop(struct net_device *pNetDev)
+{
+    netif_stop_queue(pNetDev);
+    return 0;
+}
+
+static int vboxTapXmit(struct sk_buff *pSkb, struct net_device *pNetDev)
+{
+    PVBOXTAPPRIV pPriv = netdev_priv(pNetDev);
+
+    /* Update the stats. */
+    pPriv->Stats.tx_packets++;
+    pPriv->Stats.tx_bytes += pSkb->len;
+    /* Update transmission time stamp. */
+    pNetDev->trans_start = jiffies;
+    /* Nothing else to do, just free the sk_buff. */
+    dev_kfree_skb(pSkb);
+    return 0;
+}
+
+struct net_device_stats *vboxTapGetStats(struct net_device *pNetDev)
+{
+    PVBOXTAPPRIV pPriv = netdev_priv(pNetDev);
+    return &pPriv->Stats;
+}
+
+static int vboxTapValidateAddr(struct net_device *dev)
+{
+    Log(("vboxTapValidateAddr: %02x:%02x:%02x:%02x:%02x:%02x\n",
+         dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2], 
+         dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]));
+    return -EADDRNOTAVAIL;
+}
+
+static void vboxTapNetDevInit(struct net_device *pNetDev)
+{
+    PVBOXTAPPRIV pPriv;
+
+    ether_setup(pNetDev);
+    /// @todo Use Sun vendor id
+    memcpy(pNetDev->dev_addr, "\0vbnet", ETH_ALEN);
+    Log(("vboxTapNetDevInit: pNetDev->dev_addr = %.6Rhxd\n", pNetDev->dev_addr)); 
+    pNetDev->open = vboxTapOpen;
+    pNetDev->stop = vboxTapStop;
+    pNetDev->hard_start_xmit = vboxTapXmit;
+    pNetDev->get_stats = vboxTapGetStats;
+    //pNetDev->validate_addr = vboxTapValidateAddr;
+/*    pNetDev-> = vboxTap;
+    pNetDev-> = vboxTap;
+    pNetDev-> = vboxTap;
+    pNetDev-> = vboxTap;
+    pNetDev-> = vboxTap;*/
+
+    pPriv = netdev_priv(pNetDev);
+    memset(pPriv, 0, sizeof(*pPriv));
+}
+
+static int vboxTapRegisterNetDev(void)
+{
+    int rc;
+    struct net_device *pNetDev;
+
+    /* No need for private data. */
+    pNetDev = alloc_netdev(sizeof(VBOXTAPPRIV), VBOX_TAP_NAME, vboxTapNetDevInit);
+    if (pNetDev)
+    {
+        int err = register_netdev(pNetDev);
+        if (!err)
+        {
+            g_pNetDev = pNetDev;
+            return VINF_SUCCESS;
+        }
+        free_netdev(pNetDev);
+        rc = RTErrConvertFromErrno(err);
+    }
+    return rc;
+}
+
+static int vboxTapUnregisterNetDev(void)
+{
+    unregister_netdev(g_pNetDev);
+    free_netdev(g_pNetDev);
+    g_pNetDev = NULL;
+    return VINF_SUCCESS;
+}
+
 /**
  * Initialize module.
@@ -192 +300 @@
         if (RT_SUCCESS(rc))
         {
-            LogRel(("VBoxNetFlt: Successfully started.\n"));
-            return 0;
-        }
-
-        LogRel(("VBoxNetFlt: failed to initialize device extension (rc=%d)\n", rc));
+            rc = vboxTapRegisterNetDev();
+            if (RT_SUCCESS(rc))
+            {
+                LogRel(("VBoxNetFlt: Successfully started.\n"));
+                return 0;
+            }
+            else
+                LogRel(("VBoxNetFlt: failed to register device (rc=%d)\n", rc));
+        }
+        else
+            LogRel(("VBoxNetFlt: failed to initialize device extension (rc=%d)\n", rc));
         RTR0Term();
     }
@@ -221 +335 @@
      * Undo the work done during start (in reverse order).
      */
+    rc = vboxTapUnregisterNetDev();
+    AssertRC(rc);
     rc = vboxNetFltTryDeleteGlobals(&g_VBoxNetFltGlobals);
     AssertRC(rc); NOREF(rc);

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1598 +1598 @@
             }
 
+            case NetworkAttachmentType_HostOnly:
+            {
+                if (fSniffer)
+                {
+                    rc = CFGMR3InsertNode(pLunL0, "AttachedDriver", &pLunL0);   RC_CHECK();
+                }
+                else
+                {
+                    rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0);             RC_CHECK();
+                }
+
+                rc = CFGMR3InsertString(pLunL0, "Driver", "IntNet");            RC_CHECK();
+                rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg);                 RC_CHECK();
+                rc = CFGMR3InsertString(pCfg, "Trunk", "vboxnet0");             RC_CHECK();
+                rc = CFGMR3InsertInteger(pCfg, "TrunkType", kIntNetTrunkType_NetFlt); RC_CHECK();
+                rc = CFGMR3InsertString(pCfg, "Network", "HostInterfaceNetworking-vboxnet0"); RC_CHECK();
+                break;
+            }
+
             default:
                 AssertMsgFailed(("should not get here!\n"));

trunk/src/VBox/Main/NetworkAdapterImpl.cpp

@@ -780 +780 @@
 }
 
+STDMETHODIMP NetworkAdapter::AttachToHostOnlyNetwork()
+{
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    /* the machine needs to be mutable */
+    Machine::AutoMutableStateDependency adep (mParent);
+    CheckComRCReturnRC (adep.rc());
+
+    AutoWriteLock alock (this);
+
+    /* don't do anything if we're already host interface attached */
+    if (mData->mAttachmentType != NetworkAttachmentType_HostOnly)
+    {
+        mData.backup();
+
+        /* first detach the current attachment */
+        detach();
+
+        mData->mAttachmentType = NetworkAttachmentType_HostOnly;
+
+        /* leave the lock before informing callbacks */
+        alock.unlock();
+
+        mParent->onNetworkAdapterChange (this);
+    }
+
+    return S_OK;
+}
+
 STDMETHODIMP NetworkAdapter::Detach()
 {
@@ -910 +940 @@
     }
     else
+    if (!(attachmentNode = aAdapterNode.findKey ("HostOnlyNetwork")).isNull())
+    {
+        /* Host Interface Networking */
+        rc = AttachToHostOnlyNetwork();
+        CheckComRCReturnRC (rc);
+    }
+    else
     {
         /* Adapter has no children */
@@ -1001 +1038 @@
             break;
         }
+        case NetworkAttachmentType_HostOnly:
+        {
+            Key attachmentNode = aAdapterNode.createKey ("HostOnlyNetwork");
+            break;
+        }
         default:
         {
@@ -1153 +1195 @@
         {
             mData->mInternalNetwork.setNull();
+            break;
+        }
+        case NetworkAttachmentType_HostOnly:
+        {
             break;
         }

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -10226 +10226 @@
   <enum
     name="NetworkAttachmentType"
-    uuid="8730d899-d036-4925-bc63-e58f3486f4bf"
+    uuid="64e770dc-dd1d-4879-9f12-5bd6bc879b78"
   >
     <desc>
@@ -10238 +10238 @@
     <const name="HostInterface"         value="2"/>
     <const name="Internal"              value="3"/>
+    <const name="HostOnly"              value="4"/>
   </enum>
 
@@ -10259 +10260 @@
   <interface
      name="INetworkAdapter" extends="$unknown"
-     uuid="a876d9b1-68d9-43b1-9c68-ddea0a473663"
+     uuid="4a1ee64e-6c5f-47dd-acfa-f834d7cb74fb"
      wsmap="managed"
      >
@@ -10356 +10357 @@
       <desc>
         Attach the network adapter to an internal network.
+      </desc>
+    </method>
+
+    <method name="attachToHostOnlyNetwork">
+      <desc>
+        Attach the network adapter to the host-only network.
       </desc>
     </method>

trunk/src/VBox/Main/include/NetworkAdapterImpl.h

@@ -129 +129 @@
     STDMETHOD(AttachToHostInterface)();
     STDMETHOD(AttachToInternalNetwork)();
+    STDMETHOD(AttachToHostOnlyNetwork)();
     STDMETHOD(Detach)();
 

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -605 +605 @@
       </xsd:complexType>
     </xsd:element>
+    <xsd:element name="HostOnlyNetwork">
+      <xsd:complexType>
+      </xsd:complexType>
+    </xsd:element>
   </xsd:choice>
   <xsd:attribute name="type" type="TNetworkAdapterType" default="Am79C970A"/>