further wip on SRV - need per-type functions now including postsort

diff --git a/src/adns.h b/src/adns.h
index 8b6b345d41b8ea61754db05872e3aa021e748967..49d34613d0748ad95e3c2437954d2b00dbd6f206 100644 (file)
--- a/src/adns.h
+++ b/src/adns.h
@@ -315,7 +315,7 @@ typedef struct {
 typedef struct {
   int priority, weight, port;
   adns_rr_hostaddr ha;
 typedef struct {
   int priority, weight, port;
   adns_rr_hostaddr ha;

-} adns_rr_srvaddr;
+} adns_rr_srvhostaddr;

 
 typedef struct {
   adns_status status;
 
 typedef struct {
   adns_status status;


@@ -338,7 +338,7 @@ typedef struct {
     adns_rr_intstr *intstr;          /* mx_raw */
     adns_rr_soa *soa;                /* soa, soa_raw */
     adns_rr_srvraw *srvraw;          /* srv_raw */
     adns_rr_intstr *intstr;          /* mx_raw */
     adns_rr_soa *soa;                /* soa, soa_raw */
     adns_rr_srvraw *srvraw;          /* srv_raw */

-    adns_rr_srvaddr *srvaddr;        /* srv */
+    adns_rr_srvhostaddr *srvhostaddr;/* srv */

   } rrs;
 } adns_answer;
 
   } rrs;
 } adns_answer;
 

diff --git a/src/internal.h b/src/internal.h
index 95e5276bc65a0ca9a068dc2fac010334c67e2d16..555922934df56f055d4d676ffed711b66317bc36 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -113,7 +113,7 @@ typedef struct {
   struct timeval now;
 } parseinfo;
 
   struct timeval now;
 } parseinfo;
 

-typedef struct {
+typedef struct typeinfo {

   adns_rrtype type;
   const char *rrtname;
   const char *fmtname;
   adns_rrtype type;
   const char *rrtname;
   const char *fmtname;


@@ -147,8 +147,34 @@ typedef struct {
   /* Returns !0 if RR a should be strictly after RR b in the sort order,
    * 0 otherwise.  Must not fail.
    */
   /* Returns !0 if RR a should be strictly after RR b in the sort order,
    * 0 otherwise.  Must not fail.
    */

+
+  adns_status (*qdparselabel)(adns_state ads,
+                             const char **p_io, const char *pe, int labelnum,
+                             char label_r[DNS_MAXDOMAIN], int *ll_io,
+                             adns_queryflags flags,
+                             const struct typeinfo *typei);
+  /* Parses one label from the query domain string.  On entry, *p_io
+   * points to the next character to parse and *ll_io is the size of
+   * the buffer.  pe points just after the end of the query domain
+   * string.  On successful return, label_r[] and *ll_io are filled in
+   * and *p_io points to *pe or just after the label-ending `.'.  */
+
+  void (*postsort)(adns_state ads, void *array, int nobjs,
+                  const struct typeinfo *typei);
+  /* Called immediately after the RRs have been sorted, and may rearrange
+   * them.  (This is really for the benefit of SRV's bizarre weighting
+   * stuff.)  May be 0 to mean nothing needs to be done.
+   */

 } typeinfo;
 
 } typeinfo;
 

+adns_status adns__qdpl_normal(adns_state ads,
+                             const char **p_io, const char *pe, int labelnum,
+                             char label_r[], int *ll_io,
+                             adns_queryflags flags,
+                             const typeinfo *typei);
+  /* implemented in transmit.c, used by types.c as default
+   * and as part of implementation for some fancier types */
+

 typedef struct allocnode {
   struct allocnode *next, *back;
 } allocnode;
 typedef struct allocnode {
   struct allocnode *next, *back;
 } allocnode;

diff --git a/src/query.c b/src/query.c
index 3c98040ace1ef57d02910a18259db0f6f5a90dc8..0b62ff6227d60d95cb79519fbce45cd1b2230f60 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -537,6 +537,9 @@ void adns__query_done(adns_query qu) {
                  qu->typei->diff_needswap,
                qu->ads);
   }
                  qu->typei->diff_needswap,
                qu->ads);
   }

