Also check specific query where applicable.

[adns] / src / query.c

diff --git a/src/query.c b/src/query.c
index 0debcd1d4dfffd7d2fb1ec0b290fcd547df4b726..172ff0607b150e81950276272fb9e22d8ca45671 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>

-#include <string.h>

 
 #include <sys/time.h>
 
 
 #include <sys/time.h>
 


@@ -42,12 +41,13 @@ static adns_query query_alloc(adns_state ads, const typeinfo *typei,
   qu->answer= malloc(sizeof(*qu->answer));  if (!qu->answer) { free(qu); return 0; }
   
   qu->ads= ads;
   qu->answer= malloc(sizeof(*qu->answer));  if (!qu->answer) { free(qu); return 0; }
   
   qu->ads= ads;

-  qu->state= query_udp;
+  qu->state= query_tosend;

   qu->back= qu->next= qu->parent= 0;
   LIST_INIT(qu->children);
   LINK_INIT(qu->siblings);
   LIST_INIT(qu->allocations);
   qu->interim_allocd= 0;
   qu->back= qu->next= qu->parent= 0;
   LIST_INIT(qu->children);
   LINK_INIT(qu->siblings);
   LIST_INIT(qu->allocations);
   qu->interim_allocd= 0;

+  qu->preserved_allocd= 0;

   qu->final_allocspace= 0;
 
   qu->typei= typei;
   qu->final_allocspace= 0;
 
   qu->typei= typei;


@@ -76,7 +76,7 @@ static adns_query query_alloc(adns_state ads, const typeinfo *typei,
   qu->answer->type= typei->type;
   qu->answer->expires= -1;
   qu->answer->nrrs= 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;
   qu->answer->rrsz= typei->rrsz;
 
   return qu;


@@ -99,7 +99,7 @@ static void query_submit(adns_state ads, adns_query qu,
   qu->query_dglen= qu->vb.used;
   memcpy(qu->query_dgram,qu->vb.buf,qu->vb.used);
   
   qu->query_dglen= qu->vb.used;
   memcpy(qu->query_dgram,qu->vb.buf,qu->vb.used);
   

-  adns__query_udp(qu,now);
+  adns__query_send(qu,now);

   adns__autosys(ads,now);
 }
 
   adns__autosys(ads,now);
 }
 


@@ -181,7 +181,7 @@ static int save_owner(adns_query qu, const char *owner, int ol) {
   ans= qu->answer;
   assert(!ans->owner);
 
   ans= qu->answer;
   assert(!ans->owner);
 

-  ans->owner= adns__alloc_interim(qu,ol+1);  if (!ans->owner) return 0;
+  ans->owner= adns__alloc_preserved(qu,ol+1);  if (!ans->owner) return 0;

 
   memcpy(ans->owner,owner,ol);
   ans->owner[ol]= 0;
 
   memcpy(ans->owner,owner,ol);
   ans->owner[ol]= 0;


@@ -201,8 +201,10 @@ int adns_submit(adns_state ads,
   adns_query qu;
   const char *p;
 
   adns_query qu;
   const char *p;
 

+  adns__consistency(ads,0,cc_entex);
+

   typei= adns__findtype(type);
   typei= adns__findtype(type);

-  if (!typei) return adns_s_unknownrrtype;
+  if (!typei) return ENOSYS;

 
   r= gettimeofday(&now,0); if (r) goto x_errno;
   qu= query_alloc(ads,typei,flags,now); if (!qu) goto x_errno;
 
   r= gettimeofday(&now,0); if (r) goto x_errno;
   qu= query_alloc(ads,typei,flags,now); if (!qu) goto x_errno;


@@ -236,15 +238,18 @@ int adns_submit(adns_state ads,
     }
     query_simple(ads,qu, owner,ol, typei,flags, now);
   }
     }
     query_simple(ads,qu, owner,ol, typei,flags, now);
   }

+  adns__consistency(ads,qu,cc_entex);

   return 0;
 
  x_adnsfail:
   adns__query_fail(qu,stat);
   return 0;
 
  x_adnsfail:
   adns__query_fail(qu,stat);

