X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/31144a72ed24e2d3cd62f5f1239e219737beeff4..9557e604273fc0ce783fe69da74858b37ae818e5:/src/reply.c diff --git a/src/reply.c b/src/reply.c index 0bcc3fa..cbb66a1 100644 --- a/src/reply.c +++ b/src/reply.c @@ -1,28 +1,47 @@ -/**/ +/* + * reply.c + * - main handling and parsing routine for received datagrams + */ +/* + * This file is part of adns, which is Copyright (C) 1997, 1998 Ian Jackson + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #include "internal.h" -static void cname_recurse(adns_state ads, adns_query qu, adns_queryflags xflags) { +static void cname_recurse(adns_query qu, adns_queryflags xflags) { abort(); /* FIXME */ } void adns__procdgram(adns_state ads, const byte *dgram, int dglen, int serv, struct timeval now) { int cbyte, rrstart, wantedrrs, rri, foundsoa, foundns; - int id, f1, f2, qdcount, ancount, nscount, arcount, flg_ra, flg_rd, flg_tc, opcode; - int rrtype, rrclass, rdlength, rdstart, ownermatched, ownerstart; + 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 anstart, nsstart, arstart; - int currentrrs; adns_query qu, nqu; dns_rcode rcode; adns_status st; - vbuf vb; -#error init and free vb properly if (dglen1) { - adns__diag(ads,serv,"server claimed to answer %d questions with one message", + adns__diag(ads,serv,0,"server claimed to answer %d questions with one message", qdcount); return; } for (qu= ads->timew.head; qu; qu= nqu) { nqu= qu->next; if (qu->id != id) continue; - if (dglen < qu->querylen) continue; - if (memcmp(qu->querymsg+DNS_HDRSIZE,dgram+DNS_HDRSIZE,qu->querylen-DNS_HDRSIZE)) + if (dglen < qu->query_dglen) continue; + if (memcmp(qu->query_dgram+DNS_HDRSIZE, + dgram+DNS_HDRSIZE, + qu->query_dglen-DNS_HDRSIZE)) continue; break; } - assert(qu->cnameoff == -1); - anstart= qu->querylen; + anstart= qu->query_dglen; if (!qu) { - adns__debug(ads,serv,"reply not found (id=%02x)",id); + adns__debug(ads,serv,0,"reply not found (id=%02x)",id); return; } @@ -79,22 +99,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(ads,qu,adns_s_serverfaulty); + adns__query_fail(qu,adns_s_serverfaulty); return; case rcode_servfail: - adns__query_fail(ads,qu,adns_s_servfail); + adns__query_fail(qu,adns_s_servfail); return; case rcode_notimp: adns__warn(ads,serv,qu,"server claims not to implement our query"); - adns__query_fail(ads,qu,adns_s_notimplemented); + adns__query_fail(qu,adns_s_notimplemented); return; case rcode_refused: adns__warn(ads,serv,qu,"server refused our query"); - adns__query_fail(ads,qu,adns_s_refused); + adns__query_fail(qu,adns_s_refused); return; default: adns__warn(ads,serv,qu,"server gave unknown response code %d",rcode); - adns__query_fail(ads,qu,adns_s_reasonunknown); + adns__query_fail(qu,adns_s_reasonunknown); return; } @@ -104,16 +124,10 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, wantedrrs= 0; for (rri= 0; rricname_dgram >= 0) { - st= adns__findrr(ads,serv, dgram,dglen,&cbyte, - &rrtype,&rrclass,&rdlength,&rdstart, - qu->cname_dgram,qu->cname_dglen,qu->cname_begin, &ownermatched); - } else { - st= adns__findrr(ads,serv, dgram,dglen,&cbyte, - &rrtype,&rrclass,&rdlength,&rdstart, - qu->querymsg,qu->querylen,DNS_HDRSIZE, &ownermatched); - } - if (st) adns__query_fail(ads,qu,st); + st= adns__findrr(qu,serv, dgram,dglen,&cbyte, + &rrtype,&rrclass,&rdlength,&rdstart, + &ownermatched); + if (st) adns__query_fail(qu,st); if (rrtype == -1) goto x_truncated; if (rrclass != DNS_CLASS_IN) { @@ -124,22 +138,26 @@ 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,&vb,qu->flags, - dgram,dglen,rrstart,dglen)); + adns__diag_domain(ads,serv,qu, &qu->vb,qu->flags, + dgram,dglen,rrstart)); } continue; } if (rrtype == adns_r_cname && (qu->typei->type & adns__rrt_typemask) != adns_r_cname) { - if (!qu->cname_str) { /* Ignore second and subsequent CNAMEs */ + 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_dgram= dgram; qu->cname_dglen= dglen; - st= adns__parse_domain(ads,serv,&vb,qu->flags, + st= adns__parse_domain(ads,serv,qu, &qu->vb,qu->flags, dgram,dglen, &rdstart,rdstart+rdlength); - if (!vb.used) goto x_truncated; - if (st) { adns__query_fail(ads,qu,st); return; } - qu->cname_str= adns__vbuf_extractstring(&vb); + 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; + memcpy(qu->answer->cname,qu->vb.buf,l); /* If we find the answer section truncated after this point we restart * the query at the CNAME; if beforehand then we obviously have to use * TCP. If there is no truncation we can use the whole answer if @@ -147,9 +165,9 @@ 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,&vb,qu->flags, - dgram,dglen, rdstart,rdstart+rdlength), - qu->cname_str); + adns__diag_domain(ads,serv,qu, &qu->vb,qu->flags, + dgram,dglen,rdstart), + qu->answer->cname); } } else if (rrtype == (qu->typei->type & adns__rrt_typemask)) { wantedrrs++; @@ -165,7 +183,7 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, /* Oops, NODATA or NXDOMAIN or perhaps a referral (which would be a problem) */ if (rcode == rcode_nxdomain) { - adns__query_finish(ads,qu,adns_s_nxdomain); + adns__query_fail(qu,adns_s_nxdomain); return; } @@ -173,10 +191,9 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, foundsoa= 0; foundns= 0; for (rri= 0; rricname_dgram == dgram) { cname_recurse(ads,qu,0); return; } + if (qu->cname_dgram == dgram) { cname_recurse(qu,0); return; } /* Bloody hell, I thought we asked for recursion ? */ if (flg_rd) { @@ -207,46 +224,35 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, } if (!flg_ra) { adns__diag(ads,serv,qu,"server is not willing to do recursive lookups for us"); - adns__query_fail(ads,qu,adns_s_norecurse); + 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(ads,qu,adns_s_serverfaulty); + adns__query_fail(qu,adns_s_serverfaulty); } return; } /* Now, we have some RRs which we wanted. */ - if (!adns__vbuf_ensure(&qu->ansbuf,qu->typei->rrsz*wantedrrs)) { - adns__query_fail(ads,qu,adns_s_nolocalmem); - return; - } + qu->answer->rrs.untyped= adns__alloc_interim(qu,qu->typei->rrsz*wantedrrs); + if (!qu->answer->rrs.untyped) return; cbyte= anstart; - currentrrs= 0; arstart= -1; - qu->ansbuf.used= 0; for (rri=0; rricname_dgram >= 0) { - st= adns__findrr(ads,serv, dgram,dglen,&cbyte, - &rrtype,&rrclass,&rdlength,&rdstart, - qu->cname_dgram,qu->cname_dglen,qu->cname_begin, &ownermatched); - } else { - st= adns__findrr(ads,serv, dgram,dglen,&cbyte, - &rrtype,&rrclass,&rdlength,&rdstart, - qu->querymsg,qu->querylen,DNS_HDRSIZE, &ownermatched); - } + st= adns__findrr(qu,serv, dgram,dglen,&cbyte, + &rrtype,&rrclass,&rdlength,&rdstart, + &ownermatched); assert(!st); assert(rrtype != -1); if (rrclass != DNS_CLASS_IN || rrtype != (qu->typei->type & adns__rrt_typemask) || !ownermatched) continue; - assert(currentrrsansbuf.used += quj->typei->rrsz; - st= qu->typei->parse(ads,qu,serv,&vb, - dgram,dglen, &rdstart,rdstart+rdlength, - (void*)(qu->ansbuf.buf+qu->ansbuf.used)); - if (st) { adns__query_fail(ads,qu,st); return; } + assert(qu->answer->nrrstypei->parse(qu,serv, + dgram,dglen, rdstart,rdstart+rdlength, + qu->answer->rrs.bytes+qu->answer->nrrs*qu->typei->rrsz); + if (st) { adns__query_fail(qu,st); return; } if (rdstart==-1) goto x_truncated; } @@ -257,19 +263,17 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, return; } - adns__query_finish(ads,qu,adns_s_ok); + adns__query_done(qu); return; -x_truncated: + x_truncated: if (!flg_tc) { adns__diag(ads,serv,qu,"server sent datagram which points outside itself"); - adns__query_fail(ads,qu,adns_s_serverfaulty); + adns__query_fail(qu,adns_s_serverfaulty); return; } - if (qu->cname_dgram) { cname_recurse(ads,qu,adns_qf_usevc); return; } - ans= (adns_answer*)qu->ans.buf; - ans->nrrs= 0; - qu->ans.used= sizeof(adns_answer); + if (qu->cname_dgram) { cname_recurse(qu,adns_qf_usevc); return; } + adns__reset_cnameonly(qu); qu->flags |= adns_qf_usevc; - adns__query_udp(ads,qu,now); + adns__query_udp(qu,now); }