X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=src%2Freply.c;h=90314763f656b1f6a9cdaef4f08818b824593a83;hp=3b46e21358490b5fbfd37e2bac03be697e0db9f0;hb=4b707d8b1701aec2cec7431d4656f771b96a9f00;hpb=828d89bd4196ad8ef825cdf2db26afe2eb797b69 diff --git a/src/reply.c b/src/reply.c index 3b46e21..9031476 100644 --- a/src/reply.c +++ b/src/reply.c @@ -32,13 +32,14 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, int flg_ra, flg_rd, flg_tc, flg_qr, opcode; int rrtype, rrclass, rdlength, rdstart; int anstart, nsstart, arstart; - int ownermatched, l, nrrs, place; + int ownermatched, l, nrrs; const typeinfo *typei; adns_query qu, nqu; dns_rcode rcode; adns_status st; vbuf tempvb; byte *newquery, *rrsdata; + parseinfo pai; if (dglenquery_dglen; + arstart= -1; LIST_UNLINK(ads->timew,qu); /* We're definitely going to do something with this query now */ @@ -109,22 +111,22 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, break; case rcode_formaterror: adns__warn(ads,serv,qu,"server cannot understand our query (Format Error)"); - adns__query_fail(qu,adns_s_serverfaulty); + adns__query_fail(qu,adns_s_rcodeformaterror); return; case rcode_servfail: - adns__query_fail(qu,adns_s_servfail); + adns__query_fail(qu,adns_s_rcodeservfail); return; case rcode_notimp: adns__warn(ads,serv,qu,"server claims not to implement our query"); - adns__query_fail(qu,adns_s_notimplemented); + adns__query_fail(qu,adns_s_rcodenotimplemented); return; case rcode_refused: adns__warn(ads,serv,qu,"server refused our query"); - adns__query_fail(qu,adns_s_refused); + adns__query_fail(qu,adns_s_rcoderefused); return; default: adns__warn(ads,serv,qu,"server gave unknown response code %d",rcode); - adns__query_fail(qu,adns_s_reasonunknown); + adns__query_fail(qu,adns_s_rcodeunknown); return; } @@ -155,7 +157,10 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, } 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 */ + if (qu->flags & adns_qf_cname_forbid) { + adns__query_fail(qu,adns_s_prohibitedcname); + return; + } else if (!qu->cname_dgram) { /* Ignore second and subsequent CNAMEs */ qu->cname_begin= rdstart; qu->cname_dglen= dglen; st= adns__parse_domain(ads,serv,qu, &qu->vb, @@ -165,7 +170,7 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, 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) { adns__query_fail(qu,adns_s_nolocalmem); return; } + if (!qu->answer->cname) { adns__query_fail(qu,adns_s_nomemory); return; } qu->cname_dgram= adns__alloc_mine(qu,dglen); memcpy(qu->cname_dgram,dgram,dglen); @@ -244,7 +249,7 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, adns__query_fail(qu,adns_s_norecurse); } else { adns__diag(ads,serv,qu,"server claims to do recursion, but gave us a referral"); - adns__query_fail(qu,adns_s_serverfaulty); + adns__query_fail(qu,adns_s_invalidresponse); } return; } @@ -252,22 +257,23 @@ 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) { adns__query_fail(qu,adns_s_nolocalmem); return; } + if (!qu->answer->rrs.untyped) { adns__query_fail(qu,adns_s_nomemory); return; } typei= qu->typei; cbyte= anstart; - arstart= -1; rrsdata= qu->answer->rrs.bytes; - - if (typei->diff_needswap) { - if (!adns__vbuf_ensure(&qu->vb,typei->rrsz)) { - adns__query_fail(qu,adns_s_nolocalmem); - return; - } - } - nrrs= 0; - - for (rri=0; rriads; + pai.qu= qu; + pai.serv= serv; + pai.dgram= dgram; + pai.dglen= dglen; + pai.nsstart= nsstart; + pai.nscount= nscount; + pai.arcount= arcount; + pai.now= now; + + for (rri=0, nrrs=0; rritypei->type & adns__rrt_typemask) || !ownermatched) continue; - st= typei->parse(qu,serv, dgram,dglen, rdstart,rdstart+rdlength, - rrsdata+nrrs*typei->rrsz); + st= typei->parse(&pai, rdstart,rdstart+rdlength, rrsdata+nrrs*typei->rrsz); if (st) { adns__query_fail(qu,st); return; } if (rdstart==-1) goto x_truncated; - - if (typei->diff_needswap) { - for (place= nrrs; - place>0 && typei->diff_needswap(rrsdata+(place-1)*typei->rrsz, - rrsdata+nrrs*typei->rrsz); - place--); - if (place != nrrs) { - memcpy(qu->vb.buf,rrsdata+nrrs*typei->rrsz,typei->rrsz); - memmove(rrsdata+(place+1)*typei->rrsz, - rrsdata+place*typei->rrsz, - (nrrs-place)*typei->rrsz); - memcpy(rrsdata+place*typei->rrsz,qu->vb.buf,typei->rrsz); - } - } nrrs++; } assert(nrrs==wantedrrs); @@ -313,7 +304,7 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, if (!flg_tc) { adns__diag(ads,serv,qu,"server sent datagram which points outside itself"); - adns__query_fail(qu,adns_s_serverfaulty); + adns__query_fail(qu,adns_s_invalidresponse); return; } qu->flags |= adns_qf_usevc; @@ -327,7 +318,7 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, 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; } + if (!newquery) { adns__query_fail(qu,adns_s_nomemory); return; } qu->query_dgram= newquery; qu->query_dglen= qu->vb.used;