@@ -23,12 +23,14 @@

[adns] / src / query.c

diff --git a/src/query.c b/src/query.c
index d1d0b31b997e52ecd9e719be2ea62e22d28e4e86..ec545625310c11cbb46535e37a7dd0dde1a7b60b 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -201,7 +201,7 @@ int adns_submit(adns_state ads,
   adns_query qu;
   const char *p;
 
   adns_query qu;
   const char *p;
 

-  adns__consistency(ads,cc_entex);
+  adns__consistency(ads,0,cc_entex);

 
   typei= adns__findtype(type);
   if (!typei) return ENOSYS;
 
   typei= adns__findtype(type);
   if (!typei) return ENOSYS;


@@ -238,18 +238,18 @@ int adns_submit(adns_state ads,
     }
     query_simple(ads,qu, owner,ol, typei,flags, now);
   }
     }
     query_simple(ads,qu, owner,ol, typei,flags, now);
   }

-  adns__consistency(ads,cc_entex);
+  adns__consistency(ads,qu,cc_entex);

   return 0;
 
  x_adnsfail:
   adns__query_fail(qu,stat);
   return 0;
 
  x_adnsfail:
   adns__query_fail(qu,stat);

-  adns__consistency(ads,cc_entex);
+  adns__consistency(ads,qu,cc_entex);

   return 0;
 
  x_errno:
   r= errno;
   assert(r);
   return 0;
 
  x_errno:
   r= errno;
   assert(r);

-  adns__consistency(ads,cc_entex);
+  adns__consistency(ads,0,cc_entex);

   return r;
 }
 
   return r;
 }
 


@@ -346,7 +346,6 @@ static void cancel_children(adns_query qu) {
     ncqu= cqu->siblings.next;
     adns_cancel(cqu);
   }
     ncqu= cqu->siblings.next;
     adns_cancel(cqu);
   }

-  LIST_INIT(qu->children);

 }
 
 void adns__reset_preserved(adns_query qu) {
 }
 
 void adns__reset_preserved(adns_query qu) {


@@ -362,6 +361,7 @@ static void free_query_allocs(adns_query qu) {
 
   cancel_children(qu);
   for (an= qu->allocations.head; an; an= ann) { ann= an->next; free(an); }
 
   cancel_children(qu);
   for (an= qu->allocations.head; an; an= ann) { ann= an->next; free(an); }

+  LIST_INIT(qu->allocations);

   adns__vbuf_free(&qu->vb);
 }
 
   adns__vbuf_free(&qu->vb);
 }
 


@@ -369,7 +369,8 @@ void adns_cancel(adns_query qu) {
   adns_state ads;
 
   ads= qu->ads;
   adns_state ads;
 
   ads= qu->ads;

-  adns__consistency(ads,cc_entex);
+  adns__consistency(ads,qu,cc_entex);
+  if (qu->parent) LIST_UNLINK_PART(qu->parent->children,qu,siblings.);

   switch (qu->state) {
   case query_tosend: case query_tcpwait: case query_tcpsent:
     LIST_UNLINK(ads->timew,qu);
   switch (qu->state) {
   case query_tosend: case query_tcpwait: case query_tcpsent:
     LIST_UNLINK(ads->timew,qu);


@@ -386,7 +387,7 @@ void adns_cancel(adns_query qu) {
   free_query_allocs(qu);
   free(qu->answer);
   free(qu);
   free_query_allocs(qu);
   free(qu->answer);
   free(qu);

-  adns__consistency(ads,cc_entex);
+  adns__consistency(ads,0,cc_entex);

 }
 
 void adns__update_expires(adns_query qu, unsigned long ttl, struct timeval now) {
 }
 
 void adns__update_expires(adns_query qu, unsigned long ttl, struct timeval now) {


@@ -473,8 +474,8 @@ void adns__query_done(adns_query qu) {
   } else {
     makefinal_query(qu);
     LIST_LINK_TAIL(qu->ads->output,qu);
   } else {
     makefinal_query(qu);
     LIST_LINK_TAIL(qu->ads->output,qu);

+    qu->state= query_done;

   }
   }

-  qu->state= query_done;

 }
 
 void adns__query_fail(adns_query qu, adns_status stat) {
 }
 
 void adns__query_fail(adns_query qu, adns_status stat) {