- print query name when max target count is exceeded.

git-svn-id: file:///svn/unbound/trunk@3296 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 4427ce976065238af8cdb6c56fb04b62ddc06883..aa6e23228d52c7b1a395b80c4e928b6c28a364c0 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
        - make strip works for unbound-host and unbound-anchor.
        - patch from Stephane Lapie that adds to the python API, that
          exposes struct delegpt, and adds the find_delegation function.
+       - print query name when max target count is exceeded.
 
 9 December 2014: Wouter
        - svn trunk has 1.5.2 in development.

diff --git a/iterator/iterator.c b/iterator/iterator.c
index 6e05c99a0e954f187f0ecca5a001567efa0df26d..07000749a560d728c8aafab1d64f87029dbc3a44 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -1383,8 +1383,10 @@ query_for_targets(struct module_qstate* qstate, struct iter_qstate* iq,
                return 0;
        if(iq->depth > 0 && iq->target_count &&
                iq->target_count[1] > MAX_TARGET_COUNT) {
-               verbose(VERB_QUERY, "request has exceeded the maximum "
-                       "number of glue fetches %d", iq->target_count[1]);
+               char s[LDNS_MAX_DOMAINLEN+1];
+               dname_str(qstate->qinfo.qname, s);
+               verbose(VERB_QUERY, "request %s has exceeded the maximum "
+                       "number of glue fetches %d", s, iq->target_count[1]);
                return 0;
        }
 
@@ -1581,8 +1583,10 @@ processLastResort(struct module_qstate* qstate, struct iter_qstate* iq,
        }
        if(iq->depth > 0 && iq->target_count &&
                iq->target_count[1] > MAX_TARGET_COUNT) {
-               verbose(VERB_QUERY, "request has exceeded the maximum "
-                       "number of glue fetches %d", iq->target_count[1]);
+               char s[LDNS_MAX_DOMAINLEN+1];
+               dname_str(qstate->qinfo.qname, s);
+               verbose(VERB_QUERY, "request %s has exceeded the maximum "
+                       "number of glue fetches %d", s, iq->target_count[1]);
                return error_response_cache(qstate, id, LDNS_RCODE_SERVFAIL);
        }
        /* mark cycle targets for parent-side lookups */