query.c: Use a null `zone' pointer for `_submit_reverse' signalling.

[adns] / src / query.c

diff --git a/src/query.c b/src/query.c
index ff721855651fce6304ca7fc86eb398562c1c45f9..708120faf1855d1ee3c745e1c8f1395fad1c7390 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -105,29 +105,71 @@ static void query_submit(adns_state ads, adns_query qu,
   qu->query_dglen= qu->vb.used;
   memcpy(qu->query_dgram,qu->vb.buf,qu->vb.used);
 
-  if (flags & adns__qf_nosend)
-    ;
-  else if (typei->query_send && !(flags & adns__qf_senddirect))
-    typei->query_send(qu,now);
-  else
-    adns__query_send(qu, now);
+  if (typei->query_send) typei->query_send(qu,now);
+  else adns__query_send(qu, now);
+}
+
+adns_status adns__ckl_hostname(adns_state ads, adns_queryflags flags,
+                              union checklabel_state *css,
+                              qcontext *ctx, int labnum,
+                              const char *label, int lablen)
+{
+  int i, c;
+
+  if (flags & adns_qf_quoteok_query) return adns_s_ok;
+  for (i=0; i<lablen; i++) {
+    c= label[i];
+    if (c == '-') {
+      if (!i) return adns_s_querydomaininvalid;
+    } else if (!ctype_alpha(c) && !ctype_digit(c)) {
+      return adns_s_querydomaininvalid;
+    }
+  }
+  return adns_s_ok;
+}
+
+static adns_status check_domain_name(adns_state ads, adns_queryflags flags,
+                                    qcontext *ctx, const typeinfo *typei,
+                                    const byte *dgram, int dglen)
+{
+  findlabel_state fls;
+  adns_status err;
+  int labnum= 0, labstart, lablen;
+  union checklabel_state css;
+
+  adns__findlabel_start(&fls,ads, -1,0, dgram,dglen,dglen, DNS_HDRSIZE,0);
+  do {
+    err= adns__findlabel_next(&fls, &lablen,&labstart);
+    assert(!err); assert(lablen >= 0);
+    err= typei->checklabel(ads,flags, &css,ctx,
+                          labnum++, dgram+labstart,lablen);
+    if (err) return err;
+  } while (lablen);
+  return adns_s_ok;
 }
 
 adns_status adns__internal_submit(adns_state ads, adns_query *query_r,
                                  const typeinfo *typei, adns_rrtype type,
                                  vbuf *qumsg_vb, int id,
                                  adns_queryflags flags, struct timeval now,
-                                 const qcontext *ctx) {
+                                 qcontext *ctx) {
   adns_query qu;
+  adns_status err;
 
-  qu= query_alloc(ads,typei,type,flags & ~adns__qf_nosend,now);
-  if (!qu) { adns__vbuf_free(qumsg_vb); return adns_s_nomemory; }
+  err= check_domain_name(ads, flags,ctx,typei, qumsg_vb->buf,qumsg_vb->used);
+  if (err) goto x_err;
+  qu= query_alloc(ads,typei,type,flags,now);
+  if (!qu) { err = adns_s_nomemory; goto x_err; }
   *query_r= qu;
 
   memcpy(&qu->ctx,ctx,sizeof(qu->ctx));
   query_submit(ads,qu, typei,qumsg_vb,id,flags,now);
   
   return adns_s_ok;
+
+x_err:
+  adns__vbuf_free(qumsg_vb);
+  return err;
 }
 
 static void query_simple(adns_state ads, adns_query qu,
@@ -150,6 +192,9 @@ static void query_simple(adns_state ads, adns_query qu,
     }
   }
 
+  stat= check_domain_name(ads, flags,&qu->ctx,typei, qu->vb.buf,qu->vb.used);
+  if (stat) { adns__query_fail(qu,stat); return; }
+
   vb_new= qu->vb;
   adns__vbuf_init(&qu->vb);
   query_submit(ads,qu, typei,&vb_new,id, flags,now);
@@ -227,9 +272,6 @@ int adns_submit(adns_state ads,
 
   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;
 
@@ -283,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,
@@ -302,11 +342,11 @@ int adns_submit_reverse_any(adns_state ads,
   switch (addr->sa_family) {
     case AF_INET:
       ai = &adns__inet_afinfo;
-      if (zone == default_zone) zone = "in-addr.arpa";
+      if (!zone) zone = "in-addr.arpa";
       break;
     case AF_INET6:
       ai = &adns__inet6_afinfo;
-      if (zone == default_zone) zone = "ip6.arpa";
+      if (!zone) zone = "ip6.arpa";
       break;
     default:
       return ENOSYS;
@@ -338,8 +378,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,