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

diff --git a/src/query.c b/src/query.c
index c32acba..771a985 100644
--- a/src/query.c
+++ b/src/query.c
@@ -104,16 +104,17 @@ static void query_submit(adns_state ads, adns_query qu,
   qu->id= id;
   qu->query_dglen= qu->vb.used;
   memcpy(qu->query_dgram,qu->vb.buf,qu->vb.used);
-  
-  adns__query_send(qu,now);
+
+  typei->query_send(qu,now);
 }
 
 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,35 +133,38 @@ 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;
 }
 
 adns_status adns__internal_submit(adns_state ads, adns_query *query_r,
+				  adns_query parent,
 				  const typeinfo *typei, adns_rrtype type,
 				  vbuf *qumsg_vb, int id,
 				  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;
+  LIST_LINK_TAIL_PART(parent->children,qu,siblings.);
   memcpy(&qu->ctx,ctx,sizeof(qu->ctx));
   query_submit(ads,qu, typei,qumsg_vb,id,flags,now);
   
@@ -168,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,
@@ -309,18 +313,18 @@ int adns_submit(adns_state ads,
     query_simple(ads,qu, owner,ol, typei,flags, now);
   }
   adns__autosys(ads,now);
-  adns__consistency(ads,qu,cc_entex);
+  adns__returning(ads,qu);
   return 0;
 
  x_adnsfail:
   adns__query_fail(qu,stat);
-  adns__consistency(ads,qu,cc_entex);
+  adns__returning(ads,qu);
   return 0;
 
  x_errno:
   r= errno;
   assert(r);
-  adns__consistency(ads,0,cc_entex);
+  adns__returning(ads,0);
   return r;
 }
 
@@ -382,6 +386,7 @@ static void *alloc_common(adns_query qu, size_t sz) {
   an= malloc(MEM_ROUND(MEM_ROUND(sizeof(*an)) + sz));
   if (!an) return 0;
   LIST_LINK_TAIL(qu->allocations,an);
+  an->sz= sz;
   return (byte*)an + MEM_ROUND(sizeof(*an));
 }
 
@@ -405,16 +410,35 @@ void *adns__alloc_preserved(adns_query qu, size_t sz) {
   return rv;
 }
 
+static allocnode *alloc_info(adns_query qu, void *p, size_t *sz_r) {
+  allocnode *an;
+
+  if (!p || p == qu) { *sz_r= 0; return 0; }
+  an= (allocnode *)((byte *)p - MEM_ROUND(sizeof(allocnode)));
+  *sz_r= MEM_ROUND(an->sz);
+  return an;
+}
+
+void adns__free_interim(adns_query qu, void *p) {
+  size_t sz;
+  allocnode *an= alloc_info(qu, p, &sz);
+
+  if (!an) return;
+  assert(!qu->final_allocspace);
+  LIST_UNLINK(qu->allocations, an);
+  free(an);
+  qu->interim_allocd -= sz;
+}
+
 void *adns__alloc_mine(adns_query qu, size_t sz) {
   return alloc_common(qu,MEM_ROUND(sz));
 }
 
-void adns__transfer_interim(adns_query from, adns_query to,
-			    void *block, size_t sz) {
-  allocnode *an;
+void adns__transfer_interim(adns_query from, adns_query to, void *block) {
+  size_t sz;
+  allocnode *an= alloc_info(from, block, &sz);
 
-  if (!block) return;
-  an= (void*)((byte*)block - MEM_ROUND(sizeof(*an)));
+  if (!an) return;
 
   assert(!to->final_allocspace);
   assert(!from->final_allocspace);
@@ -422,7 +446,6 @@ void adns__transfer_interim(adns_query from, adns_query to,
   LIST_UNLINK(from->allocations,an);
   LIST_LINK_TAIL(to->allocations,an);
 
-  sz= MEM_ROUND(sz);
   from->interim_allocd -= sz;
   to->interim_allocd += sz;
 
@@ -445,18 +468,18 @@ void *adns__alloc_final(adns_query qu, size_t sz) {
   return rp;
 }
 
-static void cancel_children(adns_query qu) {
+void adns__cancel_children(adns_query qu) {
   adns_query cqu, ncqu;
 
   for (cqu= qu->children.head; cqu; cqu= ncqu) {
     ncqu= cqu->siblings.next;
-    adns_cancel(cqu);
+    adns__cancel(cqu);
   }
 }
 
 void adns__reset_preserved(adns_query qu) {
   assert(!qu->final_allocspace);
-  cancel_children(qu);
+  adns__cancel_children(qu);
   qu->answer->nrrs= 0;
   qu->answer->rrs.untyped= 0;
   qu->interim_allocd= qu->preserved_allocd;
@@ -465,7 +488,7 @@ void adns__reset_preserved(adns_query qu) {
 static void free_query_allocs(adns_query qu) {
   allocnode *an, *ann;
 
-  cancel_children(qu);
+  adns__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);
@@ -474,11 +497,26 @@ static void free_query_allocs(adns_query qu) {
   qu->query_dgram= 0;
 }
 
-void adns_cancel(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);
+}
+
+void adns__cancel(adns_query qu) {
   adns_state ads;
 
   ads= qu->ads;
-  adns__consistency(ads,qu,cc_entex);
+  adns__consistency(ads,qu,cc_freq);
   if (qu->parent) LIST_UNLINK_PART(qu->parent->children,qu,siblings.);
   switch (qu->state) {
   case query_tosend:
@@ -491,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();
@@ -499,7 +540,16 @@ void adns_cancel(adns_query qu) {
   free_query_allocs(qu);
   free(qu->answer);
   free(qu);
-  adns__consistency(ads,0,cc_entex);
+}
+
+void adns_cancel(adns_query qu) {
+  adns_state ads;
+
+  assert(!qu->parent);
+  ads= qu->ads;
+  adns__consistency(ads,qu,cc_entex);
+  adns__cancel(qu);
+  adns__returning(ads,0);
 }
 
 void adns__update_expires(adns_query qu, unsigned long ttl,
@@ -550,10 +600,10 @@ 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;
 
-  cancel_children(qu);
+  adns__cancel_children(qu);
 
   qu->id= -1;
   ans= qu->answer;
@@ -582,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;
   }
 }