Changeset 26574 in vbox for trunk/src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp

Timestamp:

Feb 16, 2010 12:44:10 PM (15 years ago)

Author:

vboxsync

Message:

Networking: Preparing to make the driver return a send buffer to the device emulation.

File:

• trunk/src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp (modified) (3 diffs)

trunk/src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp

@@ -29 +29 @@
 #include <iprt/rand.h>
 #include <VBox/log.h>
+#include <VBox/intnetinline.h>
 
 
@@ -46 +47 @@
  * @param   pcb             Where to return the size of the data on success.
  */
-void *VBoxNetUDPMatch(PCINTNETBUF pBuf, unsigned uDstPort, PCRTMAC pDstMac, uint32_t fFlags, PVBOXNETUDPHDRS pHdrs, size_t *pcb)
+void *VBoxNetUDPMatch(PINTNETBUF pBuf, unsigned uDstPort, PCRTMAC pDstMac, uint32_t fFlags, PVBOXNETUDPHDRS pHdrs, size_t *pcb)
 {
     /*
@@ -62 +63 @@
      * Valid IntNet Ethernet frame?
      */
-    PCINTNETHDR pHdr = (PINTNETHDR)((uintptr_t)pBuf + pBuf->Recv.offRead);
-    if (pHdr->u16Type != INTNETHDR_TYPE_FRAME)
-        return NULL;
-
-    size_t      cbFrame = pHdr->cbFrame;
-    const void *pvFrame = INTNETHdrGetFramePtr(pHdr, pBuf);
+    PCINTNETHDR pHdr = INTNETRingGetNextFrameToRead(&pBuf->Recv);
+    if (!pHdr || pHdr->u16Type != INTNETHDR_TYPE_FRAME)
+        return NULL;
+
+    size_t          cbFrame = pHdr->cbFrame;
+    const void     *pvFrame = INTNETHdrGetFramePtr(pHdr, pBuf);
     PCRTNETETHERHDR pEthHdr = (PCRTNETETHERHDR)pvFrame;
     if (pHdrs)