+  if (ans->nrrs && qu->typei->postsort) {
+    qu->typei->postsort(qu->ads, ans->rrs.bytes, ans->nrrs, qu->typei);
+  }

 
   ans->expires= qu->expires;
   parent= qu->parent;
 
   ans->expires= qu->expires;
   parent= qu->parent;

diff --git a/src/transmit.c b/src/transmit.c
index b0a0cdde76f314da6b0107aea16aed515e3db2b8..6136bf9b6e981b85b9088d279a866cec9fe4cde1 100644 (file)
--- a/src/transmit.c
+++ b/src/transmit.c
@@ -75,11 +75,56 @@ static adns_status mkquery_footer(vbuf *vb, adns_rrtype type) {
   return adns_s_ok;
 }
 
   return adns_s_ok;
 }
 

+adns_status adns__qdpl_normal(adns_state ads,
+                             const char **p_io, const char *pe, int labelnum,
+                             char label_r[], int *ll_io,
+                             adns_queryflags flags,
+                             const typeinfo *typei) {
+  int ll, c;
+  const char *p;
+
+  ll= 0;
+  p= *p_io;
+  
+  while (p!=pe && (c= *p++)!='.') {
+    if (c=='\\') {
+      if (!(flags & adns_qf_quoteok_query)) return adns_s_querydomaininvalid;
+      if (ctype_digit(p[0])) {
+       if (p+1==pe || p+2==pe) return adns_s_querydomaininvalid;
+       if (ctype_digit(p[1]) && ctype_digit(p[2])) {
+         c= (*p++ - '0')*100;
+         c += (*p++ - '0')*10;
+         c += (*p++ - '0');
+         if (c >= 256) return adns_s_querydomaininvalid;
+       } else {
+         return adns_s_querydomaininvalid;
+       }
+      } else if (!(c= *p++)) {
+       return adns_s_querydomaininvalid;
+      }
+    }
+    if (!(flags & adns_qf_quoteok_query)) {
+      if (c == '-') {
+       if (!ll) return adns_s_querydomaininvalid;
+      } else if (!ctype_alpha(c) && !ctype_digit(c)) {
+       return adns_s_querydomaininvalid;
+      }
+    }
+    if (ll == *ll_io) return adns_s_querydomaininvalid;
+    label_r[ll++]= c;
+  }
+  
+  *p_io= p;
+  *ll_io= ll;
+  return adns_s_ok;
+}
+

 adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
                          const char *owner, int ol,
                          const typeinfo *typei, adns_queryflags flags) {
 adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
                          const char *owner, int ol,
                          const typeinfo *typei, adns_queryflags flags) {

-  int ll, c, nbytes;
-  byte label[255], *rqp;
+  int labelnum, ll, nbytes;
+  byte label[255];
+  byte *rqp;

   const char *p, *pe;
   adns_status st;
 
   const char *p, *pe;
   adns_status st;
 


@@ -89,34 +134,11 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
 
   p= owner; pe= owner+ol;
   nbytes= 0;
 
   p= owner; pe= owner+ol;
   nbytes= 0;

+  labelnum= 0;

   while (p!=pe) {
   while (p!=pe) {

-    ll= 0;
-    while (p!=pe && (c= *p++)!='.') {
-      if (c=='\\') {
-       if (!(flags & adns_qf_quoteok_query)) return adns_s_querydomaininvalid;
-       if (ctype_digit(p[0])) {
-         if (ctype_digit(p[1]) && ctype_digit(p[2])) {
-           c= (*p++ - '0')*100;
-           c += (*p++ - '0')*10;
-           c += (*p++ - '0');
-           if (c >= 256) return adns_s_querydomaininvalid;
-         } else {
-           return adns_s_querydomaininvalid;
-         }
-       } else if (!(c= *p++)) {
-         return adns_s_querydomaininvalid;
-       }
-      }
-      if (!(flags & adns_qf_quoteok_query)) {
-       if (c == '-') {
-         if (!ll) return adns_s_querydomaininvalid;
-       } else if (!ctype_alpha(c) && !ctype_digit(c)) {
-         return adns_s_querydomaininvalid;
-       }
-      }
-      if (ll == sizeof(label)) return adns_s_querydomaininvalid;
-      label[ll++]= c;
-    }
+    ll= sizeof(label);
+    st= typei->qdparselabel(ads, &p,pe, labelnum++, label, &ll, flags, typei);
+    if (st) return st;

     if (!ll) return adns_s_querydomaininvalid;
     if (ll > DNS_MAXLABEL) return adns_s_querydomaintoolong;
     nbytes+= ll+1;
     if (!ll) return adns_s_querydomaininvalid;
     if (ll > DNS_MAXLABEL) return adns_s_querydomaintoolong;
     nbytes+= ll+1;

diff --git a/src/types.c b/src/types.c
index d62bbb5cd49b487b55df857412fc1e2eae251390..9130a3dac42269779d67cfc5c47e3b721cf27e01 100644 (file)
--- a/src/types.c
+++ b/src/types.c
@@ -1000,6 +1000,39 @@ static adns_status cs_soa(vbuf *vb, const void *datap) {
   return adns_s_ok;
 }
 
   return adns_s_ok;
 }
 

+/*
+ * _srv*  (pa*2,di,cs*2,qdpl,postsort)
+ */
+
+static adns_status qdpl_srv(adns_state ads,
+                           const char **p_io, const char *pe, int labelnum,
+                           char label_r[DNS_MAXDOMAIN], int *ll_io,
+                           adns_queryflags flags,
+                           const typeinfo *typei) {
+  int useflags;
+  const char *p_orig;
+  adns_status st;
+
+  if (labelnum < 2 && !(flags & adns_qf_quoteok_query)) {
+    useflags= adns_qf_quoteok_query;
+    p_orig= *p_io;
+  } else {
+    useflags= flags;
+    p_orig= 0;
+  }
+  st= adns__qdpl_normal(ads, p_io,pe, labelnum,label_r, ll_io, useflags,typei);
+  if (st) return st;
+
+  if (p_orig) {
+    int ll= *ll_io;
+    if (!ll || label_r[0]!='_')
+      return adns_s_querydomaininvalid;
+    if (memchr(p_orig+1, '\\', pe - (p_orig+1)))
+      return adns_s_querydomaininvalid;
+  }
+  return adns_s_ok;
+}
+

 /*
  * _flat   (mf)
  */
 /*
  * _flat   (mf)
  */


@@ -1015,10 +1048,15 @@ static void mf_flat(adns_query qu, void *data) { }
 #define DEEP_MEMB(memb) TYPESZ_M(memb), mf_##memb, cs_##memb
 #define FLAT_MEMB(memb) TYPESZ_M(memb), mf_flat, cs_##memb
 
 #define DEEP_MEMB(memb) TYPESZ_M(memb), mf_##memb, cs_##memb
 #define FLAT_MEMB(memb) TYPESZ_M(memb), mf_flat, cs_##memb
 

-#define DEEP_TYPE(code,rrt,fmt,memb,parser,comparer,printer) \
- { adns_r_##code, rrt,fmt,TYPESZ_M(memb), mf_##memb, printer,parser,comparer }
-#define FLAT_TYPE(code,rrt,fmt,memb,parser,comparer,printer) \
- { adns_r_##code, rrt,fmt,TYPESZ_M(memb), mf_flat,   printer,parser,comparer }
+#define DEEP_TYPE(code,rrt,fmt,memb,parser,comparer,printer)   \
+ { adns_r_##code, rrt,fmt,TYPESZ_M(memb), mf_##memb,           \
+      printer,parser,comparer, adns__qdpl_normal,0 }
+#define FLAT_TYPE(code,rrt,fmt,memb,parser,comparer,printer)   \
+ { adns_r_##code, rrt,fmt,TYPESZ_M(memb), mf_flat,             \
+     printer,parser,comparer, adns__qdpl_normal,0 }
+#define XTRA_TYPE(code,rrt,fmt,memb,parser,comparer,printer,qdpl,postsort) \
+ { adns_r_##code, rrt,fmt,TYPESZ_M(memb), mf_##memb,                      \
+    printer,parser,comparer,qdpl,postsort }

 
 static const typeinfo typeinfos[] = {
 /* Must be in ascending order of rrtype ! */
 
 static const typeinfo typeinfos[] = {
 /* Must be in ascending order of rrtype ! */


@@ -1033,12 +1071,20 @@ DEEP_TYPE(hinfo,  "HINFO", 0, intstrpair,pa_hinfo,   0,        cs_hinfo      ),
 DEEP_TYPE(mx_raw, "MX",   "raw",intstr,  pa_mx_raw,  di_mx_raw,cs_inthost    ),
 DEEP_TYPE(txt,    "TXT",   0,   manyistr,pa_txt,     0,        cs_txt        ),
 DEEP_TYPE(rp_raw, "RP",   "raw",strpair, pa_rp,      0,        cs_rp         ),
 DEEP_TYPE(mx_raw, "MX",   "raw",intstr,  pa_mx_raw,  di_mx_raw,cs_inthost    ),
 DEEP_TYPE(txt,    "TXT",   0,   manyistr,pa_txt,     0,        cs_txt        ),
 DEEP_TYPE(rp_raw, "RP",   "raw",strpair, pa_rp,      0,        cs_rp         ),

+#if 0
+XTRA_TYPE(srv_raw,"SRV",  "raw",srvraw , pa_srvraw,  di_srv,   cs_srvraw,
+                                                      qdpl_srv, postsort_srv),
+#endif

 
 FLAT_TYPE(addr,   "A",  "addr", addr,    pa_addr,    di_addr,  cs_addr       ),
 DEEP_TYPE(ns,     "NS", "+addr",hostaddr,pa_hostaddr,di_hostaddr,cs_hostaddr ),
 DEEP_TYPE(ptr,    "PTR","checked",str,   pa_ptr,     0,        cs_domain     ),
 DEEP_TYPE(mx,     "MX", "+addr",inthostaddr,pa_mx,   di_mx,    cs_inthostaddr),
 
 FLAT_TYPE(addr,   "A",  "addr", addr,    pa_addr,    di_addr,  cs_addr       ),
 DEEP_TYPE(ns,     "NS", "+addr",hostaddr,pa_hostaddr,di_hostaddr,cs_hostaddr ),
 DEEP_TYPE(ptr,    "PTR","checked",str,   pa_ptr,     0,        cs_domain     ),
 DEEP_TYPE(mx,     "MX", "+addr",inthostaddr,pa_mx,   di_mx,    cs_inthostaddr),

-                                                                             
+#if 0
+XTRA_TYPE(srv,    "SRV","+addr",srvhostaddr,pa_srvaddr,di_srv, cs_srvhostaddr,
+                                                      qdpl_srv, postsort_srv),
+#endif
+

 DEEP_TYPE(soa,    "SOA","822",  soa,     pa_soa,     0,        cs_soa        ),
 DEEP_TYPE(rp,     "RP", "822",  strpair, pa_rp,      0,        cs_rp         ),
 };
 DEEP_TYPE(soa,    "SOA","822",  soa,     pa_soa,     0,        cs_soa        ),
 DEEP_TYPE(rp,     "RP", "822",  strpair, pa_rp,      0,        cs_rp         ),
 };