Changeset 28666 in vbox for trunk/include

Timestamp:

Apr 23, 2010 5:25:58 PM (15 years ago)

Author:

vboxsync

Message:

SrvIntNet,VBoxNetFlt: Changing from getting to reporting (VBoxNetFlt reports stuff to SrvIntNet).

File:

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

trunk/include/VBox/intnet.h

@@ -484 +484 @@
 
     /**
+     * Reports the MAC address of the trunk.
+     *
+     * This is supposed to be called when creating, connection or reconnecting the
+     * trunk and when the MAC address is changed by the system admin.
+     *
+     * @param   pSwitchPort         Pointer to this structure.
+     * @param   pMacAddr            The MAC address.
+     *
+     * @remarks May take a spinlock or two.
+     */
+    DECLR0CALLBACKMEMBER(void, pfnReportMacAddress,(PINTNETTRUNKSWPORT pSwitchPort, PCRTMAC pMacAddr));
+
+    /**
+     * Reports the promicuousness of the interface.
+     *
+     * This is supposed to be called when creating, connection or reconnecting the
+     * trunk and when the mode is changed by the system admin.
+     *
+     * @param   pSwitchPort         Pointer to this structure.
+     * @param   fPromiscuous        True if the host operates the interface in
+     *                              promiscuous mode, false if not.
+     *
+     * @remarks May take a spinlock or two.
+     */
+    DECLR0CALLBACKMEMBER(void, pfnReportPromiscuousMode,(PINTNETTRUNKSWPORT pSwitchPort, bool fPromiscuous));
+
+    /**
      * Reports the GSO capabilities of the host, wire or both.
      *
@@ -495 +522 @@
      * @param   fDst                The destination mask (INTNETTRUNKDIR_XXX).
      *
-     * @remarks Will to take any locks.
+     * @remarks May take a spinlock or two.
      */
     DECLR0CALLBACKMEMBER(void, pfnReportGsoCapabilities,(PINTNETTRUNKSWPORT pSwitchPort, uint32_t fGsoCapabilities, uint32_t fDst));
@@ -613 +640 @@
 
     /**
-     * Tests if the mac address belongs to any of the host NICs
-     * and should take the host route.
-     *
-     * @returns true / false.
-     *
-     * @param   pIfPort     Pointer to this structure.
-     * @param   pMac        Pointer to the mac address.
-     *
-     * @remarks Called while owning the network and the out-bound trunk port semaphores.
-     *
-     * @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, PCRTMAC pMac));
-
-    /**
      * Tests whether the host is operating the interface is promiscuous mode.
      *
@@ -726 +734 @@
 
 /** The UUID for the (current) trunk factory. (case sensitive) */
-#define INTNETTRUNKFACTORY_UUID_STR     "daeaf07b-9974-48be-843e-b9afd763c2ff"
+#define INTNETTRUNKFACTORY_UUID_STR     "7eb192c8-6ee3-4d0a-96fb-f51ce7381354"
 
 /** @name INTNETTRUNKFACTORY::pfnCreateAndConnect flags.