From 0a0bed1c7bb2ec8227154b943cfda4a8c97c32a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 21 Jul 2010 16:23:38 +0000 Subject: [PATCH] * Improved debug output; ipv4 will now dump the whole header if TRACE_IPV4 is defined. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37661 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/network/protocols/icmp/icmp.cpp | 1 + src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/add-ons/kernel/network/protocols/icmp/icmp.cpp b/src/add-ons/kernel/network/protocols/icmp/icmp.cpp index dee67029ee..be953ad8a1 100644 --- a/src/add-ons/kernel/network/protocols/icmp/icmp.cpp +++ b/src/add-ons/kernel/network/protocols/icmp/icmp.cpp @@ -401,6 +401,7 @@ icmp_error_reply(net_protocol* protocol, net_buffer* buffer, uint32 code, uint8 icmpType, icmpCode; icmp_decode(code, icmpType, icmpCode); + TRACE(" icmp type %u, code %u\n", icmpType, icmpCode); NetBufferHeaderReader bufferHeader(buffer); size_t offset = 0; diff --git a/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp b/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp index 55bc52a64d..bad8dd064c 100644 --- a/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp +++ b/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp @@ -43,9 +43,11 @@ # define TRACE_SK(protocol, format, args...) \ dprintf("IPv4 [%llu] %p " format "\n", system_time(), \ protocol , ##args) +# define TRACE_ONLY(x) x #else -# define TRACE(args...) do { } while (0) -# define TRACE_SK(args...) do { } while (0) +# define TRACE(args...) ; +# define TRACE_SK(args...) ; +# define TRACE_ONLY(x) #endif @@ -438,7 +440,7 @@ FragmentPacket::StaleTimer(struct net_timer* timer, void* data) // #pragma mark - -#if 0 +#ifdef TRACE_IPV4 static void dump_ipv4_header(ipv4_header &header) { @@ -473,7 +475,7 @@ dump_ipv4_header(ipv4_header &header) dprintf(" source: %d.%d.%d.%d\n", src->a, src->b, src->c, src->d); dprintf(" destination: %d.%d.%d.%d\n", dst->a, dst->b, dst->c, dst->d); } -#endif +#endif // TRACE_IPV4 static int @@ -1547,7 +1549,7 @@ ipv4_receive_data(net_buffer* buffer) return bufferHeader.Status(); ipv4_header& header = bufferHeader.Data(); - //dump_ipv4_header(header); + TRACE_ONLY(dump_ipv4_header(header)); if (header.version != IP_VERSION) return B_BAD_TYPE;