reverse parsing: Pass dgram and labstart instead of label

We are going to want to deal with labstart and dgram separately.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/addrfam.c b/src/addrfam.c
index 7153b2667231066e4633580637539f4bd79d09b5..d087016247dfef865b19afd6ce4ff9fe6695b5b4 100644 (file)
--- a/src/addrfam.c
+++ b/src/addrfam.c
@@ -580,7 +580,8 @@ static const struct revparse_domain {
   ((labnum) ? (rps)->map : (1 << NREVDOMAINS) - 1)
 
 int adns__revparse_label(struct revparse_state *rps, int labnum,
   ((labnum) ? (rps)->map : (1 << NREVDOMAINS) - 1)
 
 int adns__revparse_label(struct revparse_state *rps, int labnum,

-                        const char *label, int lablen) {
+                        const char *dgram, int labstart, int lablen) {
+  const char *label = dgram+labstart;

   unsigned f= REVDOMAIN_MAP(rps, labnum);
   const struct revparse_domain *rpd;
   const char *tp;
   unsigned f= REVDOMAIN_MAP(rps, labnum);
   const struct revparse_domain *rpd;
   const char *tp;


@@ -610,7 +611,8 @@ int adns__revparse_label(struct revparse_state *rps, int labnum,
   return 0;
 }
 
   return 0;
 }
 

-int adns__revparse_done(struct revparse_state *rps, int nlabels,
+int adns__revparse_done(struct revparse_state *rps,
+                       const char *dgram, int nlabels,

                        adns_rrtype *rrtype_r, adns_sockaddr *addr_r) {
   unsigned f= REVDOMAIN_MAP(rps, nlabels);
   const struct revparse_domain *rpd;
                        adns_rrtype *rrtype_r, adns_sockaddr *addr_r) {
   unsigned f= REVDOMAIN_MAP(rps, nlabels);
   const struct revparse_domain *rpd;

diff --git a/src/internal.h b/src/internal.h
index 55da2b928593eec651e072da94f8ce4d6519d4b5..49f5e666c48a9e8014e55701bf7948a0e1449593 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -198,7 +198,8 @@ typedef struct typeinfo {
 
   adns_status (*checklabel)(adns_state ads, adns_queryflags flags,
                            union checklabel_state *cls, qcontext *ctx,
 
   adns_status (*checklabel)(adns_state ads, adns_queryflags flags,
                            union checklabel_state *cls, qcontext *ctx,

-                           int labnum, const char *label, int lablen);
+                           int labnum, const char *dgram,
+                           int labstart, int lablen);

   /* Check a label from the query domain string.  The label is not
    * necessarily null-terminated.  The hook can refuse the query's submission
    * by returning a nonzero status.  State can be stored in *cls between
   /* Check a label from the query domain string.  The label is not
    * necessarily null-terminated.  The hook can refuse the query's submission
    * by returning a nonzero status.  State can be stored in *cls between


@@ -230,7 +231,7 @@ typedef struct typeinfo {
 adns_status adns__ckl_hostname(adns_state ads, adns_queryflags flags,
                               union checklabel_state *cls,
                               qcontext *ctx, int labnum,
 adns_status adns__ckl_hostname(adns_state ads, adns_queryflags flags,
                               union checklabel_state *cls,
                               qcontext *ctx, int labnum,

-                              const char *label, int lablen);
+                              const char *dgram, int labstart, int lablen);

   /* implemented in query.c, used by types.c as default
    * and as part of implementation for some fancier types
    * doesn't require any state */
   /* implemented in query.c, used by types.c as default
    * and as part of implementation for some fancier types
    * doesn't require any state */


@@ -467,7 +468,8 @@ extern int adns__make_reverse_domain(const struct sockaddr *sa,
  */
 
 extern int adns__revparse_label(struct revparse_state *rps, int labnum,
  */
 
 extern int adns__revparse_label(struct revparse_state *rps, int labnum,

-                               const char *label, int lablen);
+                               const char *dgram,
+                               int labstart, int lablen);

 /* Parse a label in a reverse-domain name, given its index labnum (starting
  * from zero), a pointer to its contents (which need not be null-terminated),
  * and its length.  The state in *rps is initialized implicitly when labnum
 /* Parse a label in a reverse-domain name, given its index labnum (starting
  * from zero), a pointer to its contents (which need not be null-terminated),
  * and its length.  The state in *rps is initialized implicitly when labnum


@@ -477,7 +479,8 @@ extern int adns__revparse_label(struct revparse_state *rps, int labnum,
  * definitely invalid and the parse must be abandoned.
  */
 
  * definitely invalid and the parse must be abandoned.
  */
 

-extern int adns__revparse_done(struct revparse_state *rps, int nlabels,
+extern int adns__revparse_done(struct revparse_state *rps,
+                              const char *dgram, int nlabels,

                               adns_rrtype *rrtype_r, adns_sockaddr *addr_r);
 /* Finishes parsing a reverse-domain name, given the total number of
  * labels in the name.  On success, fills in the af and protocol
                               adns_rrtype *rrtype_r, adns_sockaddr *addr_r);
 /* Finishes parsing a reverse-domain name, given the total number of
  * labels in the name.  On success, fills in the af and protocol

diff --git a/src/query.c b/src/query.c
index a5882f3ec5f19c6b6994e7095750bd4afbe39a15..9360fb86a5755098392e117a19f08874b8b246e5 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -111,9 +111,10 @@ static void query_submit(adns_state ads, adns_query qu,
 adns_status adns__ckl_hostname(adns_state ads, adns_queryflags flags,
                               union checklabel_state *cls,
                               qcontext *ctx, int labnum,
 adns_status adns__ckl_hostname(adns_state ads, adns_queryflags flags,
                               union checklabel_state *cls,
                               qcontext *ctx, int labnum,

-                              const char *label, int lablen)
+                              const char *dgram, int labstart, int lablen)

 {
   int i, c;
 {
   int i, c;

+  const char *label = dgram+labstart;

 
   if (flags & adns_qf_quoteok_query) return adns_s_ok;
   for (i=0; i<lablen; i++) {
 
   if (flags & adns_qf_quoteok_query) return adns_s_ok;
   for (i=0; i<lablen; i++) {


@@ -141,7 +142,7 @@ static adns_status check_domain_name(adns_state ads, adns_queryflags flags,
     err= adns__findlabel_next(&fls, &lablen,&labstart);
     assert(!err); assert(lablen >= 0);
     err= typei->checklabel(ads,flags, &cls,ctx,
     err= adns__findlabel_next(&fls, &lablen,&labstart);
     assert(!err); assert(lablen >= 0);
     err= typei->checklabel(ads,flags, &cls,ctx,

-                          labnum++, dgram+labstart,lablen);
+                          labnum++, dgram,labstart,lablen);

     if (err) return err;
   } while (lablen);
   return adns_s_ok;
     if (err) return err;
   } while (lablen);
   return adns_s_ok;

diff --git a/src/types.c b/src/types.c
index ae977cbbc9cf9160cd5ecf661d59231870c474ae..804b3b587043ac0a18ceda54b4153727f2632ee5 100644 (file)
--- a/src/types.c
+++ b/src/types.c
@@ -1139,12 +1139,13 @@ static adns_status cs_inthost(vbuf *vb, const void *datap) {
 
 static adns_status ckl_ptr(adns_state ads, adns_queryflags flags,
                           union checklabel_state *cls, qcontext *ctx,
 
 static adns_status ckl_ptr(adns_state ads, adns_queryflags flags,
                           union checklabel_state *cls, qcontext *ctx,

-                          int labnum, const char *label, int lablen) {
+                          int labnum, const char *dgram,
+                          int labstart, int lablen) {

   if (lablen) {
   if (lablen) {

-    if (adns__revparse_label(&cls->ptr, labnum, label,lablen))
+    if (adns__revparse_label(&cls->ptr, labnum, dgram,labstart,lablen))

       return adns_s_querydomainwrong;
   } else {
       return adns_s_querydomainwrong;
   } else {

-    if (adns__revparse_done(&cls->ptr, labnum,
+    if (adns__revparse_done(&cls->ptr, dgram, labnum,

                            &ctx->tinfo.ptr.rev_rrtype,
                            &ctx->tinfo.ptr.addr))
       return adns_s_querydomainwrong;
                            &ctx->tinfo.ptr.rev_rrtype,
                            &ctx->tinfo.ptr.addr))
       return adns_s_querydomainwrong;


@@ -1423,12 +1424,14 @@ static adns_status cs_soa(vbuf *vb, const void *datap) {
 
 static adns_status ckl_srv(adns_state ads, adns_queryflags flags,
                           union checklabel_state *cls, qcontext *ctx,
 
 static adns_status ckl_srv(adns_state ads, adns_queryflags flags,
                           union checklabel_state *cls, qcontext *ctx,

-                          int labnum, const char *label, int lablen) {
+                          int labnum, const char *dgram,
+                          int labstart, int lablen) {
+  const char *label = dgram+labstart;

   if (labnum < 2 && !(flags & adns_qf_quoteok_query)) {
     if (!lablen || label[0] != '_') return adns_s_querydomaininvalid;
     return adns_s_ok;
   }
   if (labnum < 2 && !(flags & adns_qf_quoteok_query)) {
     if (!lablen || label[0] != '_') return adns_s_querydomaininvalid;
     return adns_s_ok;
   }

-  return adns__ckl_hostname(ads, flags, cls, ctx, labnum, label, lablen);
+  return adns__ckl_hostname(ads,flags, cls,ctx, labnum, dgram,labstart,lablen);

 }
 
 static adns_status pap_srv_begin(const parseinfo *pai, int *cbyte_io, int max,
 }
 
 static adns_status pap_srv_begin(const parseinfo *pai, int *cbyte_io, int max,