@@ -1,6 +1,4 @@

-uadns (0.8) BETA; urgency=medium
-
-  * bug_if_query_done feature for debugging (SHOULD BE TAKEN OUT FOR RELEASE)
+adns (0.8) BETA; urgency=medium

   Bugfixes:
   * Race near adns_beforeselect which could cause infinite timeout fixed

diff --git a/changelog b/changelog
index ecc6ae28ee28b23d15a829efbc8d8db8e9c269b7..1de9d36cd790091a218a1f45913554fd26c56fcf 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,6 +1,4 @@
-uadns (0.8) BETA; urgency=medium
-
-  * bug_if_query_done feature for debugging (SHOULD BE TAKEN OUT FOR RELEASE) 
+adns (0.8) BETA; urgency=medium

 
   Bugfixes:
   * Race near adns_beforeselect which could cause infinite timeout fixed
 
   Bugfixes:
   * Race near adns_beforeselect which could cause infinite timeout fixed

diff --git a/src/event.c b/src/event.c
index bd5325520694b413edc9e838f981a899f2cebb7d..7e71a336befa1b8275646e3f53a2108154e0dd29 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -674,9 +674,7 @@ int adns_wait(adns_state ads,
     if (r != EAGAIN) break;
     maxfd= 0; tvp= 0;
     FD_ZERO(&readfds); FD_ZERO(&writefds); FD_ZERO(&exceptfds);
     if (r != EAGAIN) break;
     maxfd= 0; tvp= 0;
     FD_ZERO(&readfds); FD_ZERO(&writefds); FD_ZERO(&exceptfds);

-    ads->bug_if_query_done_now= 1;

     adns_beforeselect(ads,&maxfd,&readfds,&writefds,&exceptfds,&tvp,&tvbuf,0);
     adns_beforeselect(ads,&maxfd,&readfds,&writefds,&exceptfds,&tvp,&tvbuf,0);

-    ads->bug_if_query_done_now= 0;

     assert(tvp);
     rsel= select(maxfd,&readfds,&writefds,&exceptfds,tvp);
     if (rsel==-1) {
     assert(tvp);
     rsel= select(maxfd,&readfds,&writefds,&exceptfds,tvp);
     if (rsel==-1) {

diff --git a/src/internal.h b/src/internal.h
index 719a592255c3c0a0f7002b88257bfc73ce5b0845..c7667382babd3adfec53dfde1e92e641c387c5d8 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -282,7 +282,6 @@ struct adns__state {
   struct query_queue udpw, tcpw, childw, output;
   adns_query forallnext;
   int nextid, udpsocket, tcpsocket;
   struct query_queue udpw, tcpw, childw, output;
   adns_query forallnext;
   int nextid, udpsocket, tcpsocket;

-  int bug_if_query_done_now;

   vbuf tcpsend, tcprecv;
   int nservers, nsortlist, nsearchlist, searchndots, tcpserver, tcprecv_skip;
   enum adns__tcpstate {
   vbuf tcpsend, tcprecv;
   int nservers, nsortlist, nsearchlist, searchndots, tcpserver, tcprecv_skip;
   enum adns__tcpstate {

diff --git a/src/query.c b/src/query.c
index 1fa26f87cbf673868a0b1421ba336fcbfdb1ec8b..aaadb219e8868134d2882fb36e5f99872949b2e4 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -501,7 +501,6 @@ void adns__query_done(adns_query qu) {
   adns_answer *ans;
   adns_query parent;
 
   adns_answer *ans;
   adns_query parent;
 

-  assert(!qu->ads->bug_if_query_done_now);

   cancel_children(qu);
 
   qu->id= -1;
   cancel_children(qu);
 
   qu->id= -1;


@@ -543,7 +542,6 @@ void adns__query_done(adns_query qu) {
 }
 
 void adns__query_fail(adns_query qu, adns_status stat) {
 }
 
 void adns__query_fail(adns_query qu, adns_status stat) {

-  assert(!qu->ads->bug_if_query_done_now);

   adns__reset_preserved(qu);
   qu->answer->status= stat;
   adns__query_done(qu);
   adns__reset_preserved(qu);
   qu->answer->status= stat;
   adns__query_done(qu);

diff --git a/src/setup.c b/src/setup.c
index 211f4257a1e72e9c1bd72eada67cd8d14953ba8c..ac88c33f6f79d15528102895013033cebdb3b99d 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -474,7 +474,6 @@ static int init_begin(adns_state *ads_r, adns_initflags flags, FILE *diagfile) {
   ads->forallnext= 0;
   ads->nextid= 0x311f;
   ads->udpsocket= ads->tcpsocket= -1;
   ads->forallnext= 0;
   ads->nextid= 0x311f;
   ads->udpsocket= ads->tcpsocket= -1;

-  ads->bug_if_query_done_now= 0;

   adns__vbuf_init(&ads->tcpsend);
   adns__vbuf_init(&ads->tcprecv);
   ads->tcprecv_skip= 0;
   adns__vbuf_init(&ads->tcpsend);
   adns__vbuf_init(&ads->tcprecv);
   ads->tcprecv_skip= 0;