upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better logfile classification for log_bug, log_hex and log_addr.

Browse source 
git-svn-id: file:///svn/unbound/trunk@1194 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2008-08-18 08:17:07 +00:00
parent 87fe8871b0
commit 8cbb13f251
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/Changelog
View file

@ -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 15 August 2008: Wouter
- DLV nsec code fixed for better detection of closest existing - DLV nsec code fixed for better detection of closest existing
enclosers from NSEC responses. enclosers from NSEC responses.

16
util/log.c
View file

@ -235,8 +235,8 @@ verbose(enum verbosity_value level, const char* format, ...)
va_end(args); va_end(args);
} }
void static void
log_hex(const char* msg, void* data, size_t length) log_hex_f(enum verbosity_value v, const char* msg, void* data, size_t length)
{ {
size_t i, j; size_t i, j;
uint8_t* data8 = (uint8_t*)data; uint8_t* data8 = (uint8_t*)data;
@ -246,7 +246,7 @@ log_hex(const char* msg, void* data, size_t length)
size_t len; size_t len;
if(length == 0) { if(length == 0) {
log_info("%s[%u]", msg, (unsigned)length); verbose(v, "%s[%u]", msg, (unsigned)length);
return; 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[j*2 + 1] = hexchar[ data8[i+j] & 0xF ];
} }
buf[len*2] = 0; 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); (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) void log_buf(enum verbosity_value level, const char* msg, ldns_buffer* buf)
{ {
if(verbosity < level) if(verbosity < level)
return; 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 #ifdef USE_WINSOCK

4
util/net_help.c
View file

@ -171,9 +171,9 @@ log_addr(enum verbosity_value v, const char* str,
dest[sizeof(dest)-1] = 0; dest[sizeof(dest)-1] = 0;
port = ntohs(((struct sockaddr_in*)addr)->sin_port); port = ntohs(((struct sockaddr_in*)addr)->sin_port);
if(verbosity >= 4) 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); (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 int