Changeset 15914 in vbox for trunk/src/VBox

Timestamp:

Jan 13, 2009 1:29:45 PM (16 years ago)

Author:

vboxsync

Message:

NAT: temporally enable intermediate buffer on send, to avoid overhead on creating queue entry.

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (2 diffs)
• slirp/slirp.c (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -510 +510 @@
     rc = pThis->pPort->pfnReceive(pThis->pPort, pItem->pu8Buf, pItem->cb);
 
+#if 0
     rc = RTReqAlloc(pThis->pReqQueue, &pReq, RTREQTYPE_INTERNAL);
     AssertReleaseRC(rc);
@@ -518 +519 @@
     pReq->fFlags              = RTREQFLAGS_VOID;
     AssertRC(rc);
+#else
+    /*Copy buffer again, till seeking good way of syncronization with slirp mbuf management code*/
+    AssertRelease(pItem->mbuf == NULL);
+    RTMemFree((void *)pItem->pu8Buf);
+#endif
     return RT_SUCCESS(rc);
 }

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -1114 +1114 @@
 #ifdef VBOX_WITH_SIMPLIFIED_SLIRP_SYNC
     struct ethhdr *eh;
+    uint8_t *buf = RTMemAlloc(1600);
     m->m_data -= if_maxlinkhdr;
     m->m_len += ETH_HLEN;
@@ -1134 +1135 @@
 #ifdef VBOX_WITH_SIMPLIFIED_SLIRP_SYNC
     eh->h_proto = htons(eth_proto);
+#if 0
     slirp_output(pData->pvUser, m, mtod(m, uint8_t *), m->m_len);
+#else
+    memcpy(buf, mtod(m, uint8_t *), m->m_len); 
+    slirp_output(pData->pvUser, NULL, buf, m->m_len);
+    m_free(pData, m);
+#endif
 #else
     eh->h_proto = htons(ETH_P_IP);