X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/ac5a2748da336f9644c5d31f32324d0367c6ad77..f7b93d15be71e4f18ae53763f93553a2e8ac0a45:/src/types.c

diff --git a/src/types.c b/src/types.c
index cc9f312..f4a2539 100644
--- a/src/types.c
+++ b/src/types.c
@@ -517,6 +517,8 @@ static adns_status pap_hostaddr(const parseinfo *pai, int *cbyte_io,
   if (!(pai->qu->flags & adns_qf_cname_loose)) nflags |= adns_qf_cname_forbid;
   
   st= adns__internal_submit(pai->ads, &nqu, adns__findtype(adns_r_addr),
+			    ((adns_r_addr & adns_rrt_reprmask) |
+			     (pai->qu->answer->type & ~adns_rrt_reprmask)),
 			    &pai->qu->vb, id, nflags, pai->now, &ctx);
   if (st) return st;
 
@@ -791,8 +793,8 @@ static adns_status pa_ptr(const parseinfo *pai, int dmstart,
   memset(&ctx.pinfo,0,sizeof(ctx.pinfo));
   memset(&ctx.tinfo,0,sizeof(ctx.tinfo));
   st= adns__internal_submit(pai->ads, &nqu, adns__findtype(adns_r_a),
-			    &pai->qu->vb, id,
-			    adns_qf_quoteok_query, pai->now, &ctx);
+			    adns_r_a, &pai->qu->vb, id, adns_qf_quoteok_query,
+			    pai->now, &ctx);
   if (st) return st;
 
   nqu->parent= pai->qu;
@@ -1098,12 +1100,12 @@ static adns_status cs_srvha(vbuf *vb, const void *datap) {
   return csp_hostaddr(vb,&rrp->ha);
 }
 
-static void postsort_srv(adns_state ads, void *array, int nrrs,
+static void postsort_srv(adns_state ads, void *array, int nrrs,int rrsz,
 			 const struct typeinfo *typei) {
   /* we treat everything in the array as if it were an adns_rr_srvha
    * even though the array might be of adns_rr_srvraw.  That's OK
    * because they have the same prefix, which is all we access.
-   * We use typei->rrsz, too, rather than naive array indexing, of course.
+   * We use rrsz, too, rather than naive array indexing, of course.
    */
   char *workbegin, *workend, *search, *arrayend;
   const adns_rr_srvha *rr;
@@ -1111,14 +1113,15 @@ static void postsort_srv(adns_state ads, void *array, int nrrs,
   int cpriority, totalweight, runtotal;
   long randval;
 
-  for (workbegin= array, arrayend= workbegin + typei->rrsz * nrrs;
+  assert(rrsz <= sizeof(rrtmp));
+  for (workbegin= array, arrayend= workbegin + rrsz * nrrs;
        workbegin < arrayend;
        workbegin= workend) {
     cpriority= (rr=(void*)workbegin)->priority;
     
     for (workend= workbegin, totalweight= 0;
 	 workend < arrayend && (rr=(void*)workend)->priority == cpriority;
-	 workend += typei->rrsz) {
+	 workend += rrsz) {
       totalweight += rr->weight;
     }
 
@@ -1129,8 +1132,8 @@ static void postsort_srv(adns_state ads, void *array, int nrrs,
      * workbegin (swapping with the one that was there, and then
      * advance workbegin. */
     for (;
-	 workbegin + typei->rrsz < workend; /* don't bother if just one */
-	 workbegin += typei->rrsz) {
+	 workbegin + rrsz < workend; /* don't bother if just one */
+	 workbegin += rrsz) {
       
       randval= nrand48(ads->rand48xsubi);
       randval %= (totalweight + 1);
@@ -1142,13 +1145,13 @@ static void postsort_srv(adns_state ads, void *array, int nrrs,
 
       for (search=workbegin, runtotal=0;
 	   (runtotal += (rr=(void*)search)->weight) < randval;
-	   search += typei->rrsz);
+	   search += rrsz);
       assert(search < arrayend);
       totalweight -= rr->weight;
       if (search != workbegin) {
-	memcpy(&rrtmp, workbegin, typei->rrsz);
-	memcpy(workbegin, search, typei->rrsz);
-	memcpy(search, &rrtmp, typei->rrsz);
+	memcpy(&rrtmp, workbegin, rrsz);
+	memcpy(workbegin, search, rrsz);
+	memcpy(search, &rrtmp, rrsz);
       }
     }
   }
@@ -1222,13 +1225,13 @@ static void mf_flat(adns_query qu, void *data) { }
 #define TYPESZ_M(member)           (sizeof(*((adns_answer*)0)->rrs.member))
 
 #define DEEP_TYPE(code,rrt,fmt,memb,parser,comparer,/*printer*/...)	\
- { adns_r_##code, rrt,fmt,TYPESZ_M(memb), mf_##memb,			\
+ { adns_r_##code&adns_rrt_reprmask, rrt,fmt,TYPESZ_M(memb), mf_##memb,	\
      GLUE(cs_, CAR(__VA_ARGS__)),pa_##parser,di_##comparer,		\
-     adns__ckl_hostname, CDR(__VA_ARGS__) }
+     adns__ckl_hostname, 0, adns__getrrsz_default, CDR(__VA_ARGS__) }
 #define FLAT_TYPE(code,rrt,fmt,memb,parser,comparer,/*printer*/...)	\
- { adns_r_##code, rrt,fmt,TYPESZ_M(memb), mf_flat,			\
+ { adns_r_##code&adns_rrt_reprmask, rrt,fmt,TYPESZ_M(memb), mf_flat,	\
      GLUE(cs_, CAR(__VA_ARGS__)),pa_##parser,di_##comparer,		\
-     adns__ckl_hostname, CDR(__VA_ARGS__) }
+     adns__ckl_hostname, 0, adns__getrrsz_default, CDR(__VA_ARGS__) }
 
 #define di_0 0
 
@@ -1267,6 +1270,7 @@ const typeinfo *adns__findtype(adns_rrtype type) {
   const typeinfo *begin, *end, *mid;
 
   if (type & adns_r_unknown) return &typeinfo_unknown;
+  type &= adns_rrt_reprmask;
 
   begin= typeinfos;  end= typeinfos+(sizeof(typeinfos)/sizeof(typeinfo));