src/: Track sizes of interim-allocated blocks.

[adns.git] / src / query.c

diff --git a/src/query.c b/src/query.c
index a3ce68d8051aa7c821af959c0cbf9e19e53ad378..c18ba8e991c3481f33057bf44145a6025a2d3605 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->rrsz= typei->rrsz;
+  qu->answer->rrsz= typei->getrrsz(typei,type);
 
   return qu;
 }
@@ -148,8 +148,8 @@ static adns_status check_domain_name(adns_state ads, adns_queryflags flags,
 }
 
 adns_status adns__internal_submit(adns_state ads, adns_query *query_r,
-                                 const typeinfo *typei, vbuf *qumsg_vb,
-                                 int id,
+                                 const typeinfo *typei, adns_rrtype type,
+                                 vbuf *qumsg_vb, int id,
                                  adns_queryflags flags, struct timeval now,
                                  qcontext *ctx) {
   adns_query qu;
@@ -157,7 +157,7 @@ adns_status adns__internal_submit(adns_state ads, adns_query *query_r,
 
   err= check_domain_name(ads, flags,ctx,typei, qumsg_vb->buf,qumsg_vb->used);
   if (err) goto x_err;
-  qu= query_alloc(ads,typei,typei->typekey,flags,now);
+  qu= query_alloc(ads,typei,type,flags,now);
   if (!qu) { err = adns_s_nomemory; goto x_err; }
   *query_r= qu;
 
@@ -331,28 +331,15 @@ int adns_submit_reverse_any(adns_state ads,
                            adns_queryflags flags,
                            void *context,
                            adns_query *query_r) {
-  const unsigned char *iaddr;
-  char *buf, *buf_free;
+  char *buf, *buf_free = 0;
   char shortbuf[100];
-  int r, lreq;
+  int r;
 
   flags &= ~adns_qf_search;
 
-  if (addr->sa_family != AF_INET) return ENOSYS;
-  iaddr= (const unsigned char*)
-    &(((const struct sockaddr_in*)addr) -> sin_addr);
-
-  lreq= strlen(zone) + 4*4 + 1;
-  if (lreq > sizeof(shortbuf)) {
-    buf= malloc(strlen(zone) + 4*4 + 1);
-    if (!buf) return errno;
-    buf_free= buf;
-  } else {
-    buf= shortbuf;
-    buf_free= 0;
-  }
-  sprintf(buf, "%d.%d.%d.%d.%s", iaddr[3], iaddr[2], iaddr[1], iaddr[0], zone);
-
+  buf = shortbuf;
+  r= adns__make_reverse_domain(addr,zone, &buf,sizeof(shortbuf),&buf_free);
+  if (r) return r;
   r= adns_submit(ads,buf,type,flags,context,query_r);
   free(buf_free);
   return r;
@@ -364,9 +351,10 @@ int adns_submit_reverse(adns_state ads,
                        adns_queryflags flags,
                        void *context,
                        adns_query *query_r) {
-  if (type != adns_r_ptr && type != adns_r_ptr_raw) return EINVAL;
-  return adns_submit_reverse_any(ads,addr,"in-addr.arpa",
-                                type,flags,context,query_r);
+  if (((type^adns_r_ptr) & adns_rrt_reprmask) &&
+      ((type^adns_r_ptr_raw) & adns_rrt_reprmask))
+    return EINVAL;
+  return adns_submit_reverse_any(ads,addr,0,type,flags,context,query_r);
 }
 
 int adns_synchronous(adns_state ads,
@@ -394,6 +382,7 @@ static void *alloc_common(adns_query qu, size_t sz) {
   an= malloc(MEM_ROUND(MEM_ROUND(sizeof(*an)) + sz));
   if (!an) return 0;
   LIST_LINK_TAIL(qu->allocations,an);
+  an->sz= sz;
   return (byte*)an + MEM_ROUND(sizeof(*an));
 }
 
@@ -417,16 +406,24 @@ void *adns__alloc_preserved(adns_query qu, size_t sz) {
   return rv;
 }
 
+static allocnode *alloc_info(adns_query qu, void *p, size_t *sz_r) {
+  allocnode *an;
+
+  if (!p || p == qu) { *sz_r= 0; return 0; }
+  an= (allocnode *)((byte *)p - MEM_ROUND(sizeof(allocnode)));
+  *sz_r= MEM_ROUND(an->sz);
+  return an;
+}
+
 void *adns__alloc_mine(adns_query qu, size_t sz) {
   return alloc_common(qu,MEM_ROUND(sz));
 }
 
-void adns__transfer_interim(adns_query from, adns_query to,
-                           void *block, size_t sz) {
-  allocnode *an;
+void adns__transfer_interim(adns_query from, adns_query to, void *block) {
+  size_t sz;
+  allocnode *an= alloc_info(from, block, &sz);
 
-  if (!block) return;
-  an= (void*)((byte*)block - MEM_ROUND(sizeof(*an)));
+  if (!an) return;
 
   assert(!to->final_allocspace);
   assert(!from->final_allocspace);
@@ -434,7 +431,6 @@ void adns__transfer_interim(adns_query from, adns_query to,
   LIST_UNLINK(from->allocations,an);
   LIST_LINK_TAIL(to->allocations,an);
 
-  sz= MEM_ROUND(sz);
   from->interim_allocd -= sz;
   to->interim_allocd += sz;
 
@@ -578,7 +574,7 @@ void adns__query_done(adns_query qu) {
   }
 
   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;
     }
@@ -589,7 +585,8 @@ void adns__query_done(adns_query qu) {
                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;