chiark
/
gitweb
/
~ianmdlvl
/
adns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regress: Move case-*.in opening to shlib playback_prepare
[adns.git]
/
src
/
query.c
diff --git
a/src/query.c
b/src/query.c
index 480cbf557ebafce2d88fc2aa0d3273975fecfc7d..4eba88871f651c921fbf727206868c9b2f009e3e 100644
(file)
--- a/
src/query.c
+++ b/
src/query.c
@@
-6,7
+6,7
@@
*/
/*
* This file is part of adns, which is
*/
/*
* This file is part of adns, which is
- * Copyright (C) 1997-2000,2003,2006,2014-2016 Ian Jackson
+ * Copyright (C) 1997-2000,2003,2006,2014-2016
,2020
Ian Jackson
* Copyright (C) 2014 Mark Wooding
* Copyright (C) 1999-2000,2003,2006 Tony Finch
* Copyright (C) 1991 Massachusetts Institute of Technology
* Copyright (C) 2014 Mark Wooding
* Copyright (C) 1999-2000,2003,2006 Tony Finch
* Copyright (C) 1991 Massachusetts Institute of Technology
@@
-72,7
+72,7
@@
static adns_query query_alloc(adns_state ads,
qu->retries= 0;
qu->udpnextserver= 0;
qu->udpsent= 0;
qu->retries= 0;
qu->udpnextserver= 0;
qu->udpsent= 0;
-
timerclear(&qu->timeout
);
+
adns__timeout_clear(qu
);
qu->expires= now.tv_sec + MAXTTLBELIEVE;
memset(&qu->ctx,0,sizeof(qu->ctx));
qu->expires= now.tv_sec + MAXTTLBELIEVE;
memset(&qu->ctx,0,sizeof(qu->ctx));
@@
-273,7
+273,7
@@
int adns_submit(adns_state ads,
adns_query qu;
const char *p;
adns_query qu;
const char *p;
- adns__consistency(ads,0,cc_ente
x
);
+ adns__consistency(ads,0,cc_ente
r
);
if (flags & ~(adns_queryflags)0x4009ffff)
/* 0x40080000 are reserved for `harmless' future expansion
if (flags & ~(adns_queryflags)0x4009ffff)
/* 0x40080000 are reserved for `harmless' future expansion
@@
-431,10
+431,10
@@
void adns__free_interim(adns_query qu, void *p) {
if (!an) return;
assert(!qu->final_allocspace);
if (!an) return;
assert(!qu->final_allocspace);
+ qu->interim_allocd -= sz;
+ assert(qu->interim_allocd >= 0);
LIST_UNLINK(qu->allocations, an);
free(an);
LIST_UNLINK(qu->allocations, an);
free(an);
- qu->interim_allocd -= sz;
- assert(!qu->interim_allocd >= 0);
}
void *adns__alloc_mine(adns_query qu, size_t sz) {
}
void *adns__alloc_mine(adns_query qu, size_t sz) {
@@
-504,7
+504,7
@@
static void free_query_allocs(adns_query qu) {
qu->query_dgram= 0;
}
qu->query_dgram= 0;
}
-void adns__
returning(adns_state ads, adns_query qu_for_caller
) {
+void adns__
intdone_process(adns_state ads
) {
while (ads->intdone.head) {
adns_query iq= ads->intdone.head;
adns_query parent= iq->parent;
while (ads->intdone.head) {
adns_query iq= ads->intdone.head;
adns_query parent= iq->parent;
@@
-516,7
+516,11
@@
void adns__returning(adns_state ads, adns_query qu_for_caller) {
free(iq->answer);
free(iq);
}
free(iq->answer);
free(iq);
}
- adns__consistency(ads,qu_for_caller,cc_entex);
+}
+
+void adns__returning(adns_state ads, adns_query qu_for_caller) {
+ adns__intdone_process(ads);
+ adns__consistency(ads,qu_for_caller,cc_exit);
}
void adns__cancel(adns_query qu) {
}
void adns__cancel(adns_query qu) {
@@
-554,7
+558,7
@@
void adns_cancel(adns_query qu) {
assert(!qu->parent);
ads= qu->ads;
assert(!qu->parent);
ads= qu->ads;
- adns__consistency(ads,qu,cc_ente
x
);
+ adns__consistency(ads,qu,cc_ente
r
);
adns__cancel(qu);
adns__returning(ads,0);
}
adns__cancel(qu);
adns__returning(ads,0);
}