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

Timestamp:

Dec 11, 2008 7:31:54 AM (16 years ago)

Author:

vboxsync

Message:

slirp: logging enhancements

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• debug.c (modified) (4 diffs)
• slirp.c (modified) (3 diffs)

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

@@ -15 +15 @@
 #endif
 
+#define IP4_ADDR_PRINTF_DECOMP(ip) ((ip) >> 24), ((ip) >> 16) & 0xff, ((ip) >> 8) & 0xff, (ip) & 0xff
+#define IP4_ADDR_PRINTF_FORMAT "%u.%u.%u.%u"
 /*
  * Dump a packet in the same format as tcpdump -x
@@ -229 +231 @@
 
     ip = ntohl(*(uint32_t*)pvValue);
-    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "%u.%u.%u.%u",
-           (ip >> 24), (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff);
+    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, IP4_ADDR_PRINTF_FORMAT,
+           IP4_ADDR_PRINTF_DECOMP(ip));
 }
 
@@ -241 +243 @@
     struct socket *so = (struct socket*)pvValue;
     uint32_t ip;
+    struct sockaddr addr;
+    socklen_t socklen = sizeof(struct sockaddr);
+    int status = 0;
 
     AssertReturn(strcmp(pszType, "natsock") == 0, 0);
 
+    status = getsockname(so->s, &addr, &socklen);
+
+    Assert(status == 0 && addr.sa_family == AF_INET);
+
     ip = ntohl(so->so_faddr.s_addr);
-    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "socket %4d: state=%04x ip=%u.%u.%u.%u",
-           so->s, so->so_state, (ip >> 24), (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff);
+    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "socket %4d:(proto:%u) "
+            "state=%04x ip=" IP4_ADDR_PRINTF_FORMAT ":%d name=" IP4_ADDR_PRINTF_FORMAT ":%d",
+            so->s, so->so_type, so->so_state, IP4_ADDR_PRINTF_DECOMP(ip), so->so_fport,
+            IP4_ADDR_PRINTF_DECOMP(((struct sockaddr_in *)&addr)->sin_addr.s_addr),
+            ((struct sockaddr_in *)&addr)->sin_port);
 }
 
@@ -295 +307 @@
 #endif
 
-int 
-debug_init() 
+int
+debug_init()
 {
     int rc = VINF_SUCCESS;

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

@@ -106 +106 @@
 #define CHECK_FD_SET(so, events, set)           \
     (DO_CHECK_FD_SET((so), (events), set))
+
+/*
+ * Loging macros
+ */
+#if VBOX_WITH_DEBUG_NAT_SOCKETS
+# if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
+#  define  DO_LOG_NAT_SOCK(so, proto, winevent, r_fdset, w_fdset, x_fdset)              \
+    do {                                                                                \
+        LogRel(("  " #proto "%R[natsock] %R[natwinnetevents]\n", (so), (winevent)));    \
+    } while (0)
+# else
+#  define  DO_LOG_NAT_SOCK(so, proto, winevent, r_fdset, w_fdset, x_fdset)                              \
+    do {                                                                                                \
+            LogRel(("  " #proto " %R[natsock] %s %s %s\n", (so), FD_ISSET((so)->s, (r_fdset))?"READ":"",\
+                     FD_ISSET((so)->s, (w_fdset))?"WRITE":"", FD_ISSET((so)->s, (x_fdset))?"OOB":""));  \
+    } while (0)
+# endif /* VBOX_WITH_DEBUG_NAT_SOCKETS */
+#else
+# define DO_LOG_NAT_SOCK(so, proto, winevent, r_fdset, w_fdset, x_fdset) do {} while (0)
+#endif /* !VBOX_WITH_DEBUG_NAT_SOCKETS */
+
+#define LOG_NAT_SOCK(so, proto, winevent, r_fdset, w_fdset, x_fdset) DO_LOG_NAT_SOCK((so), proto, (winevent), (r_fdset), (w_fdset), (x_fdset))
 
 static const uint8_t special_ethaddr[6] =
@@ -730 +752 @@
 
             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
+
+            LOG_NAT_SOCK(so, TCP, &NetworkEvents, readfds, writefds, xfds);
 
             /*
@@ -906 +922 @@
             POLL_UDP_EVENTS(rc, error, so, &NetworkEvents);
 
+            LOG_NAT_SOCK(so, UDP, &NetworkEvents, readfds, writefds, xfds);
+
             if (so->s != -1 && CHECK_FD_SET(so, NetworkEvents, readfds))
             {