X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fquery.c;h=5605b34aed59ac5eabed9215a9f1d78c2a898dc4;hb=9ec44266206364a6a72aa5cdf849727ee0b80698;hp=7c15a5bc8f418426ce986b8962aba4edd3420486;hpb=551ff40f1e8eab858f07ea0c0d5217da70837751;p=adns.git

diff --git a/src/query.c b/src/query.c
index 7c15a5b..5605b34 100644
--- a/src/query.c
+++ b/src/query.c
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
+#include <string.h>
 
 #include <sys/time.h>
 
@@ -62,7 +63,7 @@ int adns__internal_submit(adns_state ads, adns_query *query_r,
   qu->udpnextserver= 0;
   qu->udpsent= qu->tcpfailed= 0;
   timerclear(&qu->timeout);
-  memcpy(&qu->context,ctx,sizeof(qu->context));
+  memcpy(&qu->ctx,ctx,sizeof(qu->ctx));
 
   qu->answer->status= adns_s_ok;
   qu->answer->cname= 0;
@@ -120,6 +121,9 @@ int adns_submit(adns_state ads,
   if (!typei) return adns_s_notimplemented;
   
   ctx.ext= context;
+  ctx.callback= 0;
+  memset(&ctx.info,0,sizeof(ctx.info));
+  
   r= gettimeofday(&now,0); if (r) return errno;
   id= 0;
 
@@ -206,9 +210,19 @@ void *adns__alloc_final(adns_query qu, size_t sz) {
   return rp;
 }
 
+static void cancel_children(adns_query qu) {
+  adns_query cqu, ncqu;
+
+  for (cqu= qu->children.head; cqu; cqu= ncqu) {
+    ncqu= cqu->siblings.next;
+    adns_cancel(cqu);
+  }
+  LIST_INIT(qu->children);
+}
+
 void adns__reset_cnameonly(adns_query qu) {
-  /* fixme: cancel children */
   assert(!qu->final_allocspace);
+  cancel_children(qu);
   qu->answer->nrrs= 0;
   qu->answer->rrs= 0;
   qu->interim_allocd= qu->answer->cname ? MEM_ROUND(strlen(qu->answer->cname)+1) : 0;
@@ -216,12 +230,8 @@ void adns__reset_cnameonly(adns_query qu) {
 
 static void free_query_allocs(adns_query qu) {
   allocnode *an, *ann;
-  adns_query cqu, ncqu;
 
-  for (cqu= qu->children.head; cqu; cqu= ncqu) {
-    ncqu= cqu->siblings.next;
-    adns_cancel(cqu);
-  }
+  cancel_children(qu);
   for (an= qu->allocations.head; an; an= ann) { ann= an->next; free(an); }
   adns__vbuf_free(&qu->vb);
 }
@@ -296,10 +306,9 @@ void adns__query_done(adns_query qu) {
   parent= qu->parent;
   if (parent) {
     LIST_UNLINK_PART(parent->children,qu,siblings.);
-    qu->context.intern.callback(parent,qu);
+    qu->ctx.callback(parent,qu);
     free_query_allocs(qu);
     free(qu);
-    if (!parent->children.head) adns__query_done(parent);
   } else {
     makefinal_query(qu);
     LIST_LINK_TAIL(qu->ads->output,qu);