Changeset 10126 in vbox

Timestamp:

Jul 3, 2008 12:50:07 AM (17 years ago)

Author:

vboxsync

Message:

Consolidated the Recv and Send methods to make it easier to share the SG. Implemented the missing darwin specific bits.

File:

• trunk/include/VBox/intnet.h (modified) (10 diffs)

trunk/include/VBox/intnet.h

@@ -246 +246 @@
     /** Owner data, don't touch! */
     void           *pvOwnerData;
+    /** User data. */
+    void           *pvUserData;
+    /** User data 2 in case anyone needs it. */
+    void           *pvUserData2;
     /** The total length of the scatter gather list. */
     uint32_t        cbTotal;
@@ -297 +301 @@
 
 
+/** @name Direction (packet source or destination)
+ * @{ */
+/** To/From the wire. */
+#define INTNETTRUNKDIR_WIRE             RT_BIT_32(1)
+/** To/From the host. */
+#define INTNETTRUNKDIR_HOST             RT_BIT_32(2)
+/** Mask of valid bits. */
+#define INTNETTRUNKDIR_VALID_MASK       UINT32_C(0x3)
+/** @} */
+
 
 /** Pointer to the switch side of a trunk port. */
@@ -331 +345 @@
 
     /**
-     * Frame from the host that's about to hit the wire.
+     * Incoming frame.
      *
      * @returns true if we've handled it and it should be dropped.
@@ -340 +354 @@
      *                      This will only be use during the call, so a temporary one can
      *                      be used. The Phys member will not be used.
+     * @param   fSrc        Where this frame comes from. Only one bit should be set!
      *
      * @remarks Will grab the network semaphore.
@@ -345 +360 @@
      * @remark  NAT and TAP will use this interface.
      */
-    DECLR0CALLBACKMEMBER(bool, pfnRecvHost,(PINTNETTRUNKSWPORT pIfPort, PINTNETSG pSG));
-
-    /**
-     * Frame from the wire that's about to hit the network stack.
-     *
-     * @returns true if we've handled it and it should be dropped.
-     *          false if it should hit the network stack.
-     *
-     * @param   pIfPort     Pointer to this structure.
-     * @param   pSG         The (scatter /) gather structure for the frame.
-     *                      This will only be use during the call, so a temporary one can
-     *                      be used. The Phys member will not be used.
-     *
-     * @remarks Will grab the network semaphore.
-     *
-     * @remark  NAT and TAP will not this interface.
-     */
-    DECLR0CALLBACKMEMBER(bool, pfnRecvWire,(PINTNETTRUNKSWPORT pIfPort, PINTNETSG pSG));
-
-    /**
-     * This is called by the pfnSendToHost and pfnSendToWire code when they are
-     * done with a SG.
-     *
-     * It may be called after they return if the frame was pushed in an
-     * async manner.
+    DECLR0CALLBACKMEMBER(bool, pfnRecv,(PINTNETTRUNKSWPORT pIfPort, PINTNETSG pSG, uint32_t fSrc));
+
+    /**
+     * Retain a SG.
+     *
+     * @param   pIfPort     Pointer to this structure.
+     * @param   pSG         Pointer to the (scatter /) gather structure.
+     *
+     * @remarks Will not grab any locks.
+     */
+    DECLR0CALLBACKMEMBER(void, pfnSGRetain,(PINTNETTRUNKSWPORT pIfPort, PINTNETSG pSG));
+
+    /**
+     * Release a SG.
+     *
+     * This is called by the pfnXmit code when done with a SG. This may safe
+     * be done in an asynchronous manner.
      *
      * @param   pIfPort     Pointer to this structure.
@@ -483 +490 @@
     /**
      * Tests if the mac address belongs to any of the host NICs
-     * and should take the pfnSendToHost route.
+     * and should take the host route.
      *
      * @returns true / false.
@@ -493 +500 @@
      *
      * @remarks TAP and NAT will compare with their own MAC address and let all their
-     *          traffic go over the pfnSendToHost method.
+     *          traffic take the host direction.
      */
     DECLR0CALLBACKMEMBER(bool, pfnIsHostMac,(PINTNETTRUNKIFPORT pIfPort, PCPDMMAC pMac));
@@ -517 +524 @@
 
     /**
-     * Send the frame to the host.
-     *
-     * This path is taken if pfnIsHostMac returns true and the trunk port on the
-     * internal network is configured to let traffic thru to the host. It may also
-     * be taken if the host is in promiscuous mode and the internal network is
-     * configured to respect this for internal targets.
+     * Transmit a frame.
      *
      * @return  VBox status code. Error generally means we'll drop the packet.
@@ -530 +532 @@
      *                      do this asynchronously to save unnecessary buffer
      *                      allocating and copying.
+     * @param   fDst        The destination mask. At least one bit will be set.
      *
      * @remarks Called holding the out-bound trunk port lock.
@@ -535 +538 @@
      * @remarks TAP and NAT will use this interface for all their traffic, see pfnIsHostMac.
      */
-    DECLR0CALLBACKMEMBER(int, pfnSendToHost,(PINTNETTRUNKIFPORT pIfPort, PINTNETSG pSG));
-
-    /**
-     * Put the frame on the wire.
-     *
-     * This path is taken if pfnIsHostMac returns false and the trunk port on the
-     * internal network is configured to let traffic out on the wire. This may also
-     * be taken for both internal and host traffic if the trunk port is configured
-     * to be in promiscuous mode.
-     *
-     * @return  VBox status code. Error generally means we'll drop the packet.
-     * @param   pIfPort     Pointer to this structure.
-     * @param   pSG         Pointer to the (scatter /) gather structure for the frame.
-     *                      This will never be a temporary one, so, it's safe to
-     *                      do this asynchronously to save unnecessary buffer
-     *                      allocating and copying.
-     *
-     * @remarks Called holding the out-bound trunk port lock.
-     *
-     * @remarks TAP and NAT will call pfnSGRelease and return successfully.
-     */
-    DECLR0CALLBACKMEMBER(int, pfnSendToWire,(PINTNETTRUNKIFPORT pIfPort, PINTNETSG pSG));
+    DECLR0CALLBACKMEMBER(int, pfnXmit,(PINTNETTRUNKIFPORT pIfPort, PINTNETSG pSG, uint32_t fDst));
 
     /** Structure version number. (INTNETTRUNKIFPORT_VERSION) */