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

Timestamp:

Dec 2, 2008 6:12:45 AM (16 years ago)

Author:

vboxsync

Message:

registered log formatter prining IPv4 addresses on %R[IP4]

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

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

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

@@ -8 +8 @@
 
 #include <slirp.h>
+#include <iprt/string.h>
+#include <iprt/stream.h>
 
 
@@ -215 +217 @@
         }
 }
-
+static size_t 
+print_ipv4_address(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput,
+                                               const char *pszType, void const *pvValue,
+                                               int cchWidth, int cchPrecision, unsigned fFlags,
+                                               void *pvUser)
+{
+        uint32_t ip;
+        size_t cch = 0;
+        size_t cchNum = 0;
+        char szNum[64];
+        if (strncmp(pszType, "IP4", 3) != 0) {
+                RTPrintf("%s: IP4 expected\n", __FUNCTION__);
+        }
+        ip = (uint32_t)pvValue;
+
+        cchNum = RTStrFormatNumber(szNum, ip & ((1 << 8) - 1), 0, cchWidth, cchPrecision, fFlags);
+        cch += pfnOutput(pvArgOutput, szNum, cchNum);
+        cch += pfnOutput(pvArgOutput, ".", 1);
+
+        cchNum = RTStrFormatNumber(szNum, (ip >> 8) & ((1 << 8) - 1), 0, cchWidth, cchPrecision, fFlags);
+        cch += pfnOutput(pvArgOutput, szNum, cchNum);
+        cch += pfnOutput(pvArgOutput, ".", 1);
+
+        cchNum = RTStrFormatNumber(szNum, (ip >> 16) & ((1 << 8) - 1), 0, cchWidth, cchPrecision, fFlags);
+        cch += pfnOutput(pvArgOutput, szNum, cchNum);
+        cch += pfnOutput(pvArgOutput, ".", 1);
+
+        cchNum = RTStrFormatNumber(szNum, (ip >> 24) & ((1 << 8) - 1), 0, cchWidth, cchPrecision, fFlags);
+        cch += pfnOutput(pvArgOutput, szNum, cchNum);
+        return (cch);
+}
+
+int 
+debug_init() 
+{
+        int status = VINF_SUCCESS;
+        status = RTStrFormatTypeRegister("IP4", print_ipv4_address, NULL);
+        AssertRC(status);
+        return (status);
+}

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

@@ -62 +62 @@
 #endif  /* !LOG_ENABLED */
 
-void debug_init _P((char *, int));
+int debug_init _P((void));
 void ipstats _P((PNATState));
 void tcpstats _P((PNATState));

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

@@ -243 +243 @@
     link_up = 1;
 
+    debug_init();
     if_init(pData);
     ip_init(pData);