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

diff --git a/src/query.c b/src/query.c
index 7f65bc1..5605b34 100644
--- a/src/query.c
+++ b/src/query.c
@@ -27,34 +27,31 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
+#include <string.h>
 
 #include <sys/time.h>
 
 #include "internal.h"
 
 int adns__internal_submit(adns_state ads, adns_query *query_r,
-			  adns_rrtype type, vbuf *qumsg_vb, int id,
+			  const typeinfo *typei, vbuf *qumsg_vb, int id,
 			  adns_queryflags flags, struct timeval now,
 			  adns_status failstat, const qcontext *ctx) {
   adns_query qu;
-  adns_status stat;
-  int ol, id, r;
-  struct timeval now;
-  const typeinfo *typei;
-  adns_query qu;
 
   qu= malloc(sizeof(*qu)); if (!qu) goto x_nomemory;
   qu->answer= malloc(sizeof(*qu->answer)); if (!qu->answer) goto x_freequ_nomemory;
 
+  qu->ads= ads;
   qu->state= query_udp;
   qu->back= qu->next= qu->parent= 0;
   LIST_INIT(qu->children);
   qu->siblings.next= qu->siblings.back= 0;
-  qu->allocations= 0;
+  LIST_INIT(qu->allocations);
   qu->interim_allocd= 0;
-  qu->perm_used= 0;
+  qu->final_allocspace= 0;
 
-  qu->typei= adns__findtype(type);
+  qu->typei= typei;
   adns__vbuf_init(&qu->vb);
 
   qu->cname_dgram= 0;
@@ -66,47 +63,45 @@ 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->owner,owner,ol); qu->owner[ol]= 0;
+  memcpy(&qu->ctx,ctx,sizeof(qu->ctx));
 
   qu->answer->status= adns_s_ok;
   qu->answer->cname= 0;
-  qu->answer->type= type;
+  qu->answer->type= typei->type;
   qu->answer->nrrs= 0;
   qu->answer->rrs= 0;
-
-  if (qu->typei) {
-    qu->answer->rrsz= qu->rrsz;
-  } else {
-    qu->answer->rrsz= -1;
-    failstat= adns_s_notimplemented;
-  }
+  qu->answer->rrsz= typei->rrsz;
   
   *query_r= qu;
 
-  qu->query_dgram= malloc(qumsg_vb->used);
-  if (!qu->query_dgram) {
-    adns__query_fail(ads,qu,adns_s_nomemory);
-    return;
+  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);
   
   if (failstat) {
-    adns__query_fail(ads,qu,failstat);
-    return;
+    adns__query_fail(qu,failstat);
+    return adns_s_ok;
   }
-  adns__query_udp(ads,qu,now);
+  adns__query_udp(qu,now);
   adns__autosys(ads,now);
 
-  return 0;
+  return adns_s_ok;
 
  x_freequ_nomemory:
   free(qu);
  x_nomemory:
-  free(query_dgram);
-  return adns_s_nomemory;
+  adns__vbuf_free(qumsg_vb);
+  return adns_s_nolocalmem;
 }
 
 int adns_submit(adns_state ads,
@@ -116,24 +111,33 @@ int adns_submit(adns_state ads,
 		void *context,
 		adns_query *query_r) {
   qcontext ctx;
-  int id;
+  int id, r, ol;
   vbuf vb;
+  adns_status stat;
+  const typeinfo *typei;
+  struct timeval now;
 
+  typei= adns__findtype(type);
+  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;
 
   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--; }
 
-  stat= adns__mkquery(ads,&vb, &id, owner,ol, typei,flags);
+  stat= adns__mkquery(ads,&vb,&id, owner,ol, typei,flags);
 			
  xit:
-  return adns__internal_submit(ads,query_r, type,&vb,id, flags,now, stat,&ctx);	
+  return adns__internal_submit(ads,query_r, typei,&vb,id, flags,now, stat,&ctx);	
 }
 
 int adns_synchronous(adns_state ads,
@@ -147,33 +151,49 @@ 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);
-  if (r) adns_cancel(ads,qu);
-  return r;
-}
+  r= adns_wait(ads,&qu,answer_r,0);
+  if (r) adns_cancel(qu);
 
-void adns_cancel(adns_state ads, adns_query query) {
-  abort(); /* fixme */
+  return r;
 }
 
