Changeset 16443 in vbox for trunk/src/VBox/Devices/Network/slirp/debug.c

Timestamp:

Jan 31, 2009 7:16:03 AM (16 years ago)

Author:

vboxsync

Message:

NAT:MT

1. slirp queue inroduced
2. main points of thread interactions are saved with critical sections
3. slirp polling routine and timers communicates with NAT guest IO thread via queue

TODO: not works well, not compilable on Unixes.

File:

• trunk/src/VBox/Devices/Network/slirp/debug.c (modified) (6 diffs)

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

@@ -185 +185 @@
     char buff[256];
     int n;
-    struct socket *so;
+    struct socket *so, *so_next;
 
     lprint(" \n");
@@ -192 +192 @@
            "Proto[state]     Sock     Local Address, Port  Remote Address, Port RecvQ SendQ\n");
 
-    for (so = tcb.so_next; so != &tcb; so = so->so_next)
-    {
+    QSOCKET_FOREACH(so, so_next, tcp)
+    /* { */
         n = sprintf(buff, "tcp[%s]", so->so_tcpcb?tcpstates[so->so_tcpcb->t_state]:"NONE");
         while (n < 17)
@@ -203 +203 @@
                 inet_ntoa(so->so_faddr), ntohs(so->so_fport),
                 so->so_rcv.sb_cc, so->so_snd.sb_cc);
+    LOOP_LABEL(tcp, so, so_next);
     }
 
-    for (so = udb.so_next; so != &udb; so = so->so_next)
-    {
+    QSOCKET_FOREACH(so, so_next, udp)
+    /* { */
         n = sprintf(buff, "udp[%d sec]", (so->so_expire - curtime) / 1000);
         while (n < 17)
@@ -216 +217 @@
                 inet_ntoa(so->so_faddr), ntohs(so->so_fport),
                 so->so_rcv.sb_cc, so->so_snd.sb_cc);
+    LOOP_LABEL(udp, so, so_next);
     }
 }
@@ -248 +250 @@
 
     AssertReturn(strcmp(pszType, "natsock") == 0, 0);
-
+    if (so->so_state == SS_NOFDREF || so->s == -1) 
+        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "socket SS_NODREF");
     status = getsockname(so->s, &addr, &socklen);
 
@@ -257 +260 @@
             "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), ntohs(so->so_fport),
-            IP4_ADDR_PRINTF_DECOMP(((struct sockaddr_in *)&addr)->sin_addr.s_addr),
+            IP4_ADDR_PRINTF_DECOMP(ntohl(((struct sockaddr_in *)&addr)->sin_addr.s_addr)),
             ntohs(((struct sockaddr_in *)&addr)->sin_port));
 }