* - 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 Ian Jackson
+ * and contributors (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
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, write to the Free Software Foundation.
*/
#include "internal.h"
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) {
}
static void checkc_global(adns_state ads) {
+ const struct sortlist *sl;
int i;
- assert(ads->udpsocket >= 0);
+ assert(ads->udpsockets >= 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_matches(sl->base.sa.sa_family,
+ adns__sockaddr_addr(&sl->base.sa),
+ &sl->base,&sl->mask));
+ }
assert(ads->tcpserver >= 0 && ads->tcpserver < ads->nservers);
}
static void checkc_queue_childw(adns_state ads) {
- adns_query parent, child;
+ adns_query parent, child, search;
DLIST_CHECK(ads->childw, parent, , {
assert(parent->state == query_childw);
assert(parent->children.head);
DLIST_CHECK(parent->children, child, siblings., {
assert(child->parent == parent);
- assert(child->state != query_done);
+ if (child->state == query_done) {
+ for (search= ads->intdone.head; search; search= search->next)
+ if (search==child) goto child_done_ok;
+ assert(!"done child not on intdone");
+ child_done_ok:;
+ }
});
checkc_query(ads,parent);
checkc_query_alloc(ads,parent);
});
}
+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);
});
}
switch (cc) {
case cc_user:
break;
- case cc_entex:
+ case cc_enter:
+ if (!(ads->iflags & adns_if_checkc_entex)) return;
+ break;
+ case cc_exit:
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;
checkc_queue_tcpw(ads);
checkc_queue_childw(ads);
checkc_queue_output(ads);
+ checkc_queue_intdone(ads);
if (qu) {
switch (qu->state) {
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");
~ianmdlvl / adns.git / blobdiff