X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/86e7b8d96483d2f55561aa76ac96e7663840b796..c7836bc9e8b0ed6a04e9008545e29de410d9693e:/src/reply.c diff --git a/src/reply.c b/src/reply.c index 5ed6581..c0772b9 100644 --- a/src/reply.c +++ b/src/reply.c @@ -20,23 +20,25 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "internal.h" +#include +#include -static void cname_recurse(adns_query qu, adns_queryflags xflags) { - assert(!"cname not implemented"); /* FIXME */ -} +#include "internal.h" void adns__procdgram(adns_state ads, const byte *dgram, int dglen, int serv, struct timeval now) { int cbyte, rrstart, wantedrrs, rri, foundsoa, foundns, cname_here; int id, f1, f2, qdcount, ancount, nscount, arcount; int flg_ra, flg_rd, flg_tc, flg_qr, opcode; - int rrtype, rrclass, rdlength, rdstart, ownermatched, l; + int rrtype, rrclass, rdlength, rdstart; int anstart, nsstart, arstart; + int ownermatched, l, nrrs; + const typeinfo *typei; adns_query qu, nqu; dns_rcode rcode; adns_status st; vbuf tempvb; + byte *newquery, *rrsdata; if (dglen>3; - flg_tc= f1&0x20; + flg_tc= f1&0x02; flg_rd= f1&0x01; flg_ra= f2&0x80; rcode= (f2&0x0f); @@ -91,13 +93,13 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, if (ads->iflags & adns_if_debug) { adns__vbuf_init(&tempvb); adns__debug(ads,serv,0,"reply not found, id %02x, query owner %s", - id, adns__diag_domain(ads,serv,0,&tempvb,adns_qf_anyquote, - dgram,dglen,DNS_HDRSIZE)); + id, adns__diag_domain(ads,serv,0,&tempvb,dgram,dglen,DNS_HDRSIZE)); adns__vbuf_free(&tempvb); } return; } anstart= qu->query_dglen; + arstart= -1; LIST_UNLINK(ads->timew,qu); /* We're definitely going to do something with this query now */ @@ -148,25 +150,27 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, if (!ownermatched) { if (ads->iflags & adns_if_debug) { adns__debug(ads,serv,qu,"ignoring RR with an unexpected owner %s", - adns__diag_domain(ads,serv,qu, &qu->vb,qu->flags, - dgram,dglen,rrstart)); + adns__diag_domain(ads,serv,qu, &qu->vb, dgram,dglen,rrstart)); } continue; } - if (rrtype == adns_r_cname && + if (rrtype == adns_r_cname && /* fixme - implement adns_qf_nocname */ (qu->typei->type & adns__rrt_typemask) != adns_r_cname) { if (!qu->cname_dgram) { /* Ignore second and subsequent CNAMEs */ - qu->cname_dgram= adns__alloc_mine(qu,dglen); - if (!qu->cname_dgram) return; qu->cname_begin= rdstart; qu->cname_dglen= dglen; - st= adns__parse_domain(ads,serv,qu, &qu->vb,qu->flags, + st= adns__parse_domain(ads,serv,qu, &qu->vb, + qu->flags & adns_qf_quoteok_cname ? pdf_quoteok : 0, dgram,dglen, &rdstart,rdstart+rdlength); if (!qu->vb.used) goto x_truncated; if (st) { adns__query_fail(qu,st); return; } l= strlen(qu->vb.buf)+1; qu->answer->cname= adns__alloc_interim(qu,l); - if (!qu->answer->cname) return; + if (!qu->answer->cname) { adns__query_fail(qu,adns_s_nolocalmem); return; } + + qu->cname_dgram= adns__alloc_mine(qu,dglen); + memcpy(qu->cname_dgram,dgram,dglen); + memcpy(qu->answer->cname,qu->vb.buf,l); cname_here= 1; /* If we find the answer section truncated after this point we restart @@ -176,8 +180,7 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, */ } else { adns__debug(ads,serv,qu,"ignoring duplicate CNAME (%s, as well as %s)", - adns__diag_domain(ads,serv,qu, &qu->vb,qu->flags, - dgram,dglen,rdstart), + adns__diag_domain(ads,serv,qu, &qu->vb, dgram,dglen,rdstart), qu->answer->cname); } } else if (rrtype == (qu->typei->type & adns__rrt_typemask)) { @@ -187,7 +190,11 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, } } - /* If we got here then the answer section is intact. */ + /* We defer handling truncated responses here, in case there was a CNAME + * which we could use. + */ + if (flg_tc) goto x_truncated; + nsstart= cbyte; if (!wantedrrs) { @@ -227,7 +234,7 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, * a CNAME in this datagram then we should probably do our own CNAME * lookup now in the hope that we won't get a referral again. */ - if (cname_here) { cname_recurse(qu,0); return; } + if (cname_here) goto x_restartquery; /* Bloody hell, I thought we asked for recursion ? */ if (flg_rd) { @@ -246,10 +253,13 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, /* Now, we have some RRs which we wanted. */ qu->answer->rrs.untyped= adns__alloc_interim(qu,qu->typei->rrsz*wantedrrs); - if (!qu->answer->rrs.untyped) return; + if (!qu->answer->rrs.untyped) { adns__query_fail(qu,adns_s_nolocalmem); return; } + typei= qu->typei; cbyte= anstart; - arstart= -1; + rrsdata= qu->answer->rrs.bytes; + + nrrs= 0; for (rri=0; rritypei->type & adns__rrt_typemask) || !ownermatched) continue; - assert(qu->answer->nrrstypei->parse(qu,serv, - dgram,dglen, rdstart,rdstart+rdlength, - qu->answer->rrs.bytes+qu->answer->nrrs*qu->typei->rrsz); + st= typei->parse(qu,serv, dgram,dglen, rdstart,rdstart+rdlength, + nsstart,&arstart, rrsdata+nrrs*typei->rrsz); if (st) { adns__query_fail(qu,st); return; } if (rdstart==-1) goto x_truncated; - qu->answer->nrrs++; + nrrs++; } + assert(nrrs==wantedrrs); + qu->answer->nrrs= nrrs; /* This may have generated some child queries ... */ if (qu->children.head) { @@ -279,13 +289,30 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, return; x_truncated: + if (!flg_tc) { adns__diag(ads,serv,qu,"server sent datagram which points outside itself"); adns__query_fail(qu,adns_s_serverfaulty); return; } - if (qu->cname_dgram) { cname_recurse(qu,adns_qf_usevc); return; } - adns__reset_cnameonly(qu); qu->flags |= adns_qf_usevc; + + x_restartquery: + + if (qu->cname_dgram) { + st= adns__mkquery_frdgram(qu->ads,&qu->vb,&qu->id, + qu->cname_dgram, qu->cname_dglen, qu->cname_begin, + qu->typei->type, qu->flags); + if (st) { adns__query_fail(qu,st); return; } + + newquery= realloc(qu->query_dgram,qu->vb.used); + if (!newquery) { adns__query_fail(qu,adns_s_nolocalmem); return; } + + qu->query_dgram= newquery; + qu->query_dglen= qu->vb.used; + memcpy(newquery,qu->vb.buf,qu->vb.used); + } + + adns__reset_cnameonly(qu); adns__query_udp(qu,now); }