src/types.c: Support multiple address families in adns_rr_addr lookups.

[adns] / src / query.c

diff --git a/src/query.c b/src/query.c
index d09702e3702f555d8fc1c85b1c8a129d911ce55a..31adfc4e29f0c2560479030350b7f9d2ab1fcb73 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -104,18 +104,21 @@ static void query_submit(adns_state ads, adns_query qu,
   qu->id= id;
   qu->query_dglen= qu->vb.used;
   memcpy(qu->query_dgram,qu->vb.buf,qu->vb.used);
   qu->id= id;
   qu->query_dglen= qu->vb.used;
   memcpy(qu->query_dgram,qu->vb.buf,qu->vb.used);

-  
-  adns__query_send(qu,now);
+
+  if (typei->query_send && !(qu->flags & adns__qf_senddirect))
+    typei->query_send(qu,now);
+  else
+    adns__query_send(qu, now);

 }
 
 adns_status adns__internal_submit(adns_state ads, adns_query *query_r,
 }
 
 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,
                                  const qcontext *ctx) {
   adns_query qu;
 
                                  adns_queryflags flags, struct timeval now,
                                  const qcontext *ctx) {
   adns_query qu;
 

-  qu= query_alloc(ads,typei,typei->typekey,flags,now);
+  qu= query_alloc(ads,typei,type,flags,now);

   if (!qu) { adns__vbuf_free(qumsg_vb); return adns_s_nomemory; }
   *query_r= qu;
 
   if (!qu) { adns__vbuf_free(qumsg_vb); return adns_s_nomemory; }
   *query_r= qu;
 


@@ -222,6 +225,9 @@ int adns_submit(adns_state ads,
 
   adns__consistency(ads,0,cc_entex);
 
 
   adns__consistency(ads,0,cc_entex);
 

+  if (!(type & adns__qtf_bigaddr) || !(type & adns__qtf_manyaf))
+    flags = (flags & ~adns__qf_afmask) | adns_qf_ipv4_only;
+

   typei= adns__findtype(type);
   if (!typei) return ENOSYS;
 
   typei= adns__findtype(type);
   if (!typei) return ENOSYS;
 


@@ -274,6 +280,8 @@ int adns_submit(adns_state ads,
   return r;
 }
 
   return r;
 }
 

+static const char *default_zone = "<magic>";
+

 int adns_submit_reverse_any(adns_state ads,
                            const struct sockaddr *addr,
                            const char *zone,
 int adns_submit_reverse_any(adns_state ads,
                            const struct sockaddr *addr,
                            const char *zone,


@@ -281,27 +289,39 @@ int adns_submit_reverse_any(adns_state ads,
                            adns_queryflags flags,
                            void *context,
                            adns_query *query_r) {
                            adns_queryflags flags,
                            void *context,
                            adns_query *query_r) {

-  const unsigned char *iaddr;
-  char *buf, *buf_free;
+  char *buf, *buf_free, *p;

   char shortbuf[100];
   char shortbuf[100];

+  const afinfo *ai;

   int r, lreq;
 
   flags &= ~adns_qf_search;
 
   int r, lreq;
 
   flags &= ~adns_qf_search;
 

-  if (addr->sa_family != AF_INET) return ENOSYS;
-  iaddr= (const unsigned char*)
-    &(((const struct sockaddr_in*)addr) -> sin_addr);
+  switch (addr->sa_family) {
+    case AF_INET:
+      ai = &adns__inet_afinfo;
+      if (zone == default_zone) zone = "in-addr.arpa";
+      break;
+    case AF_INET6:
+      ai = &adns__inet6_afinfo;
+      if (zone == default_zone) zone = "ip6.arpa";
+      break;
+    default:
+      return ENOSYS;
+  }

 
 

-  lreq= strlen(zone) + 4*4 + 1;
+  lreq= strlen(zone) + ai->nrevcomp*(ai->revcompwd + 1) + 1;

   if (lreq > sizeof(shortbuf)) {
   if (lreq > sizeof(shortbuf)) {

-    buf= malloc(strlen(zone) + 4*4 + 1);
+    buf= malloc(lreq);

     if (!buf) return errno;
     buf_free= buf;
   } else {
     buf= shortbuf;
     buf_free= 0;
   }
     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);
+
+  p = ai->rev_mkname(addr, buf);
+  *p++ = '.';
+  strcpy(p, zone);

 
   r= adns_submit(ads,buf,type,flags,context,query_r);
   free(buf_free);
 
   r= adns_submit(ads,buf,type,flags,context,query_r);
   free(buf_free);


@@ -315,7 +335,7 @@ int adns_submit_reverse(adns_state ads,
                        void *context,
                        adns_query *query_r) {
   if (type != adns_r_ptr && type != adns_r_ptr_raw) return EINVAL;
                        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",
+  return adns_submit_reverse_any(ads,addr,default_zone,

                                 type,flags,context,query_r);
 }
 
                                 type,flags,context,query_r);
 }
 


@@ -344,6 +364,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= 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));
 }
 
   return (byte*)an + MEM_ROUND(sizeof(*an));
 }
 


