Changeset 39360 in vbox for trunk

Timestamp:

Nov 18, 2011 9:08:55 AM (13 years ago)

Author:

vboxsync

Message:

NAT: debug print expiration of the socket.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

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

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

@@ -277 +277 @@
     struct sockaddr_in *in_addr;
     socklen_t socklen = sizeof(struct sockaddr);
+    PNATState pData = (PNATState)pvUser;
     int status = 0;
     NOREF(cchWidth);
     NOREF(cchPrecision);
     NOREF(fFlags);
-    NOREF(pvUser);
+    Assert(pData);
 
     AssertReturn(strcmp(pszType, "natsock") == 0, 0);
@@ -299 +300 @@
 
     in_addr = (struct sockaddr_in *)&addr;
-    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "socket %d:(proto:%u) "
+    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "socket %d:(proto:%u) exp. in %d "
             "state=%R[natsockstate] "
             "f_(addr:port)=%RTnaipv4:%d "
             "l_(addr:port)=%RTnaipv4:%d "
             "name=%RTnaipv4:%d",
-            so->s, so->so_type, so->so_state,
+            so->s, so->so_type,
+            so->so_expire - curtime,
+            so->so_state,
             so->so_faddr.s_addr,
             RT_N2H_U16(so->so_fport),
@@ -535 +538 @@
 
 int
-debug_init()
+debug_init(PNATState pData)
 {
     int rc = VINF_SUCCESS;
@@ -544 +547 @@
     {
 
-        rc = RTStrFormatTypeRegister("natsock", printSocket, NULL);            AssertRC(rc);
+        rc = RTStrFormatTypeRegister("natsock", printSocket, pData);            AssertRC(rc);
         rc = RTStrFormatTypeRegister("natsockstate", printNATSocketState, NULL);            AssertRC(rc);
         rc = RTStrFormatTypeRegister("natwinnetevents",

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

@@ -32 +32 @@
 #define FILE void
 
-int debug_init (void);
+int debug_init (PNATState);
 void ipstats (PNATState);
 void tcpstats (PNATState);

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

@@ -631 +631 @@
         return rc;
     }
-    debug_init();
+    debug_init(pData);
     if_init(pData);
     ip_init(pData);