Changeset 23154 in vbox for trunk/src/VBox/Devices/Network/slirp/libalias

Timestamp:

Sep 19, 2009 11:02:11 AM (16 years ago)

Author:

vboxsync

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

52570

Message:

NAT: BSD mbuf

Location:

trunk/src/VBox/Devices/Network/slirp/libalias

Files:

• alias.c (modified) (5 diffs)
• alias.h (modified) (1 diff)
• alias_db.c (modified) (1 diff)
• alias_dns.c (modified) (1 diff)

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

@@ -1666 +1666 @@
 #endif
 
-#ifdef _KERNEL
+#if defined(_KERNEL) || (defined(VBOX) && defined(VBOX_WITH_SLIRP_BSD_MBUF))
 /*
  * m_megapullup() - this function is a big hack.
@@ -1680 +1680 @@
  */
 struct mbuf *
-m_megapullup(struct mbuf *m, int len) {
+#ifndef VBOX
+m_megapullup(struct mbuf *m, int len) 
+#else
+m_megapullup(PNATState pData, struct mbuf *m, int len)
+#endif
+{
     struct mbuf *mcl;
     
@@ -1694 +1699 @@
 
     if (len <= MCLBYTES - RESERVE) {
+#ifndef VBOX
         mcl = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+#else
+        mcl = m_getcl(pData, M_DONTWAIT, MT_DATA, M_PKTHDR);
+#endif
     } else if (len < MJUM16BYTES) {
         int size;
@@ -1704 +1713 @@
             size = MJUM16BYTES;
         };
+#ifndef VBOX
         mcl = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, size);
+#else
+        mcl = m_getjcl(pData, M_DONTWAIT, MT_DATA, M_PKTHDR, size);
+#endif
     } else {
         goto bad;
@@ -1714 +1727 @@
     m_copydata(m, 0, len, mtod(mcl, caddr_t));
     mcl->m_len = mcl->m_pkthdr.len = len;
+#ifndef VBOX
     m_freem(m);
+#else
+    m_freem(pData, m);
+#endif
  
     return (mcl);
 bad:
+#ifndef VBOX
     m_freem(m);
+#else
+    m_freem(pData, m);
+#endif
     return (NULL);
 }

trunk/src/VBox/Devices/Network/slirp/libalias/alias.h

@@ -205 +205 @@
 
 /* Mbuf helper function. */
+#ifndef VBOX
 struct mbuf    *m_megapullup(struct mbuf *, int);
+#else
+struct mbuf    *m_megapullup(PNATState, struct mbuf *, int);
+#endif
 
 /*

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

@@ -175 +175 @@
 #else /* !VBOX */
 # include <iprt/assert.h>
-# include <slirp.h>
 # include "alias.h"
 # include "alias_local.h"
 # include "alias_mod.h"
+# include <slirp.h>
 #endif /* VBOX */
 

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

@@ -83 +83 @@
         uint16_t addr_off = (uint16_t)~0;
         
+#ifndef VBOX_WITH_SLIRP_BSD_MBUF
         m = dtom(la->pData, hdr); 
+#else
+        AssertMsgFailed(("Unimplemented"));
+#endif
         Assert((m));