From ac4535d4e5004cd66b7b5e090479476c586ed400 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Thu, 12 Mar 2009 09:36:28 +0000 Subject: [PATCH] log and tests fixups. git-svn-id: file:///svn/unbound/trunk@1521 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 4 ++++ smallapp/unbound-checkconf.c | 13 +++++++++++++ testcode/testbound.c | 5 +++-- testdata/04-checkconf.tpkg | Bin 4697 -> 4844 bytes util/log.c | 4 ++-- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 0038b5fa7..c0456f0c7 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,7 @@ +12 March 2009: Wouter + - log to App.logs on windows prints executable identity. + - fixup tests. + 11 March 2009: Wouter - winsock event handler resets WSAevents after signalled. - winsock event handler tests if signals are really signalled. diff --git a/smallapp/unbound-checkconf.c b/smallapp/unbound-checkconf.c index d49de9bf4..7e416ec53 100644 --- a/smallapp/unbound-checkconf.c +++ b/smallapp/unbound-checkconf.c @@ -49,6 +49,7 @@ #include "util/net_help.h" #include "util/regional.h" #include "iterator/iterator.h" +#include "iterator/iter_fwd.h" #include "validator/validator.h" #include "services/localzone.h" #ifdef HAVE_PWD_H @@ -520,6 +521,17 @@ morechecks(struct config_file* cfg, const char* fname) localzonechecks(cfg); } +/** check forwards */ +static void +check_fwd(struct config_file* cfg) +{ + struct iter_forwards* fwd = forwards_create(); + if(!fwd || !forwards_apply_cfg(fwd, cfg)) { + fatal_exit("Could not set forward zones"); + } + forwards_delete(fwd); +} + /** check config file */ static void checkconf(const char* cfgfile, const char* opt) @@ -535,6 +547,7 @@ checkconf(const char* cfgfile, const char* opt) morechecks(cfg, cfgfile); check_mod(cfg, iter_get_funcblock()); check_mod(cfg, val_get_funcblock()); + check_fwd(cfg); if(opt) print_option(cfg, opt); else printf("unbound-checkconf: no errors in %s\n", cfgfile); config_delete(cfg); diff --git a/testcode/testbound.c b/testcode/testbound.c index 6a7866040..ca0115f3d 100644 --- a/testcode/testbound.c +++ b/testcode/testbound.c @@ -320,14 +320,15 @@ int remote_control_callback(struct comm_point* ATTR_UNUSED(c), } void wsvc_command_option(const char* ATTR_UNUSED(wopt), - const char* ATTR_UNUSED(cfgfile), int ATTR_UNUSED(v)) + const char* ATTR_UNUSED(cfgfile), int ATTR_UNUSED(v), + int ATTR_UNUSED(c)) { log_assert(0); } void wsvc_setup_worker(struct worker* ATTR_UNUSED(worker)) { - log_assert(0); + /* do nothing */ } void worker_win_stop_cb(int ATTR_UNUSED(fd), short ATTR_UNUSED(ev), diff --git a/testdata/04-checkconf.tpkg b/testdata/04-checkconf.tpkg index af28ded0748946003c0a0e576f6b7ebaab429963..82483e64c332f8f8cd01b88bd01386cc18fd250d 100644 GIT binary patch literal 4844 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 b@6+@2JUvg()ARKF{+@pTB0~*m08jt`)d?;j diff --git a/util/log.c b/util/log.c index 0f6ef07da..ef822023b 100644 --- a/util/log.c +++ b/util/log.c @@ -194,8 +194,8 @@ log_vmsg(int pri, const char* type, tp=MSG_GENERIC_SUCCESS; wt=EVENTLOG_SUCCESS; } - snprintf(m, sizeof(m), "[unbound:%x] %s: %s", - tid?*tid:0, type, message); + snprintf(m, sizeof(m), "[%s:%x] %s: %s", + ident, tid?*tid:0, type, message); s = RegisterEventSource(NULL, SERVICE_NAME); if(!s) return; ReportEvent(s, wt, 0, tp, NULL, 1, 0, &str, NULL);