Promise not to change fds in adns_beforepoll (if now is specified).

[adns] / src / query.c

diff --git a/src/query.c b/src/query.c
index 81fedb8af48c318c430d1d412c9976a22e50d872..a676376587ca7053ef758b3511c305d1f0054a38 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -201,6 +201,8 @@ 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);
   if (!typei) return ENOSYS;
 
   typei= adns__findtype(type);
   if (!typei) return ENOSYS;
 


@@ -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;
 }
 


@@ -357,19 +362,24 @@ static void free_query_allocs(adns_query qu) {
 
   cancel_children(qu);
   for (an= qu->allocations.head; an; an= ann) { ann= an->next; free(an); }
 
   cancel_children(qu);
   for (an= qu->allocations.head; an; an= ann) { ann= an->next; free(an); }

+  LIST_INIT(qu->allocations);

   adns__vbuf_free(&qu->vb);
 }
 
 void adns_cancel(adns_query qu) {
   adns__vbuf_free(&qu->vb);
 }
 
 void adns_cancel(adns_query qu) {

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

   switch (qu->state) {
   case query_tosend: case query_tcpwait: case query_tcpsent:
   switch (qu->state) {
   case query_tosend: case query_tcpwait: case query_tcpsent:

-    LIST_UNLINK(qu->ads->timew,qu);
+    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();


@@ -377,6 +387,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) {


@@ -464,6 +475,7 @@ 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) {