X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Freply.c;h=2691f679d31cce4ac4b77be2ec8a05bea1e75f95;hb=0f15dd7b03058cb07e55d36ab36029081d556ffc;hp=246d52d44fe0a796018b0b15666be9710909fbe6;hpb=f7f83b4a88b5168130a7bb9cb3d3811eb8c1c260;p=adns.git diff --git a/src/reply.c b/src/reply.c index 246d52d..2691f67 100644 --- a/src/reply.c +++ b/src/reply.c @@ -4,11 +4,11 @@ */ /* * This file is - * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1997-2000 Ian Jackson * * It is part of adns, which is - * Copyright (C) 1997-1999 Ian Jackson - * Copyright (C) 1999 Tony Finch + * Copyright (C) 1997-2000 Ian Jackson + * Copyright (C) 1999-2000 Tony Finch * * 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 @@ -77,71 +77,84 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, adns__diag(ads,serv,0,"server sent us unknown opcode %d (wanted 0=QUERY)",opcode); return; } - if (!qdcount) { - adns__diag(ads,serv,0,"server sent reply without quoting our question"); - return; - } else if (qdcount>1) { - adns__diag(ads,serv,0,"server claimed to answer %d questions with one message", - qdcount); - return; - } - for (qu= viatcp ? ads->tcpw.head : ads->udpw.head; qu; qu= nqu) { - nqu= qu->next; - if (qu->id != id) continue; - if (dglen < qu->query_dglen) continue; - if (memcmp(qu->query_dgram+DNS_HDRSIZE, - dgram+DNS_HDRSIZE, - qu->query_dglen-DNS_HDRSIZE)) - continue; - if (viatcp) { - assert(qu->state == query_tcpw); - } else { - assert(qu->state == query_tosend); - if (!(qu->udpsent & (1<tcpw.head : ads->udpw.head; qu; qu= nqu) { + nqu= qu->next; + if (qu->id != id) continue; + if (dglen < qu->query_dglen) continue; + if (memcmp(qu->query_dgram+DNS_HDRSIZE, + dgram+DNS_HDRSIZE, + qu->query_dglen-DNS_HDRSIZE)) + continue; + if (viatcp) { + assert(qu->state == query_tcpw); + } else { + assert(qu->state == query_tosend); + if (!(qu->udpsent & (1<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,dgram,dglen,DNS_HDRSIZE)); - adns__vbuf_free(&tempvb); + if (qu) { + /* We're definitely going to do something with this query now */ + if (viatcp) LIST_UNLINK(ads->tcpw,qu); + else LIST_UNLINK(ads->udpw,qu); } - return; } - anstart= qu->query_dglen; - arstart= -1; - - if (viatcp) LIST_UNLINK(ads->tcpw,qu); - else LIST_UNLINK(ads->udpw,qu); - /* We're definitely going to do something with this query now */ + /* If we're going to ignore the packet, we return as soon as we have + * failed the query (if any) and printed the warning message (if + * any). + */ switch (rcode) { case rcode_noerror: case rcode_nxdomain: break; case rcode_formaterror: adns__warn(ads,serv,qu,"server cannot understand our query (Format Error)"); - adns__query_fail(qu,adns_s_rcodeformaterror); + if (qu) adns__query_fail(qu,adns_s_rcodeformaterror); return; case rcode_servfail: - adns__query_fail(qu,adns_s_rcodeservfail); + if (qu) adns__query_fail(qu,adns_s_rcodeservfail); + else adns__debug(ads,serv,qu,"server failure on unidentifiable query"); return; case rcode_notimp: adns__warn(ads,serv,qu,"server claims not to implement our query"); - adns__query_fail(qu,adns_s_rcodenotimplemented); + if (qu) 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_rcoderefused); + adns__debug(ads,serv,qu,"server refused our query"); + if (qu) 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_rcodeunknown); + if (qu) adns__query_fail(qu,adns_s_rcodeunknown); + return; + } + + if (!qu) { + if (!qdcount) { + adns__diag(ads,serv,0,"server sent reply without quoting our question"); + } else if (qdcount>1) { + adns__diag(ads,serv,0,"server claimed to answer %d questions with one message", + qdcount); + } else 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,dgram,dglen,DNS_HDRSIZE)); + adns__vbuf_free(&tempvb); + } return; } + /* We're definitely going to do something with this packet and this query now. */ + + anstart= qu->query_dglen; + arstart= -1; + /* Now, take a look at the answer section, and see if it is complete. * If it has any CNAMEs we stuff them in the answer. */ @@ -185,7 +198,8 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, qu->cname_begin= rdstart; qu->cname_dglen= dglen; st= adns__parse_domain(ads,serv,qu, &qu->vb, - qu->flags & adns_qf_quoteok_cname ? pdf_quoteok : 0, + qu->flags & adns_qf_quotefail_cname + ? 0 : pdf_quoteok, dgram,dglen, &rdstart,rdstart+rdlength); if (!qu->vb.used) goto x_truncated; if (st) { adns__query_fail(qu,st); return; } @@ -244,7 +258,7 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, /* We still wanted to look for the SOA so we could find the TTL. */ adns__update_expires(qu,soattl,now); - if (qu->flags & adns_qf_search) { + if (qu->flags & adns_qf_search && !qu->cname_dgram) { adns__search_next(ads,qu,now); } else { adns__query_fail(qu,adns_s_nxdomain); @@ -267,14 +281,14 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, if (cname_here) goto x_restartquery; /* 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,qu,"server is not willing to do recursive lookups for us"); adns__query_fail(qu,adns_s_norecurse); } else { - adns__diag(ads,serv,qu,"server claims to do recursion, but gave us a referral"); + if (!flg_rd) + adns__diag(ads,serv,qu,"server thinks we didn't ask for recursive lookup"); + else + adns__debug(ads,serv,qu,"server claims to do recursion, but gave us a referral"); adns__query_fail(qu,adns_s_invalidresponse); } return;