diff -u -r tcptrace-6.6.7/ipv6.c tcptrace-6.6.7-iip/ipv6.c --- tcptrace-6.6.7/ipv6.c Thu Nov 4 23:55:37 2004 +++ tcptrace-6.6.7-iip/ipv6.c Fri Dec 30 16:54:42 2005 @@ -438,11 +438,13 @@ if (ADDR_ISV4(paddr2)) ret = (paddr1->un.ip4.s_addr == paddr2->un.ip4.s_addr); } - if (debug > 3) - printf("SameAddr(%s(%d),%s(%d)) returns %d\n", - HostName(*paddr1), ADDR_VERSION(paddr1), + if (debug > 3) { + printf("SameAddr(%s(%d)", + HostName(*paddr1), ADDR_VERSION(paddr1)); + printf(",%s(%d)) returns %d\n", HostName(*paddr2), ADDR_VERSION(paddr2), ret); + } return ret; } @@ -463,11 +465,13 @@ if (ADDR_ISV4(paddr2)) ret = (paddr1->un.ip4.s_addr < paddr2->un.ip4.s_addr); } - if (debug > 3) - printf("LowAddr(%s(%d),%s(%d)) returns %d\n", - HostName(*paddr1), ADDR_VERSION(paddr1), + if (debug > 3) { + printf("LowAddr(%s(%d)", + HostName(*paddr1), ADDR_VERSION(paddr1)); + printf(",%s(%d)) returns %d\n", HostName(*paddr2), ADDR_VERSION(paddr2), ret); + } return ret; } #endif /* OLD_THESE_MOVED_TO_TRACE_C */ diff -u -r tcptrace-6.6.7/trace.c tcptrace-6.6.7-iip/trace.c --- tcptrace-6.6.7/trace.c Fri Nov 5 00:43:51 2004 +++ tcptrace-6.6.7-iip/trace.c Fri Dec 30 16:57:51 2005 @@ -177,11 +177,13 @@ ret = (memcmp(paddr1->un.ip6.s6_addr, paddr2->un.ip6.s6_addr,16) == 0); } - if (debug > 3) - printf("SameAddr(%s(%d),%s(%d)) returns %d\n", - HostName(*paddr1), ADDR_VERSION(paddr1), + if (debug > 3) { + printf("SameAddr(%s(%d)", + HostName(*paddr1), ADDR_VERSION(paddr1)); + printf(",%s(%d)) returns %d\n", HostName(*paddr2), ADDR_VERSION(paddr2), ret); + } return ret; } @@ -200,11 +202,13 @@ if (ADDR_ISV4(paddr2)) ret = (paddr1->un.ip4.s_addr < paddr2->un.ip4.s_addr); } - if (debug > 3) - printf("LowAddr(%s(%d),%s(%d)) returns %d\n", - HostName(*paddr1), ADDR_VERSION(paddr1), + if (debug > 3) { + printf("LowAddr(%s(%d)", + HostName(*paddr1), ADDR_VERSION(paddr1)); + printf(",%s(%d)) returns %d\n", HostName(*paddr2), ADDR_VERSION(paddr2), ret); + } return ret; } @@ -345,13 +349,15 @@ } } - if (debug > 3) - printf("Hash of (%s:%d,%s:%d) is %d\n", + if (debug > 3) { + printf("Hash of (%s:%d", HostName(ptpa->a_address), - ptpa->a_port, + ptpa->a_port); + printf(",%s:%d) is %d\n", HostName(ptpa->b_address), ptpa->b_port, ptpa->hash); + } } /*