Halfway through A lookups; need to restructure pa_... argument passing.

[adns] / src / parse.c

diff --git a/src/parse.c b/src/parse.c
index 957b57232994121321d1daab9632d889d9b5e906..bb088832b710a86bb26e8ace6d7d1257d40a8af3 100644 (file)
--- a/src/parse.c
+++ b/src/parse.c
@@ -1,4 +1,24 @@
-/**/
+/*
+ * parse.c
+ * - parsing assistance functions (mainly for domains inside datagrams)
+ */
+/*
+ *  This file is part of adns, which is Copyright (C) 1997, 1998 Ian Jackson
+ *  
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software Foundation,
+ *  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+ */

 
 #include "internal.h"
 
 
 #include "internal.h"
 


@@ -26,11 +46,12 @@ int vbuf__append_quoted1035(vbuf *vb, const byte *buf, int len) {
   return 1;
 }
 
   return 1;
 }
 

-void adns__findlabel_start(findlabel_state *fls,
-                          adns_state ads, int serv,
+void adns__findlabel_start(findlabel_state *fls, adns_state ads,
+                          int serv, adns_query qu,

                           const byte *dgram, int dglen, int max,
                           int dmbegin, int *dmend_rlater) {
   fls->ads= ads;
                           const byte *dgram, int dglen, int max,
                           int dmbegin, int *dmend_rlater) {
   fls->ads= ads;

+  fls->qu= qu;

   fls->serv= serv;
   fls->dgram= dgram;
   fls->dglen= dglen;
   fls->serv= serv;
   fls->dgram= dgram;
   fls->dglen= dglen;


@@ -38,29 +59,34 @@ void adns__findlabel_start(findlabel_state *fls,
   fls->cbyte= dmbegin;
   fls->namelen= 0;
   fls->dmend_r= dmend_rlater;
   fls->cbyte= dmbegin;
   fls->namelen= 0;
   fls->dmend_r= dmend_rlater;

-  fls->namelen_r= namelen_rlater;

 }
 
 }
 

-adns_status adns__findlabel_next(findlabel_state fls,
+adns_status adns__findlabel_next(findlabel_state *fls,

                                 int *lablen_r, int *labstart_r) {
                                 int *lablen_r, int *labstart_r) {

-  int lablen, jumped;
+  int lablen, jumped, jumpto;
+  const char *dgram;

 
   jumped= 0;
 
   jumped= 0;

+  dgram= fls->dgram;

   for (;;) {
   for (;;) {

-    fls->cbyte += 2;
-    if (fls->cbyte > fls->dglen) goto x_truncated;
-    if (fls->cbyte > fls->max) goto x_serverfaulty;
-    GET_W(fls->cbyte-2,lablen);
-    if (!(lablen & 0x0c000)) break;
-    if ((lablen & 0x0c000) != 0x0c000) return adns_s_unknownreply;
+    if (fls->cbyte >= fls->dglen) goto x_truncated;
+    if (fls->cbyte >= fls->max) goto x_serverfaulty;
+    GET_B(fls->cbyte,lablen);
+    if (!(lablen & 0x0c0)) break;
+    if ((lablen & 0x0c0) != 0x0c0) return adns_s_unknownreply;

     if (jumped++) {
     if (jumped++) {

-      adns__diag(ads,serv,"compressed datagram contains loop");
+      adns__diag(fls->ads,fls->serv,fls->qu,"compressed datagram contains loop");

       return adns_s_serverfaulty;
     }
       return adns_s_serverfaulty;
     }

+    if (fls->cbyte >= fls->dglen) goto x_truncated;
+    if (fls->cbyte >= fls->max) goto x_serverfaulty;
+    GET_B(fls->cbyte,jumpto);
+    jumpto |= (lablen&0x3f)<<8;

     if (fls->dmend_r) *(fls->dmend_r)= fls->cbyte;
     if (fls->dmend_r) *(fls->dmend_r)= fls->cbyte;

-    fls->cbyte= DNS_HDRSIZE+(lablen&0x3fff);
+    fls->cbyte= jumpto;

     fls->dmend_r= 0; fls->max= fls->dglen+1;
   }
     fls->dmend_r= 0; fls->max= fls->dglen+1;
   }

+  if (labstart_r) *labstart_r= fls->cbyte;

   if (lablen) {
     if (fls->namelen) fls->namelen++;
     fls->namelen+= lablen;
   if (lablen) {
     if (fls->namelen) fls->namelen++;
     fls->namelen+= lablen;


@@ -70,10 +96,9 @@ adns_status adns__findlabel_next(findlabel_state fls,
     if (fls->cbyte > fls->max) goto x_serverfaulty;
   } else {
     if (fls->dmend_r) *(fls->dmend_r)= fls->cbyte;
     if (fls->cbyte > fls->max) goto x_serverfaulty;
   } else {
     if (fls->dmend_r) *(fls->dmend_r)= fls->cbyte;

-    if (fls->namelen_r) *(fls->namelen_r)= fls->namelen;

   }
   }

-  if (labstart_r) *labstart_r= fls->cbyte;

   *lablen_r= lablen;
   *lablen_r= lablen;

+/*if (labstart_r) fprintf(stderr,"label %d >%.*s<\n",lablen,lablen,fls->dgram+*labstart_r);*/

   return adns_s_ok;
 
  x_truncated:
   return adns_s_ok;
 
  x_truncated:


@@ -81,19 +106,19 @@ adns_status adns__findlabel_next(findlabel_state fls,
   return adns_s_ok;
 
  x_serverfaulty: 
   return adns_s_ok;
 
  x_serverfaulty: 

-  adns__diag(ads,serv,"label in domain runs beyond end of domain");
+  adns__diag(fls->ads,fls->serv,fls->qu,"label in domain runs beyond end of domain");

   return adns_s_serverfaulty;
 }
 
   return adns_s_serverfaulty;
 }
 

-adns_status adns__parse_domain(adns_state ads, int serv, vbuf *vb, int flags,
-                              const byte *dgram, int dglen,
-                              int *cbyte_io, int max) {
+adns_status adns__parse_domain(adns_state ads, int serv, adns_query qu,
+                              vbuf *vb, adns_queryflags flags,
+                              const byte *dgram, int dglen, int *cbyte_io, int max) {

   findlabel_state fls;
   
   findlabel_state fls;
   

-  int cbyte, lablen, labstart, namelen, i, ch;
+  int lablen, labstart, i, ch;

   adns_status st;
 
   adns_status st;
 

-  ands__findlabel_start(&fls,ads,serv, dgram,dglen,max, *cbyte_io,cbyte_io);
+  adns__findlabel_start(&fls,ads, serv,qu, dgram,dglen,max, *cbyte_io,cbyte_io);

   vb->used= 0;
   for (;;) {
     st= adns__findlabel_next(&fls,&lablen,&labstart);
   vb->used= 0;
   for (;;) {
     st= adns__findlabel_next(&fls,&lablen,&labstart);


@@ -101,87 +126,44 @@ adns_status adns__parse_domain(adns_state ads, int serv, vbuf *vb, int flags,
     if (lablen<0) { vb->used=0; return adns_s_ok; }
     if (!lablen) break;
     if (vb->used)
     if (lablen<0) { vb->used=0; return adns_s_ok; }
     if (!lablen) break;
     if (vb->used)

-      if (!adns__vbuf_append(&qu->ans,".",1)) return adns_s_nolocalmem;
-    if (flags & adns_qf_anyquote) {
-      if (!vbuf__append_quoted1035(&qu->ans,dgram+labstart,lablen))
+      if (!adns__vbuf_append(vb,".",1)) return adns_s_nolocalmem;
+    if (flags & pdf_quoteok) {
+      if (!vbuf__append_quoted1035(vb,dgram+labstart,lablen))

        return adns_s_nolocalmem;
     } else {
        return adns_s_nolocalmem;
     } else {

-      if (!ctype_alpha(dgram[labstart])) return adns_s_invaliddomain;
+      ch= dgram[labstart];
+      if (!ctype_alpha(ch) && !ctype_digit(ch)) return adns_s_invalidanswerdomain;

       for (i= labstart+1; i<labstart+lablen; i++) {
        ch= dgram[i];
        if (ch != '-' && !ctype_alpha(ch) && !ctype_digit(ch))
       for (i= labstart+1; i<labstart+lablen; i++) {
        ch= dgram[i];
        if (ch != '-' && !ctype_alpha(ch) && !ctype_digit(ch))

-         return adns_s_invaliddomain;
+         return adns_s_invalidanswerdomain;

       }
       }

-      if (!adns__vbuf_append(&qu->ans,dgram+labstart,lablen))
+      if (!adns__vbuf_append(vb,dgram+labstart,lablen))

        return adns_s_nolocalmem;
     }
   }
        return adns_s_nolocalmem;
     }
   }

-  if (!adns__vbuf_append(&qu->ans,"",1)) return adns_s_nolocalmem;
+  if (!adns__vbuf_append(vb,"",1)) return adns_s_nolocalmem;

   return adns_s_ok;
 }
        
   return adns_s_ok;
 }
        

-const char *adns__diag_domain(adns_state ads, int serv, vbuf *vb, int flags,
-                             const byte *dgram, int dglen, int cbyte) {
-  adns_status st;
-
-  st= adns__parse_domain(ads,serv,vb,qu->flags, dgram,dglen, &cbyte,dglen);
-  if (st) {
-    vb->used= 0;
-    adns__vbuf_appendstr(vb,"<bad format... ");
-    adns__vbuf_appendstr(vb,adns_strerror(st));
-    adns__vbuf_appendstr(vb,">");
-    adns__vbuf_append(vb,"",1);
-  }
-  if (!vb.used) {
-    adns__vbuf_appendstr(vb,"<truncated ...>");
-    adns__vbuf_append(vb,"",1);
-  }
-  return vb->buf;
-}
-    
-adns_status adns__findrr(adns_state ads, int serv,
-                        const byte *dgram, int dglen, int *cbyte_io,
-                        int *type_r, int *class_r, int *rdlen_r, int *rdstart_r,
-                        const byte *eo_dgram, int eo_dglen, int eo_cbyte,
-                        int *eo_matched_r) {
-  /* Finds the extent and some of the contents of an RR in a datagram
-   * and does some checks.  The datagram is *dgram, length dglen, and
-   * the RR starts at *cbyte_io (which is updated afterwards to point
-   * to the end of the RR).
-   *
-   * The type, class and RRdata length and start are returned iff
-   * the corresponding pointer variables are not null.  type_r and
-   * class_r may not be null.
-   *
-   * If the caller thinks they know what the owner of the RR ought to
-   * be they can pass in details in eo_*: this is another (or perhaps
-   * the same datagram), and a pointer to where the putative owner
-   * starts in that datagram.  In this case *eo_matched_r will be set
-   * to 1 if the datagram matched or 0 if it did not.  Either
-   * both eo_dgram and eo_matched_r must both be non-null, or they
-   * must both be null (in which case eo_dglen and eo_cbyte will be ignored).
-   * The eo datagram and contained owner domain MUST be valid and
-   * untruncated.
-   *
-   * If there is truncation then *type_r will be set to -1 and
-   * *cbyte_io, *class_r, *rdlen_r, *rdstart_r and *eo_matched_r will be
-   * undefined.
-   *
-   * If an error is returned then *type_r will be undefined too.
-   */
+static adns_status findrr_anychk(adns_query qu, int serv,
+                                const byte *dgram, int dglen, int *cbyte_io,
+                                int *type_r, int *class_r, int *rdlen_r, int *rdstart_r,
+                                const byte *eo_dgram, int eo_dglen, int eo_cbyte,
+                                int *eo_matched_r) {

   findlabel_state fls, eo_fls;
   int cbyte;
   
   int tmp, rdlen, mismatch;
   findlabel_state fls, eo_fls;
   int cbyte;
   
   int tmp, rdlen, mismatch;

-  int max, lablen, labstart, namelen, ch;
-  int eo_max, eo_lablen, eo_labstart, eo_namelen, eo_ch;
+  int lablen, labstart, ch;
+  int eo_lablen, eo_labstart, eo_ch;

   adns_status st;
 
   cbyte= *cbyte_io;
 
   adns_status st;
 
   cbyte= *cbyte_io;
 

-  ands__findlabel_start(&fls,ads,serv, dgram,dglen,dglen,cbyte,&cbyte);
+  adns__findlabel_start(&fls,qu->ads, serv,qu, dgram,dglen,dglen,cbyte,&cbyte);

   if (eo_dgram) {
   if (eo_dgram) {

-    ands__findlabel_start(&eo_fls,ads,serv, eo_dgram,eo_dglen,eo_dglen,eo_cbyte,0);
+    adns__findlabel_start(&eo_fls,qu->ads, -1,0, eo_dgram,eo_dglen,eo_dglen,eo_cbyte,0);

     mismatch= 0;
   } else {
     mismatch= 1;
     mismatch= 0;
   } else {
     mismatch= 1;


@@ -196,12 +178,13 @@ adns_status adns__findrr(adns_state ads, int serv,
       st= adns__findlabel_next(&eo_fls,&eo_lablen,&eo_labstart);
       assert(!st); assert(eo_lablen>=0);
       if (lablen != eo_lablen) mismatch= 1;
       st= adns__findlabel_next(&eo_fls,&eo_lablen,&eo_labstart);
       assert(!st); assert(eo_lablen>=0);
       if (lablen != eo_lablen) mismatch= 1;

-      while (!mismatch && lablen-- > 0) {
+      while (!mismatch && eo_lablen-- > 0) {

        ch= dgram[labstart++]; if (ctype_alpha(ch)) ch &= ~32;
        eo_ch= eo_dgram[eo_labstart++]; if (ctype_alpha(eo_ch)) eo_ch &= ~32;
        if (ch != eo_ch) mismatch= 1;
       }
     }
        ch= dgram[labstart++]; if (ctype_alpha(ch)) ch &= ~32;
        eo_ch= eo_dgram[eo_labstart++]; if (ctype_alpha(eo_ch)) eo_ch &= ~32;
        if (ch != eo_ch) mismatch= 1;
       }
     }

+    if (!lablen) break;

   }
   if (eo_matched_r) *eo_matched_r= !mismatch;
    
   }
   if (eo_matched_r) *eo_matched_r= !mismatch;
    


@@ -209,7 +192,7 @@ adns_status adns__findrr(adns_state ads, int serv,
   GET_W(cbyte,tmp); *type_r= tmp;
   GET_W(cbyte,tmp); *class_r= tmp;
   cbyte+= 4; /* we skip the TTL */
   GET_W(cbyte,tmp); *type_r= tmp;
   GET_W(cbyte,tmp); *class_r= tmp;
   cbyte+= 4; /* we skip the TTL */

-  GET_W(cbyte,rdlen); if (rdlen_r) *rdlen_r= tmp;
+  GET_W(cbyte,rdlen); if (rdlen_r) *rdlen_r= rdlen;

   if (rdstart_r) *rdstart_r= cbyte;
   cbyte+= rdlen;
   if (cbyte>dglen) goto x_truncated;
   if (rdstart_r) *rdstart_r= cbyte;
   cbyte+= rdlen;
   if (cbyte>dglen) goto x_truncated;


@@ -218,5 +201,29 @@ adns_status adns__findrr(adns_state ads, int serv,
 
  x_truncated:
   *type_r= -1;
 
  x_truncated:
   *type_r= -1;

-  return 0;;
+  return 0;
+}
+
+adns_status adns__findrr(adns_query qu, int serv,
+                        const byte *dgram, int dglen, int *cbyte_io,
+                        int *type_r, int *class_r, int *rdlen_r, int *rdstart_r,
+                        int *ownermatchedquery_r) {
+  if (!ownermatchedquery_r) {
+    return findrr_anychk(qu,serv,
+                        dgram,dglen,cbyte_io,
+                        type_r,class_r,rdlen_r,rdstart_r,
+                        0,0,0, 0);
+  } else if (!qu->cname_dgram) {
+    return findrr_anychk(qu,serv,
+                        dgram,dglen,cbyte_io,
+                        type_r,class_r,rdlen_r,rdstart_r,
+                        qu->query_dgram,qu->query_dglen,DNS_HDRSIZE,
+                        ownermatchedquery_r);
+  } else {
+    return findrr_anychk(qu,serv,
+                        dgram,dglen,cbyte_io,
+                        type_r,class_r,rdlen_r,rdstart_r,
+                        qu->cname_dgram,qu->cname_dglen,qu->cname_begin,
+                        ownermatchedquery_r);
+  }

 }
 }