Changeset 25327 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c

Timestamp:

Dec 11, 2009 1:40:55 PM (15 years ago)

Author:

vboxsync

Message:

Solaris/VBoxBow: bits.

File:

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

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

@@ -62 +62 @@
 # define LOCAL      static
 
-#define DEBUG_ramshankar
 #if defined(DEBUG_ramshankar)
 # undef Log
@@ -584 +583 @@
 }
 
+
 /**
  * Receive (rx) entry point.
@@ -595 +595 @@
 LOCAL void vboxNetFltSolarisRecv(void *pvData, mac_resource_handle_t hResource, mblk_t *pMsg, boolean_t fLoopback)
 {
-    LogFlow((DEVICE_NAME ":vboxNetFltSolarisRecv pvData=%p pMsg=%p fLoopback=%d\n", pvData, pMsg, fLoopback));
+    LogFlow((DEVICE_NAME ":vboxNetFltSolarisRecv pvData=%p pMsg=%p fLoopback=%d cbData=%d\n", pvData, pMsg, fLoopback, pMsg ? MBLKL(pMsg) : 0));
 
     PVBOXNETFLTINS pThis = (PVBOXNETFLTINS)pvData;
@@ -615 +615 @@
     uint32_t fSrc = INTNETTRUNKDIR_WIRE;
     PRTNETETHERHDR pEthHdr = (PRTNETETHERHDR)pMsg->b_rptr;
-    if (vboxNetFltPortOsIsHostMac(pThis, &pEthHdr->SrcMac))
+    if (   MBLKL(pMsg) >= sizeof(RTNETETHERHDR)
+        && vboxNetFltPortOsIsHostMac(pThis, &pEthHdr->SrcMac))
         fSrc = INTNETTRUNKDIR_HOST;
-
-    vboxNetFltSolarisAnalyzeMBlk(pMsg);
 
     /*
@@ -777 +776 @@
 {
     LogFlow((DEVICE_NAME ":vboxNetFltPortOsIsPromiscuous pThis=%p\n", pThis));
-    return pThis->u.s.hPromiscuous ? true : false;
+    return false;
 }
 
@@ -784 +783 @@
 {
     LogFlow((DEVICE_NAME ":vboxNetFltPortOsGetMacAddress pThis=%p\n", pThis));
-    NOREF(pThis); NOREF(pMac);
+    *pMac = pThis->u.s.Mac;
     return;
 }
@@ -893 +892 @@
             LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit pThis=%p cbData=%d\n", pThis, MBLKL(pMsg)));
 
-            mac_tx(pThis->u.s.hClient, pMsg, 0 /* Hint */, MAC_DROP_ON_NO_DESC, NULL /* return message */);
-            return VINF_SUCCESS;
+            mac_tx_cookie_t pXmitCookie = mac_tx(pThis->u.s.hClient, pMsg, 0 /* Hint */, MAC_DROP_ON_NO_DESC, NULL /* return message */);
+            if (RT_LIKELY(!pXmitCookie))
+                return VINF_SUCCESS;
+
+            pMsg = NULL;
+            rc = VERR_NET_IO_ERROR;
+            LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit Xmit failed.\n"));
         }
         else