Changeset 39430 in vbox

Timestamp:

Nov 28, 2011 8:25:42 AM (13 years ago)

Author:

vboxsync

Message:

NAT: logging (correct socket state printing).

File:

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

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

@@ -324 +324 @@
     uint32_t u32SocketState = (uint32_t)(uintptr_t)pvValue;
     int idxNATState = 0;
+    bool fFirst = true;
+    size_t cbReturn = 0;
     NOREF(cchWidth);
     NOREF(cchPrecision);
@@ -332 +334 @@
     for (idxNATState = 0; idxNATState < RT_ELEMENTS(g_apszSocketStates); ++idxNATState)
     {
-        if (u32SocketState == g_apszSocketStates[idxNATState].u32SocketState)
-            return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, g_apszSocketStates[idxNATState].pcszSocketStateName);
-    }
-    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "[unknown state %RX32]", u32SocketState);
+        if (u32SocketState & g_apszSocketStates[idxNATState].u32SocketState)
+        {
+            if (fFirst)
+            {
+                cbReturn += RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, g_apszSocketStates[idxNATState].pcszSocketStateName);
+                fFirst = false;
+            }
+            else
+                cbReturn += RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "|%s", g_apszSocketStates[idxNATState].pcszSocketStateName);
+        }
+    }
+
+    if (!cbReturn)
+        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "[unknown state %RX32]", u32SocketState);
+
+    return cbReturn;
 }