src/: Fix internals to carry around address families.

[adns] / src / query.c

diff --git a/src/query.c b/src/query.c
index 541d8ac35d11fc40d69e6195bf41079b2962f5db..717cac0d3c7418b3e751c04d65b4dfba29de09f5 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -83,7 +83,7 @@ static adns_query query_alloc(adns_state ads,
   qu->answer->expires= -1;
   qu->answer->nrrs= 0;
   qu->answer->rrs.untyped= 0;
   qu->answer->expires= -1;
   qu->answer->nrrs= 0;
   qu->answer->rrs.untyped= 0;

-  qu->answer->rrsz= typei->rrsz;
+  qu->answer->rrsz= typei->getrrsz(typei,type);

 
   return qu;
 }
 
   return qu;
 }


@@ -580,7 +580,7 @@ void adns__query_done(adns_query qu) {
   }
 
   if (ans->nrrs && qu->typei->diff_needswap) {
   }
 
   if (ans->nrrs && qu->typei->diff_needswap) {

-    if (!adns__vbuf_ensure(&qu->vb,qu->typei->rrsz)) {
+    if (!adns__vbuf_ensure(&qu->vb,qu->answer->rrsz)) {

       adns__query_fail(qu,adns_s_nomemory);
       return;
     }
       adns__query_fail(qu,adns_s_nomemory);
       return;
     }


@@ -591,7 +591,8 @@ void adns__query_done(adns_query qu) {
                qu->ads);
   }
   if (ans->nrrs && qu->typei->postsort) {
                qu->ads);
   }
   if (ans->nrrs && qu->typei->postsort) {

-    qu->typei->postsort(qu->ads, ans->rrs.bytes, ans->nrrs, qu->typei);
+    qu->typei->postsort(qu->ads, ans->rrs.bytes,
+                       ans->nrrs,ans->rrsz, qu->typei);

   }
 
   ans->expires= qu->expires;
   }
 
   ans->expires= qu->expires;