_Submits_ but does not use the results from internally-generated queries.

[adns.git] / src / reply.c

diff --git a/src/reply.c b/src/reply.c
index 3b46e21358490b5fbfd37e2bac03be697e0db9f0..9d11607871b6acec51ae2ec6884c8d68a0170c3e 100644 (file)
--- 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 (dglen<DNS_HDRSIZE) {
     adns__diag(ads,serv,0,"received datagram too short for message header (%d)",dglen);
@@ -99,6 +100,7 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
     return;
   }
   anstart= qu->query_dglen;
+  arstart= -1;
 
   LIST_UNLINK(ads->timew,qu);
   /* We're definitely going to do something with this query now */
@@ -256,18 +258,19 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
 
   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; rri<ancount; rri++) {
+
+  pai.ads= qu->ads;
+  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; rri<ancount; rri++) {
     st= adns__findrr(qu,serv, dgram,dglen,&cbyte,
                     &rrtype,&rrclass,&rdlength,&rdstart,
                     &ownermatched);
@@ -276,24 +279,9 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
        rrtype != (qu->typei->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);