From 63ccfbb04553b64ad20dabb22a3055f6410bb890 Mon Sep 17 00:00:00 2001 From: Marcin Siodelski Date: Wed, 28 Jun 2017 17:37:48 +0200 Subject: [PATCH] [master] Changed severity of the log message indicating checksum errors. Merges in rt41757. --- RELNOTES | 5 +++++ common/packet.c | 6 +++--- includes/site.h | 7 +++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/RELNOTES b/RELNOTES index cbb00a69b..656c156f4 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1113,6 +1113,11 @@ by Eric Young (eay@cryptsoft.com). this the check was performed too far down stream to be detected in test mode. [ISC-Bugs #29892] +- Changed severity of the log message indicating UDP checksum errors in + the received packets from 'info' to 'debug' to avoid logging excessive + number of false positives when UDP checksum offloading is enabled. + [ISC-bugs #41757] + Changes since 4.2.0 (new features) - If a client renews before 'dhcp-cache-threshold' percent of its lease diff --git a/common/packet.c b/common/packet.c index e600e37c3..6f51df407 100644 --- a/common/packet.c +++ b/common/packet.c @@ -50,7 +50,7 @@ u_int32_t checksum (buf, nbytes, sum) unsigned i; #ifdef DEBUG_CHECKSUM - log_debug ("checksum (%x %d %x)", buf, nbytes, sum); + log_debug ("checksum (%x %d %x)", (unsigned)buf, nbytes, sum); #endif /* Checksum all the pairs of bytes first... */ @@ -366,8 +366,8 @@ decode_udp_ip_header(struct interface_info *interface, udp_packets_bad_checksum++; if (((udp_packets_seen > 4) && (udp_packets_bad_checksum != 0)) && ((udp_packets_seen / udp_packets_bad_checksum) < 2)) { - log_info ("%u bad udp checksums in %u packets", - udp_packets_bad_checksum, udp_packets_seen); + log_debug ("%u bad udp checksums in %u packets", + udp_packets_bad_checksum, udp_packets_seen); udp_packets_seen = udp_packets_bad_checksum = 0; } diff --git a/includes/site.h b/includes/site.h index ccd4b2409..b2fb8efc3 100644 --- a/includes/site.h +++ b/includes/site.h @@ -114,6 +114,13 @@ /* Define this if you want to debug the binary leases (lease_chain) code */ /* #define DEBUG_BINARY_LEASES */ +/* Define this if you want to debug checksum calculations */ +/* #define DEBUG_CHECKSUM */ + +/* Define this if you want to verbosely debug checksum calculations */ +/* #define DEBUG_CHECKSUM_VERBOSE */ + + /* Define this if you want DHCP failover protocol support in the DHCP server. */ -- 2.39.5