Compiles and links.

[adns] / src / query.c

diff --git a/src/query.c b/src/query.c
index f8feef7dae6c82171edd0d332ed6b93747459837..1d4dc5fd94df3753d7e9107a5630763482e6bf44 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -73,12 +73,17 @@ int adns__internal_submit(adns_state ads, adns_query *query_r,
   
   *query_r= qu;
 
   
   *query_r= qu;
 

-  qu->query_dgram= malloc(qumsg_vb->used);
-  if (!qu->query_dgram) {
-    adns__query_fail(qu,adns_s_nolocalmem);
-    return adns_s_ok;
+  qu->query_dglen= qumsg_vb->used;
+  if (qumsg_vb->used) {
+    qu->query_dgram= malloc(qumsg_vb->used);
+    if (!qu->query_dgram) {
+      adns__query_fail(qu,adns_s_nolocalmem);
+      return adns_s_ok;
+    }
+    memcpy(qu->query_dgram,qumsg_vb->buf,qumsg_vb->used);
+  } else {
+    qu->query_dgram= 0;

   }
   }

-  memcpy(qu->query_dgram,qumsg_vb->buf,qumsg_vb->used);

   qu->vb= *qumsg_vb;
   adns__vbuf_init(qumsg_vb);
   
   qu->vb= *qumsg_vb;
   adns__vbuf_init(qumsg_vb);
   


@@ -153,22 +158,31 @@ void adns_cancel(adns_query query) {
   abort(); /* fixme */
 }
 
   abort(); /* fixme */
 }
 

-void *adns__alloc_interim(adns_query qu, size_t sz) {
+static void *alloc_common(adns_query qu, size_t sz) {

   allocnode *an;
 
   allocnode *an;
 

+  if (!sz) return qu; /* Any old pointer will do */

   assert(!qu->final_allocspace);
   assert(!qu->final_allocspace);

-  sz= MEM_ROUND(sz);

   an= malloc(MEM_ROUND(MEM_ROUND(sizeof(*an)) + sz));
   if (!an) {
     adns__query_fail(qu,adns_s_nolocalmem);
     return 0;
   }
   an= malloc(MEM_ROUND(MEM_ROUND(sizeof(*an)) + sz));
   if (!an) {
     adns__query_fail(qu,adns_s_nolocalmem);
     return 0;
   }

-  qu->interim_allocd += sz;

   an->next= qu->allocations;
   qu->allocations= an;
   return (byte*)an + MEM_ROUND(sizeof(*an));
 }
 
   an->next= qu->allocations;
   qu->allocations= an;
   return (byte*)an + MEM_ROUND(sizeof(*an));
 }
 

+void *adns__alloc_interim(adns_query qu, size_t sz) {
+  sz= MEM_ROUND(sz);
+  qu->interim_allocd += sz;
+  return alloc_common(qu,sz);
+}
+
+void *adns__alloc_mine(adns_query qu, size_t sz) {
+  return alloc_common(qu,MEM_ROUND(sz));
+}
+

 void *adns__alloc_final(adns_query qu, size_t sz) {
   /* When we're in the _final stage, we _subtract_ from interim_alloc'd
    * each allocation, and use final_allocspace to point to the next free
 void *adns__alloc_final(adns_query qu, size_t sz) {
   /* When we're in the _final stage, we _subtract_ from interim_alloc'd
    * each allocation, and use final_allocspace to point to the next free