+  adns__consistency(ads,qu,cc_entex);

   return 0;
 
  x_errno:
   r= errno;
   assert(r);
   return 0;
 
  x_errno:
   r= errno;
   assert(r);

+  adns__consistency(ads,0,cc_entex);

   return r;
 }
 
   return r;
 }
 


@@ -277,9 +282,23 @@ static void *alloc_common(adns_query qu, size_t sz) {
 }
 
 void *adns__alloc_interim(adns_query qu, size_t sz) {
 }
 
 void *adns__alloc_interim(adns_query qu, size_t sz) {

+  void *rv;
+  

   sz= MEM_ROUND(sz);
   sz= MEM_ROUND(sz);

+  rv= alloc_common(qu,sz);
+  if (!rv) return 0;

   qu->interim_allocd += sz;
   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) {
 }
 
 void *adns__alloc_mine(adns_query qu, size_t sz) {


@@ -330,12 +349,12 @@ static void cancel_children(adns_query qu) {
   LIST_INIT(qu->children);
 }
 
   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;
   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) {
 }
 
 static void free_query_allocs(adns_query qu) {


@@ -347,15 +366,19 @@ static void free_query_allocs(adns_query qu) {
 }
 
 void adns_cancel(adns_query qu) {
 }
 
 void adns_cancel(adns_query qu) {

+  adns_state ads;
+
+  ads= qu->ads;
+  adns__consistency(ads,qu,cc_entex);

   switch (qu->state) {
   switch (qu->state) {

-  case query_udp: case query_tcpwait: case query_tcpsent:
-    LIST_UNLINK(qu->ads->timew,qu);
+  case query_tosend: case query_tcpwait: case query_tcpsent:
+    LIST_UNLINK(ads->timew,qu);

     break;
   case query_child:
     break;
   case query_child:

-    LIST_UNLINK(qu->ads->childw,qu);
+    LIST_UNLINK(ads->childw,qu);

     break;
   case query_done:
     break;
   case query_done:

-    LIST_UNLINK(qu->ads->output,qu);
+    LIST_UNLINK(ads->output,qu);

     break;
   default:
     abort();
     break;
   default:
     abort();


@@ -363,6 +386,7 @@ void adns_cancel(adns_query qu) {
   free_query_allocs(qu);
   free(qu->answer);
   free(qu);
   free_query_allocs(qu);
   free(qu->answer);
   free(qu);

+  adns__consistency(ads,0,cc_entex);

 }
 
 void adns__update_expires(adns_query qu, unsigned long ttl, struct timeval now) {
 }
 
 void adns__update_expires(adns_query qu, unsigned long ttl, struct timeval now) {


@@ -401,9 +425,12 @@ static void makefinal_query(adns_query qu) {
   return;
   
  x_nomem:
   return;
   
  x_nomem:

-  qu->answer->status= adns_s_nomemory;
+  qu->preserved_allocd= 0;

   qu->answer->cname= 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);
 }
 
   free_query_allocs(qu);
 }
 


@@ -411,6 +438,8 @@ void adns__query_done(adns_query qu) {
   adns_answer *ans;
   adns_query parent;
 
   adns_answer *ans;
   adns_query parent;
 

+  cancel_children(qu);
+

   qu->id= -1;
   ans= qu->answer;
 
   qu->id= -1;
   ans= qu->answer;
 


@@ -437,6 +466,7 @@ void adns__query_done(adns_query qu) {
   parent= qu->parent;
   if (parent) {
     LIST_UNLINK_PART(parent->children,qu,siblings.);
   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);
     qu->ctx.callback(parent,qu);
     free_query_allocs(qu);
     free(qu);


@@ -444,10 +474,11 @@ void adns__query_done(adns_query qu) {
     makefinal_query(qu);
     LIST_LINK_TAIL(qu->ads->output,qu);
   }
     makefinal_query(qu);
     LIST_LINK_TAIL(qu->ads->output,qu);
   }

+  qu->state= query_done;

 }
 
 void adns__query_fail(adns_query qu, adns_status stat) {
 }
 
 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);
 }
   qu->answer->status= stat;
   adns__query_done(qu);
 }