Reentrancy: Avoid reentrant callbacks

[adns.git] / src / check.c

diff --git a/src/check.c b/src/check.c
index aae65bf0c366ec1c641eb330dfb626bf96444399..21dca706300fdd714eb94d3a9c8ec77a60ef8136 100644 (file)
--- a/src/check.c
+++ b/src/check.c
@@ -3,12 +3,11 @@
  * - consistency checks
  */
 /*
- *  This file is
- *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
- *
- *  It is part of adns, which is
- *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
- *    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+ *  This file is part of adns, which is
+ *    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+ *    Copyright (C) 1999-2000,2003,2006  Tony Finch
+ *    Copyright (C) 1991 Massachusetts Institute of Technology
+ *  (See the file INSTALL for full details.)
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -31,24 +30,26 @@ void adns_checkconsistency(adns_state ads, adns_query qu) {
   adns__consistency(ads,qu,cc_user);
 }
 
-#define DLIST_CHECK(list, nodevar, part, body)                                 \
-  if ((list).head) {                                                           \
-    assert(! (list).head->part back);                                          \
-    for ((nodevar)= (list).head; (nodevar); (nodevar)= (nodevar)->part next) { \
-      assert((nodevar)->part next                                              \
-            ? (nodevar) == (nodevar)->part next->part back                     \
-            : (nodevar) == (list).tail);                                       \
-      body                                                                     \
-    }                                                                          \
+#define DLIST_CHECK(list, nodevar, part, body)                 \
+  if ((list).head) {                                           \
+    assert(! (list).head->part back);                          \
+    for ((nodevar)= (list).head;                               \
+        (nodevar);                                             \
+        (nodevar)= (nodevar)->part next) {                     \
+      assert((nodevar)->part next                              \
+            ? (nodevar) == (nodevar)->part next->part back     \
+            : (nodevar) == (list).tail);                       \
+      body                                                     \
+    }                                                          \
   }
 
-#define DLIST_ASSERTON(node, nodevar, list, part)                              \
-  do {                                                                         \
-    for ((nodevar)= (list).head;                                               \
-        (nodevar) != (node);                                                   \
-        (nodevar)= (nodevar)->part next) {                                     \
-      assert((nodevar));                                                       \
-    }                                                                          \
+#define DLIST_ASSERTON(node, nodevar, list, part)      \
+  do {                                                 \
+    for ((nodevar)= (list).head;                       \
+        (nodevar) != (node);                           \
+        (nodevar)= (nodevar)->part next) {             \
+      assert((nodevar));                               \
+    }                                                  \
   } while(0)
 
 static void checkc_query_alloc(adns_state ads, adns_query qu) {
@@ -74,12 +75,15 @@ static void checkc_notcpbuf(adns_state ads) {
 }
 
 static void checkc_global(adns_state ads) {
+  const struct sortlist *sl;
   int i;
   
   assert(ads->udpsocket >= 0);
 
-  for (i=0; i<ads->nsortlist; i++)
-    assert(!(ads->sortlist[i].base.s_addr & ~ads->sortlist[i].mask.s_addr));
+  for (i=0; i<ads->nsortlist; i++) {
+    sl= &ads->sortlist[i];
+    assert(adns__addr_match_p(sl->af,&sl->base, sl->af,&sl->base,&sl->mask));
+  }
 
   assert(ads->tcpserver >= 0 && ads->tcpserver < ads->nservers);
   
@@ -144,15 +148,29 @@ static void checkc_queue_childw(adns_state ads) {
   });
 }
 
+static void checkc_query_done(adns_state ads, adns_query qu) {
+  assert(qu->state == query_done);
+  assert(!qu->children.head && !qu->children.tail);
+  checkc_query(ads,qu);
+}
+
 static void checkc_queue_output(adns_state ads) {
   adns_query qu;
   
   DLIST_CHECK(ads->output, qu, , {
-    assert(qu->state == query_done);
-    assert(!qu->children.head && !qu->children.tail);
     assert(!qu->parent);
     assert(!qu->allocations.head && !qu->allocations.tail);
-    checkc_query(ads,qu);
+    checkc_query_done(ads,qu);
+  });
+}
+
+static void checkc_queue_intdone(adns_state ads) {
+  adns_query qu;
+  
+  DLIST_CHECK(ads->intdone, qu, , {
+    assert(qu->parent);
+    assert(qu->ctx.callback);
+    checkc_query_done(ads,qu);
   });
 }
 
@@ -164,6 +182,7 @@ void adns__consistency(adns_state ads, adns_query qu, consistency_checks cc) {
     break;
   case cc_entex:
     if (!(ads->iflags & adns_if_checkc_entex)) return;
+    assert(!ads->intdone.head);
     break;
   case cc_freq:
     if ((ads->iflags & adns_if_checkc_freq) != adns_if_checkc_freq) return;
@@ -177,6 +196,7 @@ void adns__consistency(adns_state ads, adns_query qu, consistency_checks cc) {
   checkc_queue_tcpw(ads);
   checkc_queue_childw(ads);
   checkc_queue_output(ads);
+  checkc_queue_intdone(ads);
 
   if (qu) {
     switch (qu->state) {
@@ -190,7 +210,10 @@ void adns__consistency(adns_state ads, adns_query qu, consistency_checks cc) {
       DLIST_ASSERTON(qu, search, ads->childw, );
       break;
     case query_done:
-      DLIST_ASSERTON(qu, search, ads->output, );
+      if (qu->parent)
+       DLIST_ASSERTON(qu, search, ads->intdone, );
+      else
+       DLIST_ASSERTON(qu, search, ads->output, );
       break;
     default:
       assert(!"specific query state");