Changeset 15244 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Dec 10, 2008 1:02:10 PM (16 years ago)

Author:

vboxsync

Message:

slirp: added some disabled debug code

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• debug.c (modified) (2 diffs)
• slirp.c (modified) (1 diff)
• slirp.h (modified) (1 diff)

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

@@ -249 +249 @@
 }
 
+static DECLCALLBACK(size_t)
+print_networkevents(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput,
+                    const char *pszType, void const *pvValue,
+                    int cchWidth, int cchPrecision, unsigned fFlags,
+                    void *pvUser)
+{
+    WSANETWORKEVENTS *pNetworkEvents = (WSANETWORKEVENTS*)pvValue;
+    size_t cb;
+    bool fDelim = false;
+
+    AssertReturn(strcmp(pszType, "natwinnetevents") == 0, 0);
+
+    cb  = RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "events=%02x (", pNetworkEvents->lNetworkEvents);
+#define DO_BIT(bit) \
+    if (pNetworkEvents->lNetworkEvents & FD_ ## bit) \
+    { \
+        cb += RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "%s" #bit "(%d)", \
+                          fDelim ? "," : "", pNetworkEvents->iErrorCode[FD_ ## bit ## _BIT]); \
+        fDelim = true; \
+    }
+    DO_BIT(READ);
+    DO_BIT(WRITE);
+    DO_BIT(OOB);
+    DO_BIT(ACCEPT);
+    DO_BIT(CONNECT);
+    DO_BIT(CLOSE);
+    DO_BIT(QOS);
+#undef DO_BIT
+    cb += RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, ")");
+    return cb;
+}
+
+#if 0
+/*
+ * Debugging
+ */
+int errno_func(const char *file, int line)
+{
+    int err = WSAGetLastError();
+    LogRel(("errno=%d (%s:%d)\n", err, file, line));
+    return err;
+}
+#endif
+
 int 
 debug_init() 
@@ -265 +309 @@
         rc = RTStrFormatTypeRegister("natsock", print_socket, NULL);
         AssertRC(rc);
+        rc = RTStrFormatTypeRegister("natwinnetevents", print_networkevents, NULL);
+        AssertRC(rc);
         g_fFormatRegistered = 1;
     }

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

@@ -724 +724 @@
 
             POLL_TCP_EVENTS(rc, error, so, &NetworkEvents);
+#if 0
+# if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
+            LogRel(("  %R[natsock] %R[natwinnetevents]\n", so, &NetworkEvents));
+# else
+            LogRel(("  %R[natsock] %s %s %s\n", so, FD_ISSET(so->s, readfds)?"READ":"",
+                     FD_ISSET(so->s, writefds)?"WRITE":"", FD_ISSET(so->s, xfds)?"OOB":""));
+# endif
+#endif
 
             /*

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

@@ -350 +350 @@
 #ifdef RT_OS_WINDOWS
 # undef errno
-# define errno (WSAGetLastError())
-#endif
-
-#endif
+# if 0 /* debugging */
+int errno_func(const char *file, int line);
+#  define errno (errno_func(__FILE__, __LINE__))
+# else
+#  define errno (WSAGetLastError())
+# endif
+#endif
+
+#endif