make _qf_owner work if _qf_search not specified, and test it (oops!)

[adns.git] / src / query.c

diff --git a/src/query.c b/src/query.c
index c420fcf26716a77a39d515588c2bfca3fd2eac23..b02abda87fc02e201bd4659a79a48c994f6253a0 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -48,6 +48,7 @@ static adns_query query_alloc(adns_state ads, const typeinfo *typei,
   LINK_INIT(qu->siblings);
   LIST_INIT(qu->allocations);
   qu->interim_allocd= 0;
+  qu->preserved_allocd= 0;
   qu->final_allocspace= 0;
 
   qu->typei= typei;
@@ -72,11 +73,11 @@ static adns_query query_alloc(adns_state ads, const typeinfo *typei,
   memset(&qu->ctx,0,sizeof(qu->ctx));
 
   qu->answer->status= adns_s_ok;
-  qu->answer->cname= 0;
+  qu->answer->cname= qu->answer->owner= 0;
   qu->answer->type= typei->type;
   qu->answer->expires= -1;
   qu->answer->nrrs= 0;
-  qu->answer->rrs= 0;
+  qu->answer->rrs.untyped= 0;
   qu->answer->rrsz= typei->rrsz;
 
   return qu;
@@ -174,6 +175,20 @@ x_fail:
   adns__query_fail(qu,stat);
 }
 
+static int save_owner(adns_query qu, const char *owner, int ol) {
+  /* Returns 1 if OK, otherwise there was no memory. */
+  adns_answer *ans;
+
+  ans= qu->answer;
+  assert(!ans->owner);
+
+  ans->owner= adns__alloc_preserved(qu,ol+1);  if (!ans->owner) return 0;
+
+  memcpy(ans->owner,owner,ol);
+  ans->owner[ol]= 0;
+  return 1;
+}
+
 int adns_submit(adns_state ads,
                const char *owner,
                adns_rrtype type,
@@ -203,7 +218,10 @@ int adns_submit(adns_state ads,
   if (!ol) { stat= adns_s_querydomaininvalid; goto x_adnsfail; }
   if (ol>DNS_MAXDOMAIN+1) { stat= adns_s_querydomaintoolong; goto x_adnsfail; }
                                 
-  if (ol>=2 && owner[ol-1]=='.' && owner[ol-2]!='\\') { flags &= ~adns_qf_search; ol--; }
+  if (ol>=1 && owner[ol-1]=='.' && (ol<2 || owner[ol-2]!='\\')) {
+    flags &= ~adns_qf_search;
+    ol--;
+  }
 
   if (flags & adns_qf_search) {
     r= adns__vbuf_append(&qu->search_vb,owner,ol);
@@ -214,6 +232,9 @@ int adns_submit(adns_state ads,
     qu->search_origlen= ol;
     adns__search_next(ads,qu,now);
   } else {
+    if (flags & adns_qf_owner) {
+      if (!save_owner(qu,owner,ol)) { stat= adns_s_nomemory; goto x_adnsfail; }
+    }
     query_simple(ads,qu, owner,ol, typei,flags, now);
   }
   return 0;
@@ -257,9 +278,23 @@ static void *alloc_common(adns_query qu, size_t sz) {
 }
 
 void *adns__alloc_interim(adns_query qu, size_t sz) {
+  void *rv;
+  
   sz= MEM_ROUND(sz);
+  rv= alloc_common(qu,sz);
+  if (!rv) return 0;
   qu->interim_allocd += sz;
-  return alloc_common(qu,sz);
+  return rv;
+}
+
+void *adns__alloc_preserved(adns_query qu, size_t sz) {
+  void *rv;
+  
+  sz= MEM_ROUND(sz);
+  rv= adns__alloc_interim(qu,sz);
+  if (!rv) return 0;
+  qu->preserved_allocd += sz;
+  return rv;
 }
 
 void *adns__alloc_mine(adns_query qu, size_t sz) {
@@ -310,12 +345,12 @@ static void cancel_children(adns_query qu) {
   LIST_INIT(qu->children);
 }
 
-void adns__reset_cnameonly(adns_query qu) {
+void adns__reset_preserved(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;
+  qu->answer->rrs.untyped= 0;
+  qu->interim_allocd= qu->preserved_allocd;
 }
 
 static void free_query_allocs(adns_query qu) {
@@ -368,6 +403,7 @@ static void makefinal_query(adns_query qu) {
 
   qu->final_allocspace= (byte*)ans + MEM_ROUND(sizeof(*ans));
   adns__makefinal_str(qu,&ans->cname);
+  adns__makefinal_str(qu,&ans->owner);
   
   if (ans->nrrs) {
     adns__makefinal_block(qu, &ans->rrs.untyped, ans->nrrs*ans->rrsz);
@@ -380,9 +416,12 @@ static void makefinal_query(adns_query qu) {
   return;
   
  x_nomem:
-  qu->answer->status= adns_s_nomemory;
+  qu->preserved_allocd= 0;
   qu->answer->cname= 0;
-  adns__reset_cnameonly(qu);
+  qu->answer->owner= 0;
+  adns__reset_preserved(qu); /* (but we just threw away the preserved stuff) */
+
+  qu->answer->status= adns_s_nomemory;
   free_query_allocs(qu);
 }
 
@@ -393,6 +432,14 @@ void adns__query_done(adns_query qu) {
   qu->id= -1;
   ans= qu->answer;
 
+  if (qu->flags & adns_qf_owner && qu->flags & adns_qf_search &&
+      ans->status != adns_s_nomemory) {
+    if (!save_owner(qu, qu->search_vb.buf, qu->search_vb.used)) {
+      adns__query_fail(qu,adns_s_nomemory);
+      return;
+    }
+  }
+
   if (ans->nrrs && qu->typei->diff_needswap) {
     if (!adns__vbuf_ensure(&qu->vb,qu->typei->rrsz)) {
       adns__query_fail(qu,adns_s_nomemory);
@@ -408,6 +455,7 @@ void adns__query_done(adns_query qu) {
   parent= qu->parent;
   if (parent) {
     LIST_UNLINK_PART(parent->children,qu,siblings.);
+    if (!parent->children.head) LIST_UNLINK(qu->ads->childw,parent);
     qu->ctx.callback(parent,qu);
     free_query_allocs(qu);
     free(qu);
@@ -418,7 +466,7 @@ void adns__query_done(adns_query qu) {
 }
 
 void adns__query_fail(adns_query qu, adns_status stat) {
-  adns__reset_cnameonly(qu);
+  adns__reset_preserved(qu);
   qu->answer->status= stat;
   adns__query_done(qu);
 }