Changeset 38640 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Sep 5, 2011 2:34:18 PM (14 years ago)

Author:

vboxsync

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

73847

Message:

solaris/VBoxNetFltBow: fixed multicast and IPv6 packets.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c (modified) (9 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c

@@ -226 +226 @@
     /** The unicast address handle. */
     mac_unicast_handle_t        hUnicast;
+    /** The promiscuous handle. */
+    mac_promisc_handle_t        hPromisc;
     /* The VNIC name. */
     char                        szName[MAXLINKNAMESPECIFIER];
@@ -232 +234 @@
 } VBOXNETFLTVNIC;
 typedef struct VBOXNETFLTVNIC *PVBOXNETFLTVNIC;
+
 
 /*******************************************************************************
@@ -982 +985 @@
     pVNIC->hClient         = NULL;
     pVNIC->hUnicast        = NULL;
+    pVNIC->hPromisc        = NULL;
     RT_ZERO(pVNIC->szName);
     list_link_init(&pVNIC->hNode);
@@ -1017 +1021 @@
                 mac_unicast_remove(pVNIC->hClient, pVNIC->hUnicast);
                 pVNIC->hUnicast = NULL;
+            }
+
+            if (pVNIC->hPromisc)
+            {
+                mac_promisc_remove(pVNIC->hPromisc);
+                pVNIC->hPromisc = NULL;
             }
 
@@ -1206 +1216 @@
 
 
+/**
+ * Set the promiscuous mode RX hook.
+ *
+ * @param    pThis          The VM connection instance.
+ * @param    pVNIC          Pointer to the VNIC.
+ *
+ * @returns VBox status code.
+ */
+LOCAL inline int vboxNetFltSolarisSetPromisc(PVBOXNETFLTINS pThis, PVBOXNETFLTVNIC pVNIC)
+{
+    int rc = VINF_SUCCESS;
+    if (!pVNIC->hPromisc)
+    {
+        rc = mac_promisc_add(pVNIC->hClient, MAC_CLIENT_PROMISC_FILTERED, vboxNetFltSolarisRecv, pThis, &pVNIC->hPromisc,
+                             MAC_PROMISC_FLAGS_NO_TX_LOOP | MAC_PROMISC_FLAGS_VLAN_TAG_STRIP | MAC_PROMISC_FLAGS_NO_PHYS);
+        if (RT_UNLIKELY(rc))
+            LogRel((DEVICE_NAME ":vboxNetFltSolarisSetPromisc failed. rc=%d\n", rc));
+        rc = RTErrConvertFromErrno(rc);
+    }
+    return rc;
+}
+
+
+/**
+ * Clear the promiscuous mode RX hook.
+ *
+ * @param   pThis           The VM connection instance.
+ * @param   pVNIC           Pointer to the VNIC.
+ */
+LOCAL inline void vboxNetFltSolarisRemovePromisc(PVBOXNETFLTINS pThis, PVBOXNETFLTVNIC pVNIC)
+{
+    if (pVNIC->hPromisc)
+    {
+        mac_promisc_remove(pVNIC->hPromisc);
+        pVNIC->hPromisc = NULL;
+    }
+}
+
+
 /* -=-=-=-=-=- Common Hooks -=-=-=-=-=- */
 
@@ -1221 +1270 @@
         for (; pVNIC != NULL; pVNIC = list_next(&pThis->u.s.hVNICs, pVNIC))
             if (pVNIC->hClient)
+            {
+#if 0
                 mac_rx_set(pVNIC->hClient, vboxNetFltSolarisRecv, pThis);
+#endif
+                vboxNetFltSolarisSetPromisc(pThis, pVNIC);
+            }
     }
     else
@@ -1227 +1281 @@
         for (; pVNIC != NULL; pVNIC = list_next(&pThis->u.s.hVNICs, pVNIC))
             if (pVNIC->hClient)
+            {
+#if 0
                 mac_rx_clear(pVNIC->hClient);
+#endif
+                vboxNetFltSolarisRemovePromisc(pThis, pVNIC);
+            }
     }
 }
@@ -1411 +1470 @@
     {
         /*
-         * Remove existing unicast address and the RX hook.
+         * Remove existing unicast address, promisc. and the RX hook.
          */
         if (pVNIC->hUnicast)
@@ -1420 +1479 @@
         }
 
-        /*
-         * Add the primary unicast address and set the RX hook.
-         */
+        if (pVNIC->hPromisc)
+        {
+            mac_promisc_remove(pVNIC->hPromisc);
+            pVNIC->hPromisc = NULL;
+        }
+
         mac_diag_t MacDiag = MAC_DIAG_NONE;
         /* uint16_t uVLANId = pVNIC->pVNICTemplate ? pVNIC->pVNICTemplate->uVLANId : 0; */
+#if 0
         rc = mac_unicast_add(pVNIC->hClient, NULL, MAC_UNICAST_PRIMARY, &pVNIC->hUnicast, 0 /* VLAN Id */, &MacDiag);
+#endif
         if (RT_LIKELY(!rc))
         {
-            /*
-             * Set the RX receive function.
-             * This shouldn't be necessary as vboxNetFltPortOsSetActive() will be invoked after this, but in the future,
-             * if the guest NIC changes MAC address this may not be followed by a vboxNetFltPortOsSetActive() call, so set it here anyway.
-             */
-            mac_rx_set(pVNIC->hClient, vboxNetFltSolarisRecv, pThis);
-            LogFlow((DEVICE_NAME ":vboxNetFltPortOsNotifyMacAddress successfully added unicast address %.6Rhxs\n", pMac));
+            rc = vboxNetFltSolarisSetPromisc(pThis, pVNIC);
+#if 0
+            if (RT_SUCCESS(rc))
+            {
+                /*
+                 * Set the RX receive function.
+                 * This shouldn't be necessary as vboxNetFltPortOsSetActive() will be invoked after this, but in the future,
+                 * if the guest NIC changes MAC address this may not be followed by a vboxNetFltPortOsSetActive() call, so set it here anyway.
+                 */
+                mac_rx_set(pVNIC->hClient, vboxNetFltSolarisRecv, pThis);
+                LogFlow((DEVICE_NAME ":vboxNetFltPortOsNotifyMacAddress successfully added unicast address %.6Rhxs\n", pMac));
+            }
+            else
+                LogRel((DEVICE_NAME ":vboxNetFltPortOsNotifyMacAddress failed to set promiscuous mode. rc=%d\n", rc));
+            mac_unicast_remove(pVNIC->hClient,  pVNIC->hUnicast);
+            pVNIC->hUnicast = NULL;
+#endif
         }
         else