Changeset 26597 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 17, 2010 4:45:03 AM (15 years ago)

Author:

vboxsync

Message:

NAT: bsd mbuf synced with last changes in drvnat.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• libslirp.h (modified) (1 diff)
• misc.c (modified) (2 diffs)

trunk/src/VBox/Devices/Network/slirp/libslirp.h

@@ -116 +116 @@
 #endif
 
-#ifndef VBOX_WITH_SLIRP_BSD_MBUF
 struct mbuf *slirp_ext_m_get(PNATState pData, size_t cbMin, void **ppvBuf, size_t *pcbBuf);
 void slirp_ext_m_free(PNATState pData, struct mbuf *);
+#ifndef VBOX_WITH_SLIRP_BSD_MBUF
 void slirp_ext_m_append(PNATState pData, struct mbuf *, uint8_t *, size_t);
 void slirp_push_recv_thread(void *pvUser);
-#else
-void *slirp_ext_m_get(PNATState pData, uint8_t *, size_t);
-void slirp_ext_m_free(PNATState pData, void *);
 #endif
 

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

@@ -340 +340 @@
 }
 
-void *slirp_ext_m_get(PNATState pData, uint8_t *pkt, size_t pkt_len)
+struct mbuf *slirp_ext_m_get(PNATState pData, size_t cbMin, void **ppvBuf, size_t *pcbBuf)
 {
     struct mbuf *m;
     size_t size = MCLBYTES;
-    if (pkt_len < MSIZE)
+    if (cbMin < MSIZE)
         size = MCLBYTES;
-    else if (pkt_len < MCLBYTES)
+    else if (cbMin < MCLBYTES)
         size = MCLBYTES;
-    else if (pkt_len < MJUM9BYTES)
+    else if (cbMin < MJUM9BYTES)
         size = MJUM9BYTES;
-    else if (pkt_len < MJUM16BYTES)
+    else if (cbMin < MJUM16BYTES)
         size = MJUM16BYTES;
     else
@@ -356 +356 @@
 
     m = m_getjcl(pData, M_NOWAIT, MT_HEADER, M_PKTHDR, size);
-    m->m_len = pkt_len ;
-    memcpy(m->m_data, pkt, pkt_len);
-    return (void *)m;
-}
-
-void slirp_ext_m_free(PNATState pData, void *arg)
-{
-    struct mbuf *m = (struct mbuf *)arg;
+    m->m_len = size ;
+    *ppvBuf = mtod(m, void *);
+    *pcbBuf = size;
+    return m;
+}
+
+void slirp_ext_m_free(PNATState pData, struct mbuf *m)
+{
     m_free(pData, m);
 }