The `qcontext.info' union has two distinct uses. A PTR query uses it to
store the initial query address, against which it compares the answer to
its child A query. On the other hand, `pap_hostaddr' uses this space in
each child query it makes, to keep track of where to put the socket
addresses when the answers come back.
These two kinds of uses are incompatible, so split `qcontext.info' into
two pieces: one for the internal use of a query type, and one for the
use of a child query's parent -- and specifically for its completion
callback.
Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
typedef struct {
void *ext;
void (*callback)(adns_query parent, adns_query child);
typedef struct {
void *ext;
void (*callback)(adns_query parent, adns_query child);
+
+ union {
+ adns_rr_addr ptr_addr;
+ } tinfo; /* type-specific state for the query itself: zero-init if you
+ * don't know better. */
+
- adns_rr_addr ptr_parent_addr;
adns_rr_hostaddr *hostaddr;
adns_rr_hostaddr *hostaddr;
+ } pinfo; /* state for use by parent's callback function */
} qcontext;
struct adns__query {
} qcontext;
struct adns__query {
qu->ctx.ext= context;
qu->ctx.callback= 0;
qu->ctx.ext= context;
qu->ctx.callback= 0;
- memset(&qu->ctx.info,0,sizeof(qu->ctx.info));
+ memset(&qu->ctx.pinfo,0,sizeof(qu->ctx.pinfo));
+ memset(&qu->ctx.tinfo,0,sizeof(qu->ctx.tinfo));
static void icb_hostaddr(adns_query parent, adns_query child) {
adns_answer *cans= child->answer;
static void icb_hostaddr(adns_query parent, adns_query child) {
adns_answer *cans= child->answer;
- adns_rr_hostaddr *rrp= child->ctx.info.hostaddr;
+ adns_rr_hostaddr *rrp= child->ctx.pinfo.hostaddr;
adns_state ads= parent->ads;
adns_status st;
adns_state ads= parent->ads;
adns_status st;
ctx.ext= 0;
ctx.callback= icb_hostaddr;
ctx.ext= 0;
ctx.callback= icb_hostaddr;
- ctx.info.hostaddr= rrp;
+ ctx.pinfo.hostaddr= rrp;
+ memset(&ctx.tinfo, 0, sizeof(ctx.tinfo));
nflags= adns_qf_quoteok_query;
if (!(pai->qu->flags & adns_qf_cname_loose)) nflags |= adns_qf_cname_forbid;
nflags= adns_qf_quoteok_query;
if (!(pai->qu->flags & adns_qf_cname_loose)) nflags |= adns_qf_cname_forbid;
- queried= &parent->ctx.info.ptr_parent_addr;
+ queried= &parent->ctx.tinfo.ptr_addr;
for (i=0, found=cans->rrs.addr; i<cans->nrrs; i++, found++) {
if (queried->len == found->len &&
!memcmp(&queried->addr,&found->addr,queried->len)) {
for (i=0, found=cans->rrs.addr; i<cans->nrrs; i++, found++) {
if (queried->len == found->len &&
!memcmp(&queried->addr,&found->addr,queried->len)) {
if (st) return st;
if (cbyte != max) return adns_s_invaliddata;
if (st) return st;
if (cbyte != max) return adns_s_invaliddata;
- ap= &pai->qu->ctx.info.ptr_parent_addr;
+ ap= &pai->qu->ctx.tinfo.ptr_addr;
if (!ap->len) {
adns__findlabel_start(&fls, pai->ads, -1, pai->qu,
pai->qu->query_dgram, pai->qu->query_dglen,
if (!ap->len) {
adns__findlabel_start(&fls, pai->ads, -1, pai->qu,
pai->qu->query_dgram, pai->qu->query_dglen,
ctx.ext= 0;
ctx.callback= icb_ptr;
ctx.ext= 0;
ctx.callback= icb_ptr;
- memset(&ctx.info,0,sizeof(ctx.info));
+ memset(&ctx.pinfo,0,sizeof(ctx.pinfo));
+ memset(&ctx.tinfo,0,sizeof(ctx.tinfo));
st= adns__internal_submit(pai->ads, &nqu, adns__findtype(adns_r_addr),
&pai->qu->vb, id,
adns_qf_quoteok_query, pai->now, &ctx);
st= adns__internal_submit(pai->ads, &nqu, adns__findtype(adns_r_addr),
&pai->qu->vb, id,
adns_qf_quoteok_query, pai->now, &ctx);