X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/d8c062faeda8147546f1e709171f7f0767331954..636b69b1a03bec395d304c354f4f2f8121b97150:/src/reply.c

diff --git a/src/reply.c b/src/reply.c
index 96e43ed..4dec0e3 100644
--- a/src/reply.c
+++ b/src/reply.c
@@ -26,7 +26,7 @@
 #include "internal.h"
     
 void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
-		     int serv, struct timeval now) {
+		     int serv, int viatcp, 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;
@@ -89,6 +89,12 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
 	       dgram+DNS_HDRSIZE,
 	       qu->query_dglen-DNS_HDRSIZE))
       continue;
+    if (viatcp) {
+      if (qu->state != query_tcpsent) continue;
+    } else {
+      if (qu->state != query_tosend) continue;
+      if (!(qu->udpsent & (1<<serv))) continue;
+    }
     break;
   }
   if (!qu) {
@@ -161,7 +167,14 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
       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 */
+      } else if (qu->cname_dgram) { /* Ignore second and subsequent CNAME(s) */
+	adns__debug(ads,serv,qu,"ignoring duplicate CNAME (%s, as well as %s)",
+		    adns__diag_domain(ads,serv,qu, &qu->vb, dgram,dglen,rdstart),
+		    qu->answer->cname);
+      } else if (wantedrrs) { /* Ignore CNAME(s) after RR(s). */
+	adns__debug(ads,serv,qu,"ignoring CNAME (to %s) coexisting with RR",
+		    adns__diag_domain(ads,serv,qu, &qu->vb, dgram,dglen,rdstart));
+      } else {
 	qu->cname_begin= rdstart;
 	qu->cname_dglen= dglen;
 	st= adns__parse_domain(ads,serv,qu, &qu->vb,
@@ -184,10 +197,6 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
 	 * 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, &qu->vb, dgram,dglen,rdstart),
-		    qu->answer->cname);
       }
     } else if (rrtype == (qu->typei->type & adns__rrt_typemask)) {
       wantedrrs++;