X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/adns/blobdiff_plain/3955725ceceb330041f8e7a27e6629a2e8a9b5ba..1dfe95d8d1f8f2abaef02f9b0817c720bd955f7b:/src/query.c

diff --git a/src/query.c b/src/query.c
index f8feef7..a794e54 100644
--- a/src/query.c
+++ b/src/query.c
@@ -73,12 +73,17 @@ int adns__internal_submit(adns_state ads, adns_query *query_r,
   
   *query_r= qu;
 
-  qu->query_dgram= malloc(qumsg_vb->used);
-  if (!qu->query_dgram) {
-    adns__query_fail(qu,adns_s_nolocalmem);
-    return adns_s_ok;
+  qu->query_dglen= qumsg_vb->used;
+  if (qumsg_vb->used) {
+    qu->query_dgram= malloc(qumsg_vb->used);
+    if (!qu->query_dgram) {
+      adns__query_fail(qu,adns_s_nolocalmem);
+      return adns_s_ok;
+    }
+    memcpy(qu->query_dgram,qumsg_vb->buf,qumsg_vb->used);
+  } else {
+    qu->query_dgram= 0;
   }
-  memcpy(qu->query_dgram,qumsg_vb->buf,qumsg_vb->used);
   qu->vb= *qumsg_vb;
   adns__vbuf_init(qumsg_vb);
   
@@ -121,7 +126,7 @@ int adns_submit(adns_state ads,
   adns__vbuf_init(&vb);
 
   ol= strlen(owner);
-  if (ol<=1 || ol>DNS_MAXDOMAIN+1) { stat= adns_s_invaliddomain; goto xit; }
+  if (ol<=1 || ol>DNS_MAXDOMAIN+1) { stat= adns_s_domaintoolong; goto xit; }
 				 
   if (owner[ol-1]=='.' && owner[ol-2]!='\\') { flags &= ~adns_qf_search; ol--; }
 
@@ -142,33 +147,34 @@ int adns_synchronous(adns_state ads,
   r= adns_submit(ads,owner,type,flags,0,&qu);
   if (r) return r;
 
-  do {
-    r= adns_wait(ads,&qu,answer_r,0);
-  } while (r==EINTR);
+  r= adns_wait(ads,&qu,answer_r,0);
   if (r) adns_cancel(qu);
-  return r;
-}
 
-void adns_cancel(adns_query query) {
-  abort(); /* fixme */
+  return r;
 }
 
-void *adns__alloc_interim(adns_query qu, size_t sz) {
+static void *alloc_common(adns_query qu, size_t sz) {
   allocnode *an;
 
+  if (!sz) return qu; /* Any old pointer will do */
   assert(!qu->final_allocspace);
-  sz= MEM_ROUND(sz);
   an= malloc(MEM_ROUND(MEM_ROUND(sizeof(*an)) + sz));
-  if (!an) {
-    adns__query_fail(qu,adns_s_nolocalmem);
-    return 0;
-  }
-  qu->interim_allocd += sz;
+  if (!an) return 0;
   an->next= qu->allocations;
   qu->allocations= an;
   return (byte*)an + MEM_ROUND(sizeof(*an));
 }
 
+void *adns__alloc_interim(adns_query qu, size_t sz) {
+  sz= MEM_ROUND(sz);
+  qu->interim_allocd += sz;
+  return alloc_common(qu,sz);
+}
+
+void *adns__alloc_mine(adns_query qu, size_t sz) {
+  return alloc_common(qu,MEM_ROUND(sz));
+}
+
 void *adns__alloc_final(adns_query qu, size_t sz) {
   /* When we're in the _final stage, we _subtract_ from interim_alloc'd
    * each allocation, and use final_allocspace to point to the next free
@@ -186,32 +192,81 @@ void *adns__alloc_final(adns_query qu, size_t sz) {
 }
 
 void adns__reset_cnameonly(adns_query qu) {
-  assert(qu->final_allocspace);
+  /* fixme: cancel children */
+  assert(!qu->final_allocspace);
   qu->answer->nrrs= 0;
   qu->answer->rrs= 0;
   qu->interim_allocd= qu->answer->cname ? MEM_ROUND(strlen(qu->answer->cname)+1) : 0;
 }
 
+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);
+  }
+  for (an= qu->allocations; an; an= ann) { ann= an->next; free(an); }
+  adns__vbuf_free(&qu->vb);
+}
+
+void adns_cancel(adns_query qu) {
+  switch (qu->state) {
+  case query_udp: case query_tcpwait: case query_tcpsent:
+    LIST_UNLINK(qu->ads->timew,qu);
+    break;
+  case query_child:
+    LIST_UNLINK(qu->ads->childw,qu);
+    break;
+  case query_done:
+    LIST_UNLINK(qu->ads->output,qu);
+    break;
+  default:
+    abort();
+  }
+  free_query_allocs(qu);
+  free(qu->answer);
+  free(qu);
+}
+  
 void adns__query_done(adns_query qu) {
   adns_answer *ans;
-  allocnode *an, *ann;
-  int i;
+  int rrn;
 
-  qu->answer= ans= realloc(qu->answer,
-			   MEM_ROUND(MEM_ROUND(sizeof(*ans)) +
-				     qu->interim_allocd));
-  qu->final_allocspace= (byte*)qu->answer + MEM_ROUND(sizeof(*ans));
+  ans= qu->answer;
+  
+  if (qu->interim_allocd) {
+    if (qu->answer->nrrs && qu->typei->diff_needswap) {
+      if (!adns__vbuf_ensure(&qu->vb,qu->typei->rrsz)) {
+	adns__query_fail(qu,adns_s_nolocalmem);
+	return;
+      }
+    }
+    ans= realloc(qu->answer, MEM_ROUND(MEM_ROUND(sizeof(*ans)) + qu->interim_allocd));
+    if (!ans) {
+      qu->answer->cname= 0;
+      adns__query_fail(qu, adns_s_nolocalmem);
+      return;
+    }
+    qu->answer= ans;
+  }
 
+  qu->final_allocspace= (byte*)ans + MEM_ROUND(sizeof(*ans));
   adns__makefinal_str(qu,&ans->cname);
+  
   if (ans->nrrs) {
-    adns__makefinal_block(qu,&ans->rrs.untyped,ans->rrsz*ans->nrrs);
-    for (i=0; i<ans->nrrs; i++)
-      qu->typei->makefinal(qu,ans->rrs.bytes+ans->rrsz*i);
-  }
+    adns__makefinal_block(qu, &ans->rrs.untyped, ans->nrrs*ans->rrsz);
 
-  for (an= qu->allocations; an; an= ann) { ann= an->next; free(an); }
+    for (rrn=0; rrn<ans->nrrs; rrn++)
+      qu->typei->makefinal(qu, ans->rrs.bytes + rrn*ans->rrsz);
 
-  adns__vbuf_free(&qu->vb);
+    if (qu->typei->diff_needswap)
+      adns__isort(ans->rrs.bytes, ans->nrrs, ans->rrsz,
+		  qu->vb.buf, qu->typei->diff_needswap);
+  }
+
+  free_query_allocs(qu);
   
   qu->id= -1;
   LIST_LINK_TAIL(qu->ads->output,qu);
@@ -228,6 +283,7 @@ void adns__makefinal_str(adns_query qu, char **strp) {
   char *before, *after;
 
   before= *strp;
+  if (!before) return;
   l= strlen(before)+1;
   after= adns__alloc_final(qu,l);
   memcpy(after,before,l);
@@ -235,10 +291,11 @@ void adns__makefinal_str(adns_query qu, char **strp) {
 }
 
 void adns__makefinal_block(adns_query qu, void **blpp, size_t sz) {
-  void *after;
+  void *before, *after;
 
+  before= *blpp;
+  if (!before) return;
   after= adns__alloc_final(qu,sz);
-  memcpy(after,*blpp,sz);
+  memcpy(after,before,sz);
   *blpp= after;
 }
-