From 72c7e45913048bf7a7a9f4f898363ea802ba3ab7 Mon Sep 17 00:00:00 2001 From: des Date: Fri, 4 Dec 2015 13:26:12 +0000 Subject: MFH (r287917, r287918, r289063): upgrade to latest Unbound MFH (r283301, r289592, r291582): rc script improvements MFH (r287880): respect manually configured forwarders when using DHCP MFH (r289321): deconfuse man page PR: 184047 203580 204931 --- contrib/unbound/util/log.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'contrib/unbound/util/log.c') diff --git a/contrib/unbound/util/log.c b/contrib/unbound/util/log.c index f90efa7..3ebd120 100644 --- a/contrib/unbound/util/log.c +++ b/contrib/unbound/util/log.c @@ -40,7 +40,7 @@ #include "config.h" #include "util/log.h" #include "util/locks.h" -#include "ldns/sbuffer.h" +#include "sldns/sbuffer.h" #include #ifdef HAVE_TIME_H #include @@ -164,6 +164,14 @@ void log_thread_set(int* num) ub_thread_key_set(logkey, num); } +int log_thread_get(void) +{ + unsigned int* tid; + if(!key_created) return 0; + tid = (unsigned int*)ub_thread_key_get(logkey); + return (int)(tid?*tid:0); +} + void log_ident_set(const char* id) { ident = id; -- cgit v1.1