Changeset 37738 in vbox for trunk/src/VBox/Devices

Timestamp:

Jul 3, 2011 11:41:17 AM (14 years ago)

Author:

vboxsync

Message:

NAT: tracing tcp machine state change.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• debug.c (modified) (3 diffs)
• debug.h (modified) (1 diff)
• tcp_input.c (modified) (12 diffs)
• tcp_subr.c (modified) (5 diffs)

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

@@ -34 +34 @@
 void dump_packet(void *, int);
 #endif
+
+#ifndef STRINGIFY
+# define STRINGIFY(x) #x
+#endif
+
+static char *g_apszTcpStates[TCP_NSTATES] =
+{
+    STRINGIFY(TCPS_CLOSED),
+    STRINGIFY(TCPS_LISTEN),
+    STRINGIFY(TCPS_SYN_SENT),
+    STRINGIFY(TCPS_SYN_RECEIVED),
+    STRINGIFY(TCPS_ESTABLISHED),
+    STRINGIFY(TCPS_CLOSE_WAIT),
+    STRINGIFY(TCPS_FIN_WAIT_1),
+    STRINGIFY(TCPS_CLOSING),
+    STRINGIFY(TCPS_LAST_ACK),
+    STRINGIFY(TCPS_FIN_WAIT_2),
+    STRINGIFY(TCPS_TIME_WAIT)
+};
 
 /*
@@ -295 +314 @@
     cb += RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "SEG[ACK: %x, SEQ: %x, LEN: %x, WND: %x, UP: %x]",
                       ti->ti_ack, ti->ti_seq, ti->ti_len, ti->ti_win, ti->ti_urp);
+    return cb;
+}
+
+/*
+ * Prints TCP state
+ */
+static DECLCALLBACK(size_t)
+printTcpState(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput,
+                 const char *pszType, void const *pvValue,
+                 int cchWidth, int cchPrecision, unsigned fFlags,
+                 void *pvUser)
+{
+    size_t cb = 0;
+    const int idxTcpState = (int)pvValue;
+    char *pszTcpStateName = (idxTcpState >= 0 && idxTcpState < TCP_NSTATES) ? g_apszTcpStates[idxTcpState] : "TCPS_INVALIDE_STATE";
+    AssertReturn(RTStrCmp(pszType, "tcpstate") == 0, 0);
+    cb += RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "%s", pszTcpStateName);
     return cb;
 }
@@ -365 +401 @@
         rc = RTStrFormatTypeRegister("tcpseg793", printTcpSegmentRfc793, NULL);
         AssertRC(rc);
+        rc = RTStrFormatTypeRegister("tcpstate", printTcpState, NULL);
+        AssertRC(rc);
         g_fFormatRegistered = 1;
     }

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

@@ -40 +40 @@
 void sockstats (PNATState);
 
+#ifdef LOG_ENABLED
+# define TCP_STATE_SWITCH_TO(tp, new_tcp_state)                                                                     \
+do {                                                                                                                \
+    Log2(("%R[tcpcb793] switch to %R[tcpstate] -> %R[tcpstate]\n", (tp), (tp), (tp->t_state) ,(new_tcp_state)));    \
+    if ((tp)->t_socket)                                                                                             \
+        Log2(("%R[tcpcb793] %R[natsock]\n", (tp), (tp)->t_socket));                                                 \
+    (tp)->t_state = (new_tcp_state);                                                                                \
+} while(0)
+#else
+# define TCP_STATE_SWITCH_TO(tp, new_tcp_state) (tp)->t_state = (new_tcp_state)
 #endif
+#endif

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

@@ -549 +549 @@
 
         tp = sototcpcb(so);
-        tp->t_state = TCPS_LISTEN;
+        TCP_STATE_SWITCH_TO(tp, TCPS_LISTEN);
     }
 
@@ -839 +839 @@
                 so->so_ti = ti;
                 tp->t_timer[TCPT_KEEP] = TCPTV_KEEP_INIT;
-                tp->t_state = TCPS_SYN_RECEIVED;
+                TCP_STATE_SWITCH_TO(tp, TCPS_SYN_RECEIVED);
             }
             SOCKET_UNLOCK(so);
@@ -873 +873 @@
             tcp_rcvseqinit(tp);
             tp->t_flags |= TF_ACKNOW;
-            tp->t_state = TCPS_SYN_RECEIVED;
+            TCP_STATE_SWITCH_TO(tp, TCPS_SYN_RECEIVED);
             tp->t_timer[TCPT_KEEP] = TCPTV_KEEP_INIT;
             tcpstat.tcps_accepts++;
