Commit 8ee2022b authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Samuel Thibault
Browse files

slirp/debug: Print IP addresses in human readable form 



Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
parent 05658ecb

slirp/arp_table.c

+2 −2
Original line number Diff line number Diff line
@@ -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 = %s", inet_ntoa(*(struct in_addr *)&ip_addr));

    DEBUG_ARG("ip = %s", inet_ntoa((struct in_addr){.s_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]));
@@ -67,7 +67,7 @@ bool arp_table_search(Slirp *slirp, uint32_t ip_addr, 
    int i;



    DEBUG_CALL("arp_table_search");

    DEBUG_ARG("ip = %s", inet_ntoa(*(struct in_addr *)&ip_addr));

    DEBUG_ARG("ip = %s", inet_ntoa((struct in_addr){.s_addr = ip_addr}));



    /* If broadcast address */

    if (ip_addr == 0xffffffff || ip_addr == broadcast_addr) {

slirp/socket.c

+2 −2
Original line number Diff line number Diff line
@@ -701,9 +701,9 @@ tcp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr, 
	memset(&addr, 0, addrlen);



	DEBUG_CALL("tcp_listen");

	DEBUG_ARG("haddr = %s", inet_ntoa(*(struct in_addr *)&haddr));

	DEBUG_ARG("haddr = %s", inet_ntoa((struct in_addr){.s_addr = haddr}));

	DEBUG_ARG("hport = %d", ntohs(hport));

	DEBUG_ARG("laddr = %s", inet_ntoa(*(struct in_addr *)&laddr));

	DEBUG_ARG("laddr = %s", inet_ntoa((struct in_addr){.s_addr = laddr}));

	DEBUG_ARG("lport = %d", ntohs(lport));

	DEBUG_ARG("flags = %x", flags);