Merge branch 'kresd-qtrace' into 'master'

Kresd QTRACE See merge request !86

Merge branch 'kresd-qtrace' into 'master'
Kresd QTRACE See merge request !86
71498657 · Petr Špaček · cc64821a · a025ecd1 · 71498657 · 71498657
Commit 71498657 authored Nov 20, 2017 by Petr Špaček
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Makefile Makefile +1 -1

kresd_run.sh kresd_run.sh +1 -1

template/kresd.j2 template/kresd.j2 +2 -0

No files found.
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ TESTS ?= sets/resolver
 DAEMON ?= kresd
 TEMPLATE ?= template/kresd.j2
 CONFIG ?= config
-ADDITIONAL ?=
+ADDITIONAL ?= -f 1
 OPTS ?=

 PYTHON ?= python3

--- a/kresd_run.sh
+++ b/kresd_run.sh
@@ -14,7 +14,7 @@ TEMPLATE=${TEMPLATE:-"template/kresd.j2"}
 CONFIG=${CONFIG:-"config"}

 # Additional parameters for kresd - non-interactive mode
-ADDITIONAL="-f 1"
+ADDITIONAL=${ADDITIONAL:-"-f 1"}

 export TESTS DAEMON TEMPLATE CONFIG ADDITIONAL


--- a/template/kresd.j2
+++ b/template/kresd.j2
@@ -2,6 +2,8 @@ net = { '{{SELF_ADDR}}' }
 modules = {'stats', 'policy', 'hints'}
 -- test. domain is used by some tests, allow it
 policy.add(policy.suffix(policy.PASS, {todname('test.')}))
+-- extra verbose logging for answers received from network
+policy.add(policy.all(policy.QTRACE))
 cache.size = 2*MB
 hints.root({['k.root-servers.net'] = '{{ROOT_ADDR}}'})
 {% if QMIN == "false" %}