Changeset 51575 in vbox for trunk/src

Timestamp:

Jun 8, 2014 12:22:18 PM (10 years ago)

Author:

vboxsync

Message:

NAT/Net: Get rid of inet_ntop(3). Add formatter for %R[ping_pcb] and use it.

File:

• trunk/src/VBox/NetworkServices/NAT/pxping.c (modified) (14 diffs)

trunk/src/VBox/NetworkServices/NAT/pxping.c

@@ -6 +6 @@
 #include "proxy_pollmgr.h"
 #include "pxremap.h"
+
+#include <iprt/string.h>
 
 #ifndef RT_OS_WINDOWS
@@ -14 +16 @@
 #endif
 #include <netinet/in.h>
-#include <arpa/inet.h>          /* XXX: inet_ntop */
 #include <poll.h>
 #include <stdint.h>
@@ -193 +194 @@
                                              ipX_addr_t *dst, u16_t host_id);
 
+static FNRTSTRFORMATTYPE pxping_pcb_rtstrfmt;
 static struct ping_pcb *pxping_pcb_allocate(struct pxping *pxping);
 static void pxping_pcb_register(struct pxping *pxping, struct ping_pcb *pcb);
@@ -199 +201 @@
 static void pxping_timeout_add(struct pxping *pxping, struct ping_pcb *pcb);
 static void pxping_timeout_del(struct pxping *pxping, struct ping_pcb *pcb);
-static void pxping_pcb_debug_print(struct ping_pcb *pcb);
 
 static int pxping_pmgr_pump(struct pollmgr_handler *handler, SOCKET fd, int revents);
@@ -329 +330 @@
     }
 
+    status = RTStrFormatTypeRegister("ping_pcb", pxping_pcb_rtstrfmt, NULL);
+    AssertRC(status);
+
     return ERR_OK;
 }
@@ -455 +459 @@
     }
 
