diff options
| author | Marcin Siodelski <marcin@isc.org> | 2017-06-28 18:23:04 +0200 |
|---|---|---|
| committer | Marcin Siodelski <marcin@isc.org> | 2017-06-28 18:23:04 +0200 |
| commit | f0c62861b2e0f7605ae02884ed0d9b4d640389c1 (patch) | |
| tree | 0f6ca256f2fa29403d567b69a4a6e2a9b5704e11 | |
| parent | 7eeb48507d308ed8f9b89aba871d77fb3c3850f2 (diff) | |
| download | isc-dhcp-f0c62861b2e0f7605ae02884ed0d9b4d640389c1.tar.gz | |
[v4_1_esv] Changed severity of the log message indicating checksum errors.
Merges in rt41757.
| -rw-r--r-- | RELNOTES | 5 | ||||
| -rw-r--r-- | common/packet.c | 6 | ||||
| -rw-r--r-- | includes/site.h | 7 |
3 files changed, 15 insertions, 3 deletions
@@ -180,6 +180,11 @@ by Eric Young (eay@cryptsoft.com). [ISC-bugs #19430] [ISC-bugs #18111] +- 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.1-ESV-R14b1 - None diff --git a/common/packet.c b/common/packet.c index 85cc6f01..52b925c8 100644 --- a/common/packet.c +++ b/common/packet.c @@ -49,7 +49,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... */ @@ -353,8 +353,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 39212c60..b467d013 100644 --- a/includes/site.h +++ b/includes/site.h @@ -103,6 +103,13 @@ /* #define DEBUG_DUMP_ALL_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. */ |