@@ -23,12 +23,14 @@

[adns] / src / query.c

diff --git a/src/query.c b/src/query.c
index 12bd6ada4bc2d212114b836940943e23610a726e..ec545625310c11cbb46535e37a7dd0dde1a7b60b 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,7 +41,7 @@ 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);
   qu->back= qu->next= qu->parent= 0;
   LIST_INIT(qu->children);
   LINK_INIT(qu->siblings);


@@ -100,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);
 }
 


@@ -202,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;


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


@@ -342,7 +346,6 @@ static void cancel_children(adns_query qu) {
     ncqu= cqu->siblings.next;
     adns_cancel(cqu);
   }
     ncqu= cqu->siblings.next;
     adns_cancel(cqu);
   }

-  LIST_INIT(qu->children);

 }
 
 void adns__reset_preserved(adns_query qu) {
 }
 
 void adns__reset_preserved(adns_query qu) {


@@ -358,19 +361,25 @@ 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);
+  if (qu->parent) LIST_UNLINK_PART(qu->parent->children,qu,siblings.);

   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();


@@ -378,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 +474,7 @@ void adns__query_done(adns_query qu) {
   } else {
     makefinal_query(qu);
     LIST_LINK_TAIL(qu->ads->output,qu);
   } else {
     makefinal_query(qu);
     LIST_LINK_TAIL(qu->ads->output,qu);

+    qu->state= query_done;

   }
 }
 
   }
 }