-void *adns__alloc_interim(adns_state ads, 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(ads,qu,adns_s_nolocalmem);
-    return 0;
-  }
-  qu->permalloclen += sz;
-  an->next= qu->allocations;
-  qu->allocations= an;
+  if (!an) return 0;
+  LIST_LINK_TAIL(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__transfer_interim(adns_query from, adns_query to, void *block, size_t sz) {
+  allocnode *an;
+
+  if (!block) return;
+  an= (void*)((byte*)block - MEM_ROUND(sizeof(*an)));
+
+  assert(!to->final_allocspace);
+  assert(!from->final_allocspace);
+  
+  LIST_UNLINK(from->allocations,an);
+  LIST_LINK_TAIL(to->allocations,an);
+
+  from->interim_allocd -= sz;
+  to->interim_allocd += 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
@@ -190,42 +210,115 @@ void *adns__alloc_final(adns_query qu, size_t sz) {
   return rp;
 }
 
-void adns__reset_cnameonly(adns_state ads, adns_query qu) {
-  assert(qu->final_allocspace);
+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) {
+  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;
 }
 
-static void adns__query_done(adns_state ads, adns_query qu) {
-  adns_answer *ans;
+static void free_query_allocs(adns_query qu) {
   allocnode *an, *ann;
-  int i;
 
-  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));
+  cancel_children(qu);
+  for (an= qu->allocations.head; 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);
+}
+
+static void makefinal_query(adns_query qu) {
+  adns_answer *ans;
+  int rrn;
+
+  ans= qu->answer;
 
+  if (qu->interim_allocd) {
+    ans= realloc(qu->answer, MEM_ROUND(MEM_ROUND(sizeof(*ans)) + qu->interim_allocd));
+    if (!ans) goto x_nomem;
+    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(ads,qu,ans->rrs.bytes+ans->rrsz*i);
+    adns__makefinal_block(qu, &ans->rrs.untyped, ans->nrrs*ans->rrsz);
+
+    for (rrn=0; rrn<ans->nrrs; rrn++)
+      qu->typei->makefinal(qu, ans->rrs.bytes + rrn*ans->rrsz);
   }
+    
+  free_query_allocs(qu);
+  return;
+  
+ x_nomem:
+  qu->answer->status= adns_s_nolocalmem;
+  qu->answer->cname= 0;
+  adns__reset_cnameonly(qu);
+  free_query_allocs(qu);
+}
 
-  for (an= qu->allocations; an; an= ann) { ann= an->next; free(an); }
+void adns__query_done(adns_query qu) {
+  adns_answer *ans;
+  adns_query parent;
 
-  adns__vbuf_free(&qu->vb);
-  
   qu->id= -1;
-  LIST_LINK_TAIL(ads->output,qu);
+  ans= qu->answer;
+
+  if (ans->nrrs && qu->typei->diff_needswap) {
+    if (!adns__vbuf_ensure(&qu->vb,qu->typei->rrsz)) {
+      adns__query_fail(qu,adns_s_nolocalmem);
+      return;
+    }
+    adns__isort(ans->rrs.bytes, ans->nrrs, ans->rrsz,
+		qu->vb.buf, qu->typei->diff_needswap);
+  }
+
+  parent= qu->parent;
+  if (parent) {
+    LIST_UNLINK_PART(parent->children,qu,siblings.);
+    qu->ctx.callback(parent,qu);
+    free_query_allocs(qu);
+    free(qu);
+  } else {
+    makefinal_query(qu);
+    LIST_LINK_TAIL(qu->ads->output,qu);
+  }
 }
 
-void adns__query_fail(adns_state ads, adns_query qu, adns_status stat) {
-  adns__reset_cnameonly(ads,qu);
+void adns__query_fail(adns_query qu, adns_status stat) {
+  adns__reset_cnameonly(qu);
   qu->answer->status= stat;
-  adns__query_done(ads,qu);
+  adns__query_done(qu);
 }
 
 void adns__makefinal_str(adns_query qu, char **strp) {
@@ -233,17 +326,19 @@ 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);
   *strp= after;  
 }
 
-void adns__makefinal_block(adns__query qu, void **blpp, size_t sz) {
-  void *after;
+void adns__makefinal_block(adns_query qu, void **blpp, size_t sz) {
+  void *before, *after;
 
+  before= *blpp;
+  if (!before) return;
   after= adns__alloc_final(qu,sz);
-  memcpy(after,*blpp,sz);
+  memcpy(after,before,sz);
   *blpp= after;
 }
-