diff options
author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2018-02-01 20:35:45 +1100 |
---|---|---|
committer | Michael Tokarev <mjt@tls.msk.ru> | 2018-05-20 08:25:23 +0300 |
commit | 58b2828cc53477fd89d1e7dc4d871bbb5cb83186 (patch) | |
tree | caef13a64dccd87487474cd5a7cc1a4fd01c873f | |
parent | 3b5ce4c465310102ddf6bb5006b713588ee90616 (diff) | |
download | slirp-58b2828cc53477fd89d1e7dc4d871bbb5cb83186.zip slirp-58b2828cc53477fd89d1e7dc4d871bbb5cb83186.tar.gz slirp-58b2828cc53477fd89d1e7dc4d871bbb5cb83186.tar.bz2 |
slirp/debug: Print IP addresses in human readable form
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r-- | arp_table.c | 4 | ||||
-rw-r--r-- | socket.c | 8 | ||||
-rw-r--r-- | udp.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arp_table.c b/arp_table.c index ad76531..b4e96c2 100644 --- a/arp_table.c +++ b/arp_table.c @@ -33,7 +33,7 @@ void arp_table_add(Slirp *slirp, uint32_t ip_addr, uint8_t ethaddr[ETH_ALEN]) int i; DEBUG_CALL("arp_table_add"); - DEBUG_ARG("ip = 0x%x", ip_addr); + DEBUG_ARG("ip = %s", inet_ntoa(*(struct in_addr *)&ip_addr)); DEBUG_ARGS((dfd, " hw addr = %02x:%02x:%02x:%02x:%02x:%02x\n", ethaddr[0], ethaddr[1], ethaddr[2], ethaddr[3], ethaddr[4], ethaddr[5])); @@ -66,7 +66,7 @@ bool arp_table_search(Slirp *slirp, uint32_t ip_addr, int i; DEBUG_CALL("arp_table_search"); - DEBUG_ARG("ip = 0x%x", ip_addr); + DEBUG_ARG("ip = %s", inet_ntoa(*(struct in_addr *)&ip_addr)); /* If broadcast address */ if (ip_addr == 0xffffffff || ip_addr == broadcast_addr) { @@ -701,10 +701,10 @@ struct socket *tcp_listen(Slirp *slirp, uint32_t haddr, u_int hport, memset(&addr, 0, addrlen); DEBUG_CALL("tcp_listen"); - DEBUG_ARG("haddr = %x", haddr); - DEBUG_ARG("hport = %d", hport); - DEBUG_ARG("laddr = %x", laddr); - DEBUG_ARG("lport = %d", lport); + DEBUG_ARG("haddr = %s", inet_ntoa(*(struct in_addr *)&haddr)); + DEBUG_ARG("hport = %d", ntohs(hport)); + DEBUG_ARG("laddr = %s", inet_ntoa(*(struct in_addr *)&laddr)); + DEBUG_ARG("lport = %d", ntohs(lport)); DEBUG_ARG("flags = %x", flags); so = socreate(slirp); @@ -237,8 +237,8 @@ int udp_output(struct socket *so, struct mbuf *m, struct sockaddr_in *saddr, DEBUG_CALL("udp_output"); DEBUG_ARG("so = %p", so); DEBUG_ARG("m = %p", m); - DEBUG_ARG("saddr = %lx", (long)saddr->sin_addr.s_addr); - DEBUG_ARG("daddr = %lx", (long)daddr->sin_addr.s_addr); + DEBUG_ARG("saddr = %s", inet_ntoa(saddr->sin_addr)); + DEBUG_ARG("daddr = %s", inet_ntoa(daddr->sin_addr)); /* * Adjust for header |