Changeset 11072 in vbox for trunk/include

Timestamp:

Aug 1, 2008 10:24:51 PM (16 years ago)

Author:

vboxsync

Message:

IntNet,VBoxNetFlt: Implememnted ARP editing when sharing MAC address with the host (on the wire). Fixed an invalid buffer access in intnetR0SgReadPart[Slow]. Fixed multicast/broadcast mixup, broadcast was identified as multicast.

File:

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

trunk/include/VBox/intnet.h

@@ -272 +272 @@
  * @{ */
 /** Set if the SG is free. */
-#define INTNETSG_FLAGS_FREE     RT_BIT_32(1)
+#define INTNETSG_FLAGS_FREE             RT_BIT_32(1)
 /** Set if the SG is a temporary one that will become invalid upon return.
  * Try to finish using it before returning, and if that's not possible copy
@@ -278 +278 @@
  * When not set, the callee should always free the SG.
  * Attempts to free it made by the callee will be quietly ignored. */
-#define INTNETSG_FLAGS_TEMP     RT_BIT_32(2)
+#define INTNETSG_FLAGS_TEMP             RT_BIT_32(2)
+/** ARP packet, IPv4 + MAC.
+ * @internal */
+#define INTNETSG_FLAGS_ARP_IPV4         RT_BIT_32(3)
+/** Copied to the temporary buffer.
+ * @internal */
+#define INTNETSG_FLAGS_PKT_CP_IN_TMP    RT_BIT_32(4)
 /** @} */
 
@@ -288 +294 @@
 /** To/From the host. */
 #define INTNETTRUNKDIR_HOST             RT_BIT_32(1)
-/** To the wire but with RTNETETHERHDR::SrcMac set to the host interface MAC address. */
-#define INTNETTRUNKDIR_WIRE_SHARED      RT_BIT_32(2)
 /** Mask of valid bits. */
-#define INTNETTRUNKDIR_VALID_MASK       UINT32_C(0x7)
+#define INTNETTRUNKDIR_VALID_MASK       UINT32_C(3)
 /** @} */
 
@@ -472 +476 @@
 
     /**
+     * Gets the MAC address of the host network interface that we're attached to.
+     *
+     * @param   pIfPort     Pointer to this structure.
+     * @param   pMac        Where to store the host MAC address.
+     *
+     * @remarks Called while owning the network and the out-bound trunk port semaphores.
+     */
+    DECLR0CALLBACKMEMBER(void, pfnGetMacAddress,(PINTNETTRUNKIFPORT pIfPort, PPDMMAC pMac));
+
+    /**
      * Tests if the mac address belongs to any of the host NICs
      * and should take the host route.
@@ -484 +498 @@
      * @remarks TAP and NAT will compare with their own MAC address and let all their
      *          traffic take the host direction.
+     *
+     * @remarks This didn't quiet work out the way it should... perhaps obsolete this
+     *          with pfnGetHostMac?
      */
     DECLR0CALLBACKMEMBER(bool, pfnIsHostMac,(PINTNETTRUNKIFPORT pIfPort, PCPDMMAC pMac));
@@ -575 +592 @@
 typedef INTNETTRUNKFACTORY *PINTNETTRUNKFACTORY;
 
-/** The UUID for the (current) trunk factory */
-#define INTNETTRUNKFACTORY_UUID_STR     "c913a8e4-8593-41cd-ae73-f8d7701b08fb"
+/** The UUID for the (current) trunk factory. (case sensitive) */
+#define INTNETTRUNKFACTORY_UUID_STR     "ae8fcb95-280c-42f4-a8f1-09f84e3bdab3"