X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/551ff40f1e8eab858f07ea0c0d5217da70837751..1c957fdadf0ab368ab1266fbd6a9ea8fbe3b271d:/src/query.c

diff --git a/src/query.c b/src/query.c
index 7c15a5b..c8d312d 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;
@@ -77,7 +78,7 @@ int adns__internal_submit(adns_state ads, adns_query *query_r,
   if (qumsg_vb->used) {
     qu->query_dgram= malloc(qumsg_vb->used);
     if (!qu->query_dgram) {
-      adns__query_fail(qu,adns_s_nolocalmem);
+      adns__query_fail(qu,adns_s_nomemory);
       return adns_s_ok;
     }
     memcpy(qu->query_dgram,qumsg_vb->buf,qumsg_vb->used);
@@ -100,7 +101,7 @@ int adns__internal_submit(adns_state ads, adns_query *query_r,
   free(qu);
  x_nomemory:
   adns__vbuf_free(qumsg_vb);
-  return adns_s_nolocalmem;
+  return adns_s_nomemory;
 }
 
 int adns_submit(adns_state ads,
@@ -117,16 +118,19 @@ int adns_submit(adns_state ads,
   struct timeval now;
 
   typei= adns__findtype(type);
-  if (!typei) return adns_s_notimplemented;
+  if (!typei) return adns_s_unknownrrtype;
   
   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_domaintoolong; goto xit; }
+  if (ol<=1 || ol>DNS_MAXDOMAIN+1) { stat= adns_s_querydomaintoolong; goto xit; }
 				 
   if (owner[ol-1]=='.' && owner[ol-2]!='\\') { flags &= ~adns_qf_search; ol--; }
 
@@ -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);
 }
@@ -271,7 +281,7 @@ static void makefinal_query(adns_query qu) {
   return;
   
  x_nomem:
-  qu->answer->status= adns_s_nolocalmem;
+  qu->answer->status= adns_s_nomemory;
   qu->answer->cname= 0;
   adns__reset_cnameonly(qu);
   free_query_allocs(qu);
@@ -286,20 +296,21 @@ void adns__query_done(adns_query qu) {
 
   if (ans->nrrs && qu->typei->diff_needswap) {
     if (!adns__vbuf_ensure(&qu->vb,qu->typei->rrsz)) {
-      adns__query_fail(qu,adns_s_nolocalmem);
+      adns__query_fail(qu,adns_s_nomemory);
       return;
     }
     adns__isort(ans->rrs.bytes, ans->nrrs, ans->rrsz,
-		qu->vb.buf, qu->typei->diff_needswap);
+		qu->vb.buf,
+		(int(*)(void*, const void*, const void*))qu->typei->diff_needswap,
+		qu->ads);
   }
 
   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);