Changeset 22940 in vbox

Timestamp:

Sep 11, 2009 6:18:51 AM (15 years ago)

Author:

vboxsync

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

52205

Message:

NAT: BSD mbuf's related changeset (socket.c)

File:

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

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

@@ -565 +565 @@
         size_t len;
         u_long n;
+#ifdef VBOX_WITH_SLIRP_BSD_MBUF
+        uint8_t *buffer;
+#endif
 
         QSOCKET_LOCK(udb);
@@ -570 +573 @@
         QSOCKET_UNLOCK(udb);
 
+#ifndef VBOX_WITH_SLIRP_BSD_MBUF
         if (!(m = m_get(pData)))
         {
@@ -594 +598 @@
             }
         }
-
         m->m_len = recvfrom(so->s, m->m_data, len, 0,
                             (struct sockaddr *)&addr, &addrlen);
         Log2((" did recvfrom %d, errno = %d-%s\n",
                     m->m_len, errno, strerror(errno)));
-        if(m->m_len < 0)
+#else
+        if (!(m = m_gethdr(pData, M_NOWAIT, MT_HEADER)))
+        {
+            SOCKET_UNLOCK(so);
+            return;
+        }
+        /*How many data has been received ?*/
+        /*
+        * 1. calculate how much we can read
+        * 2. read as much as possible
+        * 3. attach buffer to allocated header mbuf
+        */
+        ioctlsocket(so->s, FIONREAD, &n);
+        Assert(n > 0);
+        buffer = RTMemAlloc(n);
+        Assert(buffer);
+        len = recvfrom(so->s, buffer, n, 0,
+                            (struct sockaddr *)&addr, &addrlen);
+        /* @todo (r=vvl) check which flags and type should be passed */
+        if (len > 0)
+            m_append(pData, m, len, buffer);
+        RTMemFree(buffer);
+#endif
+        if(len < 0)
         {
             u_char code = ICMP_UNREACH_PORT;
@@ -663 +689 @@
     struct sockaddr_in host_addr;
 #endif
+#ifdef VBOX_WITH_SLIRP_BSD_MBUF
+    uint8_t *buf;
+    int mlen;
+#endif
 
     DEBUG_CALL("sosendto");
@@ -714 +744 @@
 
     /* Don't care what port we get */
+#ifndef VBOX_WITH_SLIRP_BSD_MBUF
     ret = sendto(so->s, m->m_data, m->m_len, 0, &addr, sizeof (struct sockaddr_in));
+#else
+    mlen = m_length(m, NULL);
+    buf = RTMemAlloc(mlen);
+    if (buf == NULL)
+    {
+        return -1;
+    }
+    m_copydata(m, 0, mlen, buf);
+    ret = sendto(so->s, buf, mlen, 0,
+                 (struct sockaddr *)&addr, sizeof (struct sockaddr));
+#endif
     if (ret < 0)
     {
@@ -1093 +1135 @@
                 break;
             case IP_SUCCESS: /* echo replied */
+#ifndef VBOX_WITH_SLIRP_BSD_MBUF
                 m = m_get(pData);
+#else
+                m = m_gethdr(pData, M_NOWAIT, MT_HEADER);
+#endif
                 m->m_data += if_maxlinkhdr;
                 ip = mtod(m, struct ip *);
@@ -1111 +1157 @@
                 data_len += ICMP_MINLEN;
 
+#ifndef VBOX_WITH_SLIRP_BSD_MBUF
                 nbytes = (data_len + icr[i].DataSize > m->m_size? m->m_size - data_len: icr[i].DataSize);
                 memcpy(icp->icmp_data, icr[i].Data, nbytes);
+#else
+                AssertMsgFailed(("ICMP"));
+#endif
 
                 data_len += icr[i].DataSize;
@@ -1141 +1191 @@
                 data_len = (ip_broken->ip_hl << 2) + 64;
 
+#ifndef VBOX_WITH_SLIRP_BSD_MBUF
                 nbytes =(hlen + ICMP_MINLEN + data_len > m->m_size? m->m_size - (hlen + ICMP_MINLEN): data_len);
                 memcpy(icp->icmp_data, ip_broken,  nbytes);
+#else
+                AssertMsgFailed(("ICMP"));
+#endif
                 icmp_reflect(pData, m);
                 break;