X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fquery.c;h=771a985061fd8da96d0f7e8623662176c4c8271c;hb=11c4794c463d5473077b21c439c96659a448f6da;hp=08085342283a8faa5537316270b156ff99ac482b;hpb=64aae7c863f6e38cecc3cd6d5054f272e13852e8;p=adns.git

diff --git a/src/query.c b/src/query.c
index 0808534..771a985 100644
--- a/src/query.c
+++ b/src/query.c
@@ -111,9 +111,10 @@ static void query_submit(adns_state ads, adns_query qu,
 adns_status adns__ckl_hostname(adns_state ads, adns_queryflags flags,
 			       union checklabel_state *cls,
 			       qcontext *ctx, int labnum,
-			       const char *label, int lablen)
+			       const char *dgram, int labstart, int lablen)
 {
   int i, c;
+  const char *label = dgram+labstart;
 
   if (flags & adns_qf_quoteok_query) return adns_s_ok;
   for (i=0; i<lablen; i++) {
@@ -132,17 +133,17 @@ static adns_status check_domain_name(adns_state ads, adns_queryflags flags,
 				     const byte *dgram, int dglen)
 {
   findlabel_state fls;
-  adns_status err;
+  adns_status st;
   int labnum= 0, labstart, lablen;
   union checklabel_state cls;
 
   adns__findlabel_start(&fls,ads, -1,0, dgram,dglen,dglen, DNS_HDRSIZE,0);
   do {
-    err= adns__findlabel_next(&fls, &lablen,&labstart);
-    assert(!err); assert(lablen >= 0);
-    err= typei->checklabel(ads,flags, &cls,ctx,
-			   labnum++, dgram+labstart,lablen);
-    if (err) return err;
+    st= adns__findlabel_next(&fls, &lablen,&labstart);
+    assert(!st); assert(lablen >= 0);
+    st= typei->checklabel(ads,flags, &cls,ctx,
+			   labnum++, dgram,labstart,lablen);
+    if (st) return st;
   } while (lablen);
   return adns_s_ok;
 }
@@ -154,12 +155,12 @@ adns_status adns__internal_submit(adns_state ads, adns_query *query_r,
 				  adns_queryflags flags, struct timeval now,
 				  qcontext *ctx) {
   adns_query qu;
-  adns_status err;
+  adns_status st;
 
-  err= check_domain_name(ads, flags,ctx,typei, qumsg_vb->buf,qumsg_vb->used);
-  if (err) goto x_err;
+  st= check_domain_name(ads, flags,ctx,typei, qumsg_vb->buf,qumsg_vb->used);
+  if (st) goto x_err;
   qu= query_alloc(ads,typei,type,flags,now);
-  if (!qu) { err = adns_s_nomemory; goto x_err; }
+  if (!qu) { st = adns_s_nomemory; goto x_err; }
   *query_r= qu;
 
   qu->parent= parent;
@@ -171,7 +172,7 @@ adns_status adns__internal_submit(adns_state ads, adns_query *query_r,
 
 x_err:
   adns__vbuf_free(qumsg_vb);
-  return err;
+  return st;
 }
 
 static void query_simple(adns_state ads, adns_query qu,
@@ -497,6 +498,17 @@ static void free_query_allocs(adns_query qu) {
 }
 
 void adns__returning(adns_state ads, adns_query qu_for_caller) {
+  while (ads->intdone.head) {
+    adns_query iq= ads->intdone.head;
+    adns_query parent= iq->parent;
+    LIST_UNLINK_PART(parent->children,iq,siblings.);
+    LIST_UNLINK(iq->ads->childw,parent);
+    LIST_UNLINK(ads->intdone,iq);
+    iq->ctx.callback(parent,iq);
+    free_query_allocs(iq);
+    free(iq->answer);
+    free(iq);
+  }
   adns__consistency(ads,qu_for_caller,cc_entex);
 }
 
@@ -517,7 +529,10 @@ void adns__cancel(adns_query qu) {
     LIST_UNLINK(ads->childw,qu);
     break;
   case query_done:
-    LIST_UNLINK(ads->output,qu);
+    if (qu->parent)
+      LIST_UNLINK(ads->intdone,qu);
+    else
+      LIST_UNLINK(ads->output,qu);
     break;
   default:
     abort();
@@ -585,8 +600,8 @@ static void makefinal_query(adns_query qu) {
 }
 
 void adns__query_done(adns_query qu) {
+  adns_state ads=qu->ads;
   adns_answer *ans;
-  adns_query parent;
 
   adns__cancel_children(qu);
 
@@ -617,18 +632,12 @@ void adns__query_done(adns_query qu) {
   }
 
   ans->expires= qu->expires;
-  parent= qu->parent;
-  if (parent) {
-    LIST_UNLINK_PART(parent->children,qu,siblings.);
-    LIST_UNLINK(qu->ads->childw,parent);
-    qu->ctx.callback(parent,qu);
-    free_query_allocs(qu);
-    free(qu->answer);
-    free(qu);
+  qu->state= query_done;
+  if (qu->parent) {
+    LIST_LINK_TAIL(ads->intdone,qu);
   } else {
     makefinal_query(qu);
     LIST_LINK_TAIL(qu->ads->output,qu);
-    qu->state= query_done;
   }
 }