Changeset 28390 in vbox

Timestamp:

Apr 16, 2010 3:39:53 AM (15 years ago)

Author:

vboxsync

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

60151

Message:

NAT: ICMP with BSD buffers.

File:

• trunk/src/VBox/Devices/Network/slirp/socket.c (modified) (4 diffs)

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

@@ -1236 +1236 @@
     int nbytes = 0;
     u_char code = ~0;
+    int out_len;
+    int size;
 
     len = pData->pfIcmpParseReplies(pData->pvIcmpBuffer, pData->szIcmpBuffer);
@@ -1267 +1269 @@
                 m = m_get(pData);
 # else
-                m = m_gethdr(pData, M_NOWAIT, MT_HEADER);
+                out_len = ETH_HLEN + sizeof(struct ip) +  8;
+                size;
+                size = MCLBYTES;
+                if (out_len < MSIZE)
+                    size = MCLBYTES;
+                else if (out_len < MCLBYTES)
+                    size = MCLBYTES;
+                else if (out_len < MJUM9BYTES)
+                    size = MJUM9BYTES;
+                else if (out_len < MJUM16BYTES)
+                    size = MJUM16BYTES;
+                else
+                    AssertMsgFailed(("Unsupported size"));
+
+                m = m_getjcl(pData, M_NOWAIT, MT_HEADER, M_PKTHDR, size);
 # endif
+                m->m_len = 0;
                 m->m_data += if_maxlinkhdr;
                 ip = mtod(m, struct ip *);
@@ -1290 +1307 @@
                 memcpy(icp->icmp_data, icr[i].Data, nbytes);
 # else
-                AssertMsgFailed(("ICMP"));
+                hlen = (ip->ip_hl << 2);
+                m->m_pkthdr.header = mtod(m, void *);
+                m->m_len = data_len;
+
+                m_copyback(pData, m, hlen + 8, icr[i].DataSize, icr[i].Data);
 # endif
 
@@ -1324 +1345 @@
                 memcpy(icp->icmp_data, ip_broken,  nbytes);
 #else
-                AssertMsgFailed(("ICMP"));
+                m->m_len = data_len;
+                m->m_pkthdr.header = mtod(m, void *);
+                m_copyback(pData, m, ip->ip_hl >> 2, icr[i].DataSize, icr[i].Data);
 #endif
                 icmp_reflect(pData, m);