i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv6: Fix ability to disable ipv6 tracing. Disable ipv6 tracing

Browse Source
This commit is contained in:
Alexander von Gluck IV
2012-02-09 15:36:06 -06:00
parent 842cfbca2d
commit 1684be5e39
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/protocols/ipv6/ipv6.cpp
+13 -12
View File
@@ -38,16 +38,15 @@
#include <utility> #include <utility>
#define TRACE_IPV6 //#define TRACE_IPV6
#ifdef TRACE_IPV6 #ifdef TRACE_IPV6
# define TRACE(format, args...) \ #define TRACE(format, args...) \
dprintf("IPv6 [%llu] " format "\n", system_time() , ##args) dprintf("IPv6 [%llu] " format "\n", system_time(), ##args)
# define TRACE_SK(protocol, format, args...) \ #define TRACE_SK(protocol, format, args...) \
dprintf("IPv6 [%llu] %p " format "\n", system_time(), \ dprintf("IPv6 [%llu] %p " format "\n", system_time(), protocol, ##args)
protocol , ##args)
#else #else
# define TRACE(args...) do { } while (0) #define TRACE(args...)
# define TRACE_SK(args...) do { } while (0) #define TRACE_SK(args...)
#endif #endif
@@ -1317,8 +1316,8 @@ ipv6_send_routed_data(net_protocol* _protocol, struct net_route* route,
} }
char addrbuf[INET6_ADDRSTRLEN]; char addrbuf[INET6_ADDRSTRLEN];
TRACE_SK(protocol, " SendRoutedData(): destination: %s", ip6_sprintf(&destination.sin6_addr, addrbuf);
ip6_sprintf(&destination.sin6_addr, addrbuf)); TRACE_SK(protocol, " SendRoutedData(): destination: %s", addrbuf);
uint32 mtu = route->mtu ? route->mtu : interface->mtu; uint32 mtu = route->mtu ? route->mtu : interface->mtu;
if (buffer->size > mtu) { if (buffer->size > mtu) {
@@ -1460,11 +1459,13 @@ ipv6_receive_data(net_buffer* buffer)
&buffer->interface_address, &matchedAddressType) &buffer->interface_address, &matchedAddressType)
&& !sDatalinkModule->is_local_link_address(sDomain, true, && !sDatalinkModule->is_local_link_address(sDomain, true,
buffer->destination, &buffer->interface_address)) { buffer->destination, &buffer->interface_address)) {
char srcbuf[INET6_ADDRSTRLEN]; char srcbuf[INET6_ADDRSTRLEN];
char dstbuf[INET6_ADDRSTRLEN]; char dstbuf[INET6_ADDRSTRLEN];
ip6_sprintf(&header.Src(), srcbuf);
ip6_sprintf(&header.Dst(), dstbuf);
TRACE(" ipv6_receive_data(): packet was not for us %s -> %s", TRACE(" ipv6_receive_data(): packet was not for us %s -> %s",
ip6_sprintf(&header.Src(), srcbuf), srcbuf, dstbuf);
ip6_sprintf(&header.Dst(), dstbuf));
// TODO: Send ICMPv6 error: Host unreachable // TODO: Send ICMPv6 error: Host unreachable
return B_ERROR; return B_ERROR;