X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/3540caec6116f7c66d43cabec178d5e622a10f76..3121b6a6a09b9ce77a5a8d6bb66e7bff8ff2e8b9:/src/query.c

diff --git a/src/query.c b/src/query.c
index 66682b4..cd04944 100644
--- a/src/query.c
+++ b/src/query.c
@@ -325,8 +325,6 @@ int adns_submit(adns_state ads,
   return r;
 }
 
-static const char *default_zone = "<magic>";
-
 int adns_submit_reverse_any(adns_state ads,
 			    const struct sockaddr *addr,
 			    const char *zone,
@@ -334,40 +332,15 @@ int adns_submit_reverse_any(adns_state ads,
 			    adns_queryflags flags,
 			    void *context,
 			    adns_query *query_r) {
-  char *buf, *buf_free, *p;
+  char *buf, *buf_free = 0;
   char shortbuf[100];
-  const afinfo *ai;
-  int r, lreq;
+  int r;
 
   flags &= ~adns_qf_search;
 
-  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) + ai->nrevcomp*(ai->revcompwd + 1) + 1;
-  if (lreq > sizeof(shortbuf)) {
-    buf= malloc(lreq);
-    if (!buf) return errno;
-    buf_free= buf;
-  } else {
-    buf= shortbuf;
-    buf_free= 0;
-  }
-
-  p = ai->rev_mkname(addr, buf);
-  *p++ = '.';
-  strcpy(p, 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;
@@ -380,8 +353,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;
-  return adns_submit_reverse_any(ads,addr,default_zone,
-				 type,flags,context,query_r);
+  return adns_submit_reverse_any(ads,addr,0,type,flags,context,query_r);
 }
 
 int adns_synchronous(adns_state ads,