Changeset 37743 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Jul 4, 2011 3:52:52 AM (14 years ago)

Author:

vboxsync

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

72612

Message:

NAT: so{read,write} logging.

File:

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

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

@@ -152 +152 @@
     QSOCKET_UNLOCK(tcb);
 
-    LogFlow(("soread: so = %lx\n", (long)so));
+    LogFlow(("soread: so = %R[natsock]\n", so));
 
     /*
@@ -216 +216 @@
 #ifdef HAVE_READV
     nn = readv(so->s, (struct iovec *)iov, n);
-    Log2((" ... read nn = %d bytes\n", nn));
 #else
     nn = recv(so->s, iov[0].iov_base, iov[0].iov_len, (so->so_tcpcb->t_force? MSG_OOB:0));
 #endif
+    Log2(("%s: read(1) nn = %d bytes\n", __PRETTY_FUNCTION__, nn));
     if (nn <= 0)
     {
@@ -233 +233 @@
         status = ioctlsocket(so->s, FIONREAD, &pending);
         if (status < 0)
-            Log(("NAT:error in WSAIoctl: %d\n", errno));
+            Log(("NAT:%s: error in WSAIoctl: %d\n", __PRETTY_FUNCTION__, errno));
         if (nn == 0 && (pending != 0))
         {
@@ -252 +252 @@
         {
             /* nn == 0 means peer has performed an orderly shutdown */
-            Log2((" --- soread() disconnected, nn = %d, errno = %d (%s)\n",
-                  nn, errno, strerror(errno)));
+            Log2(("%s: disconnected, nn = %d, errno = %d (%s)\n",
+                  __PRETTY_FUNCTION__, nn, errno, strerror(errno)));
             sofcantrcvmore(so);
             tcp_sockclosed(pData, sototcpcb(so));
@@ -299 +299 @@
     }
 
-    Log2((" ... read nn = %d bytes\n", nn));
+    Log2(("%s: read(2) nn = %d bytes\n", __PRETTY_FUNCTION__, nn));
 #endif
 
@@ -572 +572 @@
 #ifdef HAVE_READV
     nn = writev(so->s, (const struct iovec *)iov, n);
-    Log2(("  ... wrote nn = %d bytes\n", nn));
 #else
     nn = send(so->s, iov[0].iov_base, iov[0].iov_len, 0);
 #endif
+    Log2(("%s: wrote(1) nn = %d bytes\n", __PRETTY_FUNCTION__, nn));
     /* This should never happen, but people tell me it does *shrug* */
     if (   nn < 0
@@ -589 +589 @@
     if (nn < 0 || (nn == 0 && iov[0].iov_len > 0))
     {
-        Log2((" --- sowrite disconnected, so->so_state = %x, errno = %d\n",
-              so->so_state, errno));
+        Log2(("%s: disconnected, so->so_state = %x, errno = %d\n",
+              __PRETTY_FUNCTION__, so->so_state, errno));
         sofcantsendmore(so);
         tcp_sockclosed(pData, sototcpcb(so));
@@ -613 +613 @@
         });
     }
-    Log2(("  ... wrote nn = %d bytes\n", nn));
+    Log2(("%s: wrote(2) nn = %d bytes\n", __PRETTY_FUNCTION__, nn));
 #endif