-    pxping_pcb_debug_print(pcb); /* XXX */
-    DPRINTF((" seq %d len %u ttl %d\n",
+    DPRINTF(("ping %p: %R[ping_pcb] seq %d len %u ttl %d\n",
+             pcb, pcb,
              ntohs(icmph->seqno), (unsigned int)p->tot_len,
              IPH_TTL(iph)));
@@ -673 +677 @@
     }
 
-    pxping_pcb_debug_print(pcb); /* XXX */
-    DPRINTF((" seq %d len %u hopl %d\n",
+    DPRINTF(("ping %p: %R[ping_pcb] seq %d len %u hopl %d\n",
+             pcb, pcb,
              ntohs(seq), (unsigned int)p->tot_len,
              IP6H_HOPLIM(iph)));
@@ -747 +751 @@
 
 
-static void
-pxping_pcb_debug_print(struct ping_pcb *pcb)
-{
-    char addrbuf[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"];
-    const char *addrstr;
-    int sdom = pcb->is_ipv6 ? AF_INET6 : AF_INET;
-
-    DPRINTF(("ping %p:", (void *)pcb));
-
-    addrstr = inet_ntop(sdom, (void *)&pcb->src, addrbuf, sizeof(addrbuf));
-    DPRINTF((" %s", addrstr));
-
-    DPRINTF((" ->"));
-
-    addrstr = inet_ntop(sdom, (void *)&pcb->dst, addrbuf, sizeof(addrbuf));
-    DPRINTF((" %s", addrstr));
-
-    DPRINTF((" id %04x->%04x", ntohs(pcb->guest_id), ntohs(pcb->host_id)));
+/**
+ * Formatter for %R[ping_pcb].
+ */
+static DECLCALLBACK(size_t)
+pxping_pcb_rtstrfmt(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput,
+                    const char *pszType, const void *pvValue,
+                    int cchWidth, int cchPrecision, unsigned int fFlags,
+                    void *pvUser)
+{
+    const struct ping_pcb *pcb = (const struct ping_pcb *)pvValue;
+    size_t cb = 0;
+
+    NOREF(cchWidth);
+    NOREF(cchPrecision);
+    NOREF(fFlags);
+    NOREF(pvUser);
+
+    AssertReturn(strcmp(pszType, "ping_pcb") == 0, 0);
+
+    if (pcb == NULL) {
+        return RTStrFormat(pfnOutput, pvArgOutput, NULL, NULL, "(null)");
+    }
+
+    /* XXX: %RTnaipv4 takes the value, but %RTnaipv6 takes the pointer */
+    if (pcb->is_ipv6) {
+        cb += RTStrFormat(pfnOutput, pvArgOutput, NULL, NULL,
+                          "%RTnaipv6 -> %RTnaipv6", &pcb->src, &pcb->dst);
+    }
+    else {
+        cb += RTStrFormat(pfnOutput, pvArgOutput, NULL, NULL,
+                          "%RTnaipv4 -> %RTnaipv4",
+                          ip4_addr_get_u32(ipX_2_ip(&pcb->src)),
+                          ip4_addr_get_u32(ipX_2_ip(&pcb->dst)));
+    }
+                      
+    cb += RTStrFormat(pfnOutput, pvArgOutput, NULL, NULL,
+                      " id %04x->%04x", ntohs(pcb->guest_id), ntohs(pcb->host_id));
+
+    return cb;
 }
 
@@ -932 +957 @@
         sys_mutex_unlock(&pxping->lock);
 
-        pxping_pcb_debug_print(pcb); /* XXX */
-        DPRINTF((" - created\n"));
+        DPRINTF(("ping %p: %R[ping_pcb] - created\n", pcb, pcb));
 
         pxping_timer_needed(pxping);
@@ -939 +963 @@
     else {
         /* just bump up expiration timeout lazily */
-        pxping_pcb_debug_print(pcb); /* XXX */
-        DPRINTF((" - slot %d -> %d\n",
+        DPRINTF(("ping %p: %R[ping_pcb] - slot %d -> %d\n",
+                 pcb, pcb,
                  (unsigned int)pcb->timeout_slot,
                  (unsigned int)pxping->timeout_slot));
@@ -1195 +1219 @@
     seq = icmph->seqno;
 
-    {
-        char addrbuf[sizeof "255.255.255.255"];
-        const char *addrstr;
-
-        addrstr = inet_ntop(AF_INET, &peer->sin_addr, addrbuf, sizeof(addrbuf));
-        DPRINTF(("<--- PING %s id 0x%x seq %d\n",
-                 addrstr, ntohs(id), ntohs(seq)));
-    }
-
+    DPRINTF(("<--- PING %RTnaipv4 id 0x%x seq %d\n",
+             peer->sin_addr.s_addr, ntohs(id), ntohs(seq)));
 
     /*
@@ -1339 +1356 @@
     seq = oicmph->seqno;
 
-    {
-        char addrbuf[sizeof "255.255.255.255"];
-        const char *addrstr;
-
-        addrstr = inet_ntop(AF_INET, &oiph->dest, addrbuf, sizeof(addrbuf));
-        DPRINTF2(("%s: ping %s id 0x%x seq %d",
-                  __func__, addrstr, ntohs(id), ntohs(seq)));
-        if (ICMPH_TYPE(icmph) == ICMP_DUR) {
-            DPRINTF2((" unreachable (code %d)\n", ICMPH_CODE(icmph)));
-        }
-        else {
-            DPRINTF2((" time exceeded\n"));
-        }
+    DPRINTF2(("%s: ping %RTnaipv4 id 0x%x seq %d",
+              __func__, ip4_addr_get_u32(&oiph->dest), ntohs(id), ntohs(seq)));
+    if (ICMPH_TYPE(icmph) == ICMP_DUR) {
+        DPRINTF2((" unreachable (code %d)\n", ICMPH_CODE(icmph)));
+    }
+    else {
+        DPRINTF2((" time exceeded\n"));
     }
 
@@ -1454 +1465 @@
     int status;
 
-    char addrbuf[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"];
-    const char *addrstr;
-
     /*
      * Reads from raw IPv6 sockets deliver only the payload.  Full
@@ -1497 +1505 @@
     icmph = (struct icmp6_echo_hdr *)pollmgr_udpbuf;
 
-    addrstr = inet_ntop(AF_INET6, (void *)&sin6.sin6_addr,
-                        addrbuf, sizeof(addrbuf));
-    DPRINTF2(("%s: %s ICMPv6: ", __func__, addrstr));
+    DPRINTF2(("%s: %RTnaipv6 ICMPv6: ", __func__, &sin6.sin6_addr));
 
     if (icmph->type == ICMP6_TYPE_EREP) {