X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftypes.c;h=0658615f42d1a50d75a80e762c77ba4a776797e5;hb=1382623344fca3a3bd55187ca031ab00c79adab0;hp=ac6b310cf99fd3128d19a8fe18637ea7c4bfc36f;hpb=51cb3de39ef4e85d2efa7d167dc531d04500a525;p=adns.git diff --git a/src/types.c b/src/types.c index ac6b310..0658615 100644 --- a/src/types.c +++ b/src/types.c @@ -85,6 +85,7 @@ * cs_* * gsz_* * postsort_* + * qs_* */ /* @@ -514,13 +515,12 @@ static void icb_hostaddr(adns_query parent, adns_query child) { adns_rr_hostaddr *rrp= child->ctx.pinfo.hostaddr; adns_state ads= parent->ads; adns_status st; - size_t addrsz= gsz_addr(0, parent->answer->type); st= cans->status; rrp->astatus= st; rrp->naddrs= (st>0 && st<=adns_s_max_tempfail) ? -1 : cans->nrrs; rrp->addrs= cans->rrs.addr; - adns__transfer_interim(child, parent, rrp->addrs, rrp->naddrs*addrsz); + adns__transfer_interim(child, parent, rrp->addrs); if (parent->children.head) { LIST_LINK_TAIL(ads->childw,parent); @@ -1268,11 +1268,13 @@ static void mf_flat(adns_query qu, void *data) { } #define DEEP_TYPE(code,rrt,fmt,memb,parser,comparer,/*printer*/...) \ { adns_r_##code&adns_rrt_reprmask, rrt,fmt,TYPESZ_M(memb), mf_##memb, \ GLUE(cs_, CAR(__VA_ARGS__)),pa_##parser,di_##comparer, \ - adns__ckl_hostname, 0, adns__getrrsz_default, CDR(__VA_ARGS__) } + adns__ckl_hostname, 0, adns__getrrsz_default, adns__query_send, \ + CDR(__VA_ARGS__) } #define FLAT_TYPE(code,rrt,fmt,memb,parser,comparer,/*printer*/...) \ { adns_r_##code&adns_rrt_reprmask, rrt,fmt,TYPESZ_M(memb), mf_flat, \ GLUE(cs_, CAR(__VA_ARGS__)),pa_##parser,di_##comparer, \ - adns__ckl_hostname, 0, adns__getrrsz_default, CDR(__VA_ARGS__) } + adns__ckl_hostname, 0, adns__getrrsz_default, adns__query_send, \ + CDR(__VA_ARGS__) } #define di_0 0