@@ -929 +929 @@
                 tcpstat.tcps_connects++;
                 soisfconnected(so);
-                tp->t_state = TCPS_ESTABLISHED;
+                TCP_STATE_SWITCH_TO(tp, TCPS_ESTABLISHED);
 
                 /* Do window scaling on this connection? */
@@ -949 +949 @@
             }
             else
-                tp->t_state = TCPS_SYN_RECEIVED;
+                TCP_STATE_SWITCH_TO(tp, TCPS_SYN_RECEIVED);
 
 trimthenstep6:
@@ -1171 +1171 @@
 close:
             LogFlowFunc(("close:\n"));
-            tp->t_state = TCPS_CLOSED;
+            TCP_STATE_SWITCH_TO(tp, TCPS_CLOSED);
             tcpstat.tcps_drops++;
             tp = tcp_close(pData, tp);
@@ -1220 +1220 @@
                 goto dropwithreset;
             tcpstat.tcps_connects++;
-            tp->t_state = TCPS_ESTABLISHED;
+            TCP_STATE_SWITCH_TO(tp, TCPS_ESTABLISHED);
             /*
              * The sent SYN is ack'ed with our sequence number +1
@@ -1445 +1445 @@
                             tp->t_timer[TCPT_2MSL] = tcp_maxidle;
                         }
-                        tp->t_state = TCPS_FIN_WAIT_2;
+                        TCP_STATE_SWITCH_TO(tp, TCPS_FIN_WAIT_2);
                     }
                     break;
@@ -1458 +1458 @@
                     if (ourfinisacked)
                     {
-                        tp->t_state = TCPS_TIME_WAIT;
+                        TCP_STATE_SWITCH_TO(tp, TCPS_TIME_WAIT);
                         tcp_canceltimers(tp);
                         tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;
@@ -1661 +1661 @@
             case TCPS_SYN_RECEIVED:
             case TCPS_ESTABLISHED:
-                tp->t_state = TCPS_CLOSE_WAIT;
+                TCP_STATE_SWITCH_TO(tp, TCPS_CLOSE_WAIT);
                 break;
 
@@ -1669 +1669 @@
              */
             case TCPS_FIN_WAIT_1:
-                tp->t_state = TCPS_CLOSING;
+                TCP_STATE_SWITCH_TO(tp, TCPS_CLOSING);
                 break;
 
@@ -1678 +1678 @@
              */
             case TCPS_FIN_WAIT_2:
-                tp->t_state = TCPS_TIME_WAIT;
+                TCP_STATE_SWITCH_TO(tp, TCPS_TIME_WAIT);
                 tcp_canceltimers(tp);
                 tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;

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

@@ -225 +225 @@
     tp->snd_cwnd = TCP_MAXWIN << TCP_MAX_WINSHIFT;
     tp->snd_ssthresh = TCP_MAXWIN << TCP_MAX_WINSHIFT;
-    tp->t_state = TCPS_CLOSED;
+    TCP_STATE_SWITCH_TO(tp, TCPS_CLOSED);
 
     so->so_tcpcb = tp;
@@ -248 +248 @@
     if (TCPS_HAVERCVDSYN(tp->t_state))
     {
-        tp->t_state = TCPS_CLOSED;
+        TCP_STATE_SWITCH_TO(tp, TCPS_CLOSED);
         (void) tcp_output(pData, tp);
         tcpstat.tcps_drops++;
@@ -360 +360 @@
         case TCPS_LISTEN:
         case TCPS_SYN_SENT:
-            tp->t_state = TCPS_CLOSED;
+            TCP_STATE_SWITCH_TO(tp, TCPS_CLOSED);
             tp = tcp_close(pData, tp);
             break;
@@ -366 +366 @@
         case TCPS_SYN_RECEIVED:
         case TCPS_ESTABLISHED:
-            tp->t_state = TCPS_FIN_WAIT_1;
+            TCP_STATE_SWITCH_TO(tp, TCPS_FIN_WAIT_1);
             break;
 
         case TCPS_CLOSE_WAIT:
-            tp->t_state = TCPS_LAST_ACK;
+            TCP_STATE_SWITCH_TO(tp, TCPS_LAST_ACK);
             break;
     }
@@ -584 +584 @@
     tcpstat.tcps_connattempt++;
 
-    tp->t_state = TCPS_SYN_SENT;
+    TCP_STATE_SWITCH_TO(tp, TCPS_SYN_SENT);
     tp->t_timer[TCPT_KEEP] = TCPTV_KEEP_INIT;
     tp->iss = tcp_iss;