diff --git a/doc/Changelog b/doc/Changelog index c8f8cfa88..a7ec5ec7b 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,8 @@ +18 August 2008: Wouter + - changes info: in logfile to notice: info: or debug: depending on + the verbosity of the statements. Better logfile message + classification. + 15 August 2008: Wouter - DLV nsec code fixed for better detection of closest existing enclosers from NSEC responses. diff --git a/util/log.c b/util/log.c index 7b1e9d850..5e9e54f58 100644 --- a/util/log.c +++ b/util/log.c @@ -235,8 +235,8 @@ verbose(enum verbosity_value level, const char* format, ...) va_end(args); } -void -log_hex(const char* msg, void* data, size_t length) +static void +log_hex_f(enum verbosity_value v, const char* msg, void* data, size_t length) { size_t i, j; uint8_t* data8 = (uint8_t*)data; @@ -246,7 +246,7 @@ log_hex(const char* msg, void* data, size_t length) size_t len; if(length == 0) { - log_info("%s[%u]", msg, (unsigned)length); + verbose(v, "%s[%u]", msg, (unsigned)length); return; } @@ -259,16 +259,22 @@ log_hex(const char* msg, void* data, size_t length) buf[j*2 + 1] = hexchar[ data8[i+j] & 0xF ]; } buf[len*2] = 0; - log_info("%s[%u:%u] %.*s", msg, (unsigned)length, + verbose(v, "%s[%u:%u] %.*s", msg, (unsigned)length, (unsigned)i, (int)len*2, buf); } } +void +log_hex(const char* msg, void* data, size_t length) +{ + log_hex_f(verbosity, msg, data, length); +} + void log_buf(enum verbosity_value level, const char* msg, ldns_buffer* buf) { if(verbosity < level) return; - log_hex(msg, ldns_buffer_begin(buf), ldns_buffer_limit(buf)); + log_hex_f(level, msg, ldns_buffer_begin(buf), ldns_buffer_limit(buf)); } #ifdef USE_WINSOCK diff --git a/util/net_help.c b/util/net_help.c index 76cb6b619..7a901c990 100644 --- a/util/net_help.c +++ b/util/net_help.c @@ -171,9 +171,9 @@ log_addr(enum verbosity_value v, const char* str, dest[sizeof(dest)-1] = 0; port = ntohs(((struct sockaddr_in*)addr)->sin_port); if(verbosity >= 4) - log_info("%s %s %s port %d (len %d)", str, family, dest, + verbose(v, "%s %s %s port %d (len %d)", str, family, dest, (int)port, (int)addrlen); - else log_info("%s %s port %d", str, dest, (int)port); + else verbose(v, "%s %s port %d", str, dest, (int)port); } int