- fix parentside and querytargets modulestate, for dump_requestlist.

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

diff --git a/doc/Changelog b/doc/Changelog
index 2205f94629d5bf4f219dabcf25bc241a892801d4..3542626bd1007296467f6e71efb32a47b7be6fdd 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -5,6 +5,7 @@
          enabling unbound to continue longer in out of memory conditions.
        - parentside names are dispreferred but not said to be dnssec-lame.
        - parentside check for cached newname glue.
+       - fix parentside and querytargets modulestate, for dump_requestlist.
 
 28 May 2010: Wouter
        - iana portlist updated.

diff --git a/iterator/iterator.c b/iterator/iterator.c
index 602ace026026989c421ca8c38e32f7c8a829ae74..84a9b60e23812c2bdb9a3efd5df69d85a159d22c 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -1429,8 +1429,10 @@ processLastResort(struct module_qstate* qstate, struct iter_qstate* iq,
                        return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
                }
                iq->num_target_queries += qs;
-               if(qs != 0)
+               if(qs != 0) {
+                       qstate->ext_state[id] = module_wait_subquery;
                        return 0; /* and wait for them */
+               }
        }
        /* mark cycle targets for parent-side lookups */
        iter_mark_pside_cycle_targets(qstate, iq->dp);
@@ -1504,7 +1506,6 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
        verbose(VERB_ALGO, "processQueryTargets: targetqueries %d, "
                "currentqueries %d", iq->num_target_queries, 
                iq->num_current_queries);
-       qstate->ext_state[id] = module_wait_reply;
 
        /* Make sure that we haven't run away */
        /* FIXME: is this check even necessary? */
@@ -1529,6 +1530,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
                 * more delegpt addrs became available, wait for existing
                 * query. */
                verbose(VERB_ALGO, "woke up, but wait for outstanding query");
+               qstate->ext_state[id] = module_wait_reply;
                return 0;
        }
 
@@ -1551,6 +1553,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
                if(iq->num_target_queries > 0) {
                        /* wait to get all targets, we want to try em */
                        verbose(VERB_ALGO, "wait for all targets for fallback");
+                       qstate->ext_state[id] = module_wait_reply;
                        return 0;
                }
                /* did we do enough fallback queries already? */
@@ -1640,18 +1643,23 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 
                /* otherwise, we have no current targets, so submerge 
                 * until one of the target or direct queries return. */
-               if(iq->num_target_queries>0 && iq->num_current_queries>0)
+               if(iq->num_target_queries>0 && iq->num_current_queries>0) {
                        verbose(VERB_ALGO, "no current targets -- waiting "
                                "for %d targets to resolve or %d outstanding"
                                " queries to respond", iq->num_target_queries, 
                                iq->num_current_queries);
-               else if(iq->num_target_queries>0)
+                       qstate->ext_state[id] = module_wait_reply;
+               } else if(iq->num_target_queries>0) {
                        verbose(VERB_ALGO, "no current targets -- waiting "
                                "for %d targets to resolve.",
                                iq->num_target_queries);
-               else    verbose(VERB_ALGO, "no current targets -- waiting "
+                       qstate->ext_state[id] = module_wait_subquery;
+               } else {
+                       verbose(VERB_ALGO, "no current targets -- waiting "
                                "for %d outstanding queries to respond.",
                                iq->num_current_queries);
+                       qstate->ext_state[id] = module_wait_reply;
+               }
                return 0;
        }