unknown rr types seem to work

[adns] / src / parse.c

diff --git a/src/parse.c b/src/parse.c
index 9a4e0c7483498daad8ed12180398cd31fe68dccd..e65a327e3604ab01b334c44d5ba374fdb478299b 100644 (file)
--- a/src/parse.c
+++ b/src/parse.c
@@ -4,11 +4,11 @@
  */
 /*
  *  This file is
  */
 /*
  *  This file is

- *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>

  *
  *  It is part of adns, which is
  *
  *  It is part of adns, which is

- *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
- *    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+ *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>

  *  
  *  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
  *  
  *  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


@@ -35,16 +35,16 @@ int vbuf__append_quoted1035(vbuf *vb, const byte *buf, int len) {
     qbuf[0]= 0;
     for (i=0; i<len; i++) {
       ch= buf[i];
     qbuf[0]= 0;
     for (i=0; i<len; i++) {
       ch= buf[i];

-      if (ch == '.' || ch == '"' || ch == '(' || ch == ')' ||
-         ch == '@' || ch == ';' || ch == '$' || ch == '\\') {
-       sprintf(qbuf,"\\%c",ch);
-       break;
-      } else if (ch <= ' ' || ch >= 127) {
+      if (ch <= ' ' || ch >= 127) {

        sprintf(qbuf,"\\%03o",ch);
        break;
        sprintf(qbuf,"\\%03o",ch);
        break;

+      } else if (!ctype_domainunquoted(ch)) {
+       sprintf(qbuf,"\\%c",ch);
+       break;

       }
     }
       }
     }

-    if (!adns__vbuf_append(vb,buf,i) || !adns__vbuf_append(vb,qbuf,strlen(qbuf)))
+    if (!adns__vbuf_append(vb,buf,i) ||
+       !adns__vbuf_append(vb,qbuf,strlen(qbuf)))

       return 0;
     if (i<len) i++;
     buf+= i;
       return 0;
     if (i<len) i++;
     buf+= i;


@@ -70,10 +70,9 @@ void adns__findlabel_start(findlabel_state *fls, adns_state ads,
 
 adns_status adns__findlabel_next(findlabel_state *fls,
                                 int *lablen_r, int *labstart_r) {
 
 adns_status adns__findlabel_next(findlabel_state *fls,
                                 int *lablen_r, int *labstart_r) {

-  int lablen, jumped, jumpto;
+  int lablen, jumpto;

   const char *dgram;
 
   const char *dgram;
 

-  jumped= 0;

   dgram= fls->dgram;
   for (;;) {
     if (fls->cbyte >= fls->dglen) goto x_truncated;
   dgram= fls->dgram;
   for (;;) {
     if (fls->cbyte >= fls->dglen) goto x_truncated;


@@ -81,10 +80,6 @@ adns_status adns__findlabel_next(findlabel_state *fls,
     GET_B(fls->cbyte,lablen);
     if (!(lablen & 0x0c0)) break;
     if ((lablen & 0x0c0) != 0x0c0) return adns_s_unknownformat;
     GET_B(fls->cbyte,lablen);
     if (!(lablen & 0x0c0)) break;
     if ((lablen & 0x0c0) != 0x0c0) return adns_s_unknownformat;

-    if (jumped++) {
-      adns__diag(fls->ads,fls->serv,fls->qu,"compressed datagram contains loop");
-      return adns_s_invalidresponse;
-    }

     if (fls->cbyte >= fls->dglen) goto x_truncated;
     if (fls->cbyte >= fls->max) goto x_badresponse;
     GET_B(fls->cbyte,jumpto);
     if (fls->cbyte >= fls->dglen) goto x_truncated;
     if (fls->cbyte >= fls->max) goto x_badresponse;
     GET_B(fls->cbyte,jumpto);


@@ -105,7 +100,6 @@ adns_status adns__findlabel_next(findlabel_state *fls,
     if (fls->dmend_r) *(fls->dmend_r)= fls->cbyte;
   }
   *lablen_r= lablen;
     if (fls->dmend_r) *(fls->dmend_r)= fls->cbyte;
   }
   *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:


@@ -113,22 +107,26 @@ adns_status adns__findlabel_next(findlabel_state *fls,
   return adns_s_ok;
 
  x_badresponse: 
   return adns_s_ok;
 
  x_badresponse: 

-  adns__diag(fls->ads,fls->serv,fls->qu,"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_invalidresponse;
 }
 
 adns_status adns__parse_domain(adns_state ads, int serv, adns_query qu,
   return adns_s_invalidresponse;
 }
 
 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) {
+                              vbuf *vb, parsedomain_flags flags,
+                              const byte *dgram, int dglen, int *cbyte_io,
+                              int max) {

   findlabel_state fls;
   
   findlabel_state fls;
   

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

   vb->used= 0;
   return adns__parse_domain_more(&fls,ads,qu, vb,flags,dgram);
 }
 
 adns_status adns__parse_domain_more(findlabel_state *fls, adns_state ads,
   vb->used= 0;
   return adns__parse_domain_more(&fls,ads,qu, vb,flags,dgram);
 }
 
 adns_status adns__parse_domain_more(findlabel_state *fls, adns_state ads,

-                                   adns_query qu, vbuf *vb, parsedomain_flags flags,
+                                   adns_query qu, vbuf *vb,
+                                   parsedomain_flags flags,

                                    const byte *dgram) {
   int lablen, labstart, i, ch, first;
   adns_status st;
                                    const byte *dgram) {
   int lablen, labstart, i, ch, first;
   adns_status st;


@@ -149,7 +147,8 @@ adns_status adns__parse_domain_more(findlabel_state *fls, adns_state ads,
        return adns_s_nomemory;
     } else {
       ch= dgram[labstart];
        return adns_s_nomemory;
     } else {
       ch= dgram[labstart];

-      if (!ctype_alpha(ch) && !ctype_digit(ch)) return adns_s_answerdomaininvalid;
+      if (!ctype_alpha(ch) && !ctype_digit(ch))
+       return adns_s_answerdomaininvalid;

       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))


@@ -165,10 +164,11 @@ adns_status adns__parse_domain_more(findlabel_state *fls, adns_state ads,
        
 adns_status adns__findrr_anychk(adns_query qu, int serv,
                                const byte *dgram, int dglen, int *cbyte_io,
        
 adns_status adns__findrr_anychk(adns_query qu, int serv,
                                const byte *dgram, int dglen, int *cbyte_io,

-                               int *type_r, int *class_r, unsigned long *ttl_r,
+                               int *type_r, int *class_r,
+                               unsigned long *ttl_r,

                                int *rdlen_r, int *rdstart_r,
                                int *rdlen_r, int *rdstart_r,

-                               const byte *eo_dgram, int eo_dglen, int eo_cbyte,
-                               int *eo_matched_r) {
+                               const byte *eo_dgram, int eo_dglen,
+                               int eo_cbyte, int *eo_matched_r) {

   findlabel_state fls, eo_fls;
   int cbyte;
   
   findlabel_state fls, eo_fls;
   int cbyte;
   


@@ -182,7 +182,8 @@ adns_status adns__findrr_anychk(adns_query qu, int serv,
 
   adns__findlabel_start(&fls,qu->ads, serv,qu, dgram,dglen,dglen,cbyte,&cbyte);
   if (eo_dgram) {
 
   adns__findlabel_start(&fls,qu->ads, serv,qu, dgram,dglen,dglen,cbyte,&cbyte);
   if (eo_dgram) {

-    adns__findlabel_start(&eo_fls,qu->ads, -1,0, 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;