X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=src%2Freply.c;h=337d3f8e2d6187e17877445deb0f010cc5170e48;hp=14fc05786a0d794fe3e730c0b8645e108eb6dc08;hb=e576be5096ae358bebe2e9b6ad07c49f74aef616;hpb=f1e474dda132e6d9626bc9930fd9025616de81fb diff --git a/src/reply.c b/src/reply.c index 14fc057..337d3f8 100644 --- a/src/reply.c +++ b/src/reply.c @@ -1,4 +1,24 @@ -/**/ +/* + * 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" @@ -9,14 +29,13 @@ static void cname_recurse(adns_state ads, adns_query qu, adns_queryflags xflags) 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_tc; + int id, f1, f2, qdcount, ancount, nscount, arcount, flg_ra, flg_rd, flg_tc, opcode; int rrtype, rrclass, rdlength, rdstart, ownermatched, ownerstart; int anstart, nsstart, arstart; int currentrrs; adns_query qu, nqu; dns_rcode rcode; adns_status st; -= 0; if (dglen>3; flg_tc= f1&0x20; + flg_rd= f1&0x01; flg_ra= f2&0x80; + rcode= (f1&0x0f); - if (f1&0x80) { + if (flg_qr) { adns__diag(ads,serv,"server sent us a query, not a response"); return; } - if (f1&0x70) { - adns__diag(ads,serv,"server sent us unknown opcode %d (wanted 0=QUERY)", - (f1>>4)&0x70); + if (opcode) { + adns__diag(ads,serv,"server sent us unknown opcode %d (wanted 0=QUERY)",opcode); return; } if (!qdcount) { @@ -69,34 +91,27 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, LIST_UNLINK(ads->timew,qu); /* We're definitely going to do something with this query now */ - if (!(f1&0x01)) { - adns__diag(ads,serv,"server thinks we didn't ask for recursive lookup"); - adns__query_fail(ads,qu,adns_s_serverfaulty); - return; - } - - rcode= (f1&0x0f); switch (rcode) { case rcode_noerror: case rcode_nxdomain: break; case rcode_formaterror: - adns__warn(ads,serv,"server cannot understand our query (Format Error)"); + adns__warn(ads,serv,qu,"server cannot understand our query (Format Error)"); adns__query_fail(ads,qu,adns_s_serverfaulty); return; case rcode_servfail: adns__query_fail(ads,qu,adns_s_servfail); return; case rcode_notimp: - adns__warn(ads,serv,"server claims not to implement our query"); + adns__warn(ads,serv,qu,"server claims not to implement our query"); adns__query_fail(ads,qu,adns_s_notimplemented); return; case rcode_refused: - adns__warn(ads,serv,"server refused our query"); + adns__warn(ads,serv,qu,"server refused our query"); adns__query_fail(ads,qu,adns_s_refused); return; default: - adns__warn(ads,serv,"server gave unknown response code %d",rcode); + adns__warn(ads,serv,qu,"server gave unknown response code %d",rcode); adns__query_fail(ads,qu,adns_s_reasonunknown); return; } @@ -107,53 +122,58 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, wantedrrs= 0; for (rri= 0; rricnameoff >= 0) { + if (qu->cname_dgram >= 0) { st= adns__findrr(ads,serv, dgram,dglen,&cbyte, &rrtype,&rrclass,&rdlength,&rdstart, - dgram,dglen,qu->cnameoff, &ownermatched); + qu->cname_dgram,qu->cname_dglen,qu->cname_begin, &ownermatched); } else { - st= adns__get_rr_temp(ads,qu,serv, dgram,dglen,&cbyte, - &rrtype,&rrclass,&rdlength,&rdstart, - qu->querymsg,qu->querylen,DNS_HDRSIZE, &ownermatched); + 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); if (rrtype == -1) goto x_truncated; if (rrclass != DNS_CLASS_IN) { - adns__diag(ads,serv,"ignoring answer RR with wrong class %d (expected IN=%d)", + adns__diag(ads,serv,qu,"ignoring answer RR with wrong class %d (expected IN=%d)", rrclass,DNS_CLASS_IN); continue; } if (!ownermatched) { if (ads->iflags & adns_if_debug) { - st= adns__get_domain_temp(ads,qu,serv, dgram,dglen,&rrstart,dglen, &ownerstart); - if (st) - adns__debug(ads,serv, "ignoring RR with an irrelevant owner" - " whose format is bad, code %d",st); - else if (ownerstart>=0) - adns__debug(ads,serv, "ignoring RR with an irrelevant owner" - " \"%s\"", qu->ans.buf+ownerstart); - else - adns__debug(ads,serv,"ignoring RR with an irrelevant truncated owner"); + adns__debug(ads,serv,qu,"ignoring RR with an unexpected owner %s", + adns__diag_domain(ads,serv,&qu->vb,qu->flags, + dgram,dglen,rrstart,dglen)); } continue; } - if (qu->cnameoff<0 && - (qu->typei->type & adns__rrt_typemask) != adns_r_cname && - rrtype == adns_r_cname) { /* Ignore second and subsequent CNAMEs */ - st= adns__get_domain_perm(ads,qu,serv, dgram,dglen, - &rdstart,rdstart+rdlength,&qu->cnameoff); - if (st) { adns__query_fail(ads,qu,st); return; } - if (qu->cnameoff==-1) goto x_truncated; - /* 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 - * it contains the relevant info. - */ + if (rrtype == adns_r_cname && + (qu->typei->type & adns__rrt_typemask) != adns_r_cname) { + if (!qu->cname_str) { /* Ignore second and subsequent CNAMEs */ + qu->cname_begin= rdstart; + qu->cname_dgram= dgram; + qu->cname_dglen= dglen; + st= adns__parse_domain(ads,serv,&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->answer->cname= adns__savestring(qu); + if (!qu->answer->cname) return; + /* 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 + * it contains the relevant info. + */ + } else { + adns__debug(ads,serv,qu,"ignoring duplicate CNAME (%s, as well as %s)", + adns__diag_domain(ads,serv,&qu->vb,qu->flags, + dgram,dglen, rdstart,rdstart+rdlength), + qu->cname_str); + } } else if (rrtype == (qu->typei->type & adns__rrt_typemask)) { wantedrrs++; } else { - adns__debug(ads,serv,"ignoring answer RR with irrelevant type %d",rrtype); + adns__debug(ads,serv,qu,"ignoring answer RR with irrelevant type %d",rrtype); } } @@ -172,12 +192,14 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, foundsoa= 0; foundns= 0; for (rri= 0; rricnameoff != -1) { cname_recurse(ads,qu,0); return; } + if (qu->cname_dgram == dgram) { cname_recurse(ads,qu,0); return; } /* Bloody hell, I thought we asked for recursion ? */ + if (flg_rd) { + adns__diag(ads,serv,qu,"server thinks we didn't ask for recursive lookup"); + } if (!flg_ra) { - adns__diag(ads,serv,"server is not willing to do recursive lookups for us"); + adns__diag(ads,serv,qu,"server is not willing to do recursive lookups for us"); adns__query_fail(ads,qu,adns_s_norecurse); - return; + } 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__diag(ads,serv,"server claims to do recursion, but gave us a referral"); - adns__query_fail(ads,qu,adns_s_serverfaulty); return; } /* Now, we have some RRs which we wanted. */ - qu->rrsoff= adns__vbuf_malloc(&qu->ans,qu->typei->rrsz*wantedrrs); - if (qu->rrsoff == -1) adns__query_fail(ads,qu,adns_s_nolocalmem); + qu->ans->rrs= adns__alloc_interim(qu,qu->typei->rrsz*wantedrrs); + if (!qu->ans->rrs) return; cbyte= anstart; - currentrrs= 0; arstart= -1; 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); + } assert(!st); assert(rrtype != -1); if (rrclass != DNS_CLASS_IN || - rrtype != (qu->typei->type & adns__rrt_typemask)) + rrtype != (qu->typei->type & adns__rrt_typemask) || + !ownermatched) continue; - assert(currentrrstypei->get_fn(ads,qu,serv, dgram,dglen, &rdstart,rdstart+rdlength, - nsstart,arcount,&arstart, qu->rrsoff,¤trrs); + assert(qu->ans->nrrstypei->parse(ads,qu,serv, + dgram,dglen, &rdstart,rdstart+rdlength, + qu->ans->rrs.bytes+qu->ans->nrrs*quj->typei->rrsz); if (st) { adns__query_fail(ads,qu,st); return; } - if (currentrrs==-1) goto x_truncated; + if (rdstart==-1) goto x_truncated; } /* This may have generated some child queries ... */ @@ -240,18 +274,14 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, adns__query_finish(ads,qu,adns_s_ok); return; -x_truncated: + x_truncated: if (!flg_tc) { - adns__diag(ads,serv,"server sent datagram which points outside itself"); + adns__diag(ads,serv,qu,"server sent datagram which points outside itself"); adns__query_fail(ads,qu,adns_s_serverfaulty); return; } - if (qu->cnameoff != -1) { cname_recurse(ads,qu,adns_qf_usevc); return; } - qu->cnameoff= -1; - qu->rrsoff= -1; - ans= (adns_answer*)qu->ans.buf; - ans->nrrs= 0; - qu->ans.used= sizeof(adns_answer); + if (qu->cname_dgram) { cname_recurse(ads,qu,adns_qf_usevc); return; } + adns__reset_cnameonly(ads,qu); qu->flags |= adns_qf_usevc; adns__query_udp(ads,qu,now); }