@@ -367,6 +388,18 @@ void *adns__alloc_preserved(adns_query qu, size_t sz) {
   return rv;
 }
 
   return rv;
 }
 

+void adns__free_interim(adns_query qu, void *p) {
+  allocnode *an;
+  size_t sz;
+
+  if (!p) return;
+  an = (allocnode *)((byte *)p - MEM_ROUND(sizeof(allocnode)));
+  sz = MEM_ROUND(an->sz);
+  LIST_UNLINK(qu->allocations, an);
+  free(an);
+  qu->interim_allocd -= sz;
+}
+

 void *adns__alloc_mine(adns_query qu, size_t sz) {
   return alloc_common(qu,MEM_ROUND(sz));
 }
 void *adns__alloc_mine(adns_query qu, size_t sz) {
   return alloc_common(qu,MEM_ROUND(sz));
 }


@@ -407,7 +440,7 @@ void *adns__alloc_final(adns_query qu, size_t sz) {
   return rp;
 }
 
   return rp;
 }
 

-static void cancel_children(adns_query qu) {
+void adns__cancel_children(adns_query qu) {

   adns_query cqu, ncqu;
 
   for (cqu= qu->children.head; cqu; cqu= ncqu) {
   adns_query cqu, ncqu;
 
   for (cqu= qu->children.head; cqu; cqu= ncqu) {


@@ -418,7 +451,7 @@ static void cancel_children(adns_query qu) {
 
 void adns__reset_preserved(adns_query qu) {
   assert(!qu->final_allocspace);
 
 void adns__reset_preserved(adns_query qu) {
   assert(!qu->final_allocspace);

-  cancel_children(qu);
+  adns__cancel_children(qu);

   qu->answer->nrrs= 0;
   qu->answer->rrs.untyped= 0;
   qu->interim_allocd= qu->preserved_allocd;
   qu->answer->nrrs= 0;
   qu->answer->rrs.untyped= 0;
   qu->interim_allocd= qu->preserved_allocd;


@@ -427,7 +460,7 @@ void adns__reset_preserved(adns_query qu) {
 static void free_query_allocs(adns_query qu) {
   allocnode *an, *ann;
 
 static void free_query_allocs(adns_query qu) {
   allocnode *an, *ann;
 

-  cancel_children(qu);
+  adns__cancel_children(qu);

   for (an= qu->allocations.head; an; an= ann) { ann= an->next; free(an); }
   LIST_INIT(qu->allocations);
   adns__vbuf_free(&qu->vb);
   for (an= qu->allocations.head; an; an= ann) { ann= an->next; free(an); }
   LIST_INIT(qu->allocations);
   adns__vbuf_free(&qu->vb);


@@ -515,7 +548,7 @@ void adns__query_done(adns_query qu) {
   adns_answer *ans;
   adns_query parent;
 
   adns_answer *ans;
   adns_query parent;
 

-  cancel_children(qu);
+  adns__cancel_children(qu);

 
   qu->id= -1;
   ans= qu->answer;
 
   qu->id= -1;
   ans= qu->answer;


@@ -528,7 +561,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,ans->rrsz)) {

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