Reentrancy: Introduce adns__cancel

We need a version of adns_cancel which does not call adns_returning,
for internal call sites who want to avoid reentrancy hazards.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/internal.h b/src/internal.h
index 13740b293a8e395ba7edd0ff49e53906d5723a30..d53ea5f3a93c40542d1fc06e15904f9710521eda 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -704,6 +704,7 @@ void adns__reset_preserved(adns_query qu);
  * in a datagram and discover that we need to retry the query.
  */
 
+void adns__cancel(adns_query qu);
 void adns__query_done(adns_query qu);
 void adns__query_fail(adns_query qu, adns_status stat);
 void adns__cancel_children(adns_query qu);

diff --git a/src/query.c b/src/query.c
index 3e93fc2ef81a54b601d7bb51ca1a3b6799e8e181..08085342283a8faa5537316270b156ff99ac482b 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -472,7 +472,7 @@ void adns__cancel_children(adns_query qu) {
 
   for (cqu= qu->children.head; cqu; cqu= ncqu) {
     ncqu= cqu->siblings.next;
-    adns_cancel(cqu);
+    adns__cancel(cqu);
   }
 }
 
@@ -500,11 +500,11 @@ void adns__returning(adns_state ads, adns_query qu_for_caller) {
   adns__consistency(ads,qu_for_caller,cc_entex);
 }
 
-void adns_cancel(adns_query qu) {
+void adns__cancel(adns_query qu) {
   adns_state ads;
 
   ads= qu->ads;
-  adns__consistency(ads,qu,cc_entex);
+  adns__consistency(ads,qu,cc_freq);
   if (qu->parent) LIST_UNLINK_PART(qu->parent->children,qu,siblings.);
   switch (qu->state) {
   case query_tosend:
@@ -525,6 +525,15 @@ void adns_cancel(adns_query qu) {
   free_query_allocs(qu);
   free(qu->answer);
   free(qu);
+}
+
+void adns_cancel(adns_query qu) {
+  adns_state ads;
+
+  assert(!qu->parent);
+  ads= qu->ads;
+  adns__consistency(ads,qu,cc_entex);
+  adns__cancel(qu);
   adns__returning(ads,0);
 }
 

diff --git a/src/setup.c b/src/setup.c
index 54d2d0f9adc5bbde5e2ad2777ecfbb3de8450880..3419cd6a5134f2157d710b541825ffa436d2ea36 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -725,10 +725,10 @@ void adns_finish(adns_state ads) {
   int i;
   adns__consistency(ads,0,cc_entex);
   for (;;) {
-    if (ads->udpw.head) adns_cancel(ads->udpw.head);
-    else if (ads->tcpw.head) adns_cancel(ads->tcpw.head);
-    else if (ads->childw.head) adns_cancel(ads->childw.head);
-    else if (ads->output.head) adns_cancel(ads->output.head);
+    if (ads->udpw.head) adns__cancel(ads->udpw.head);
+    else if (ads->tcpw.head) adns__cancel(ads->tcpw.head);
+    else if (ads->childw.head) adns__cancel(ads->childw.head);
+    else if (ads->output.head) adns__cancel(ads->output.head);
     else break;
   }
   for (i=0; i<ads->nudp; i++) close(ads->udpsocket[i].fd);