Introduce adns__labels_equal and ctype_toupper

[adns] / src / parse.c

diff --git a/src/parse.c b/src/parse.c
index 0f893cbac5f7edce9f9b08015e42f37228cf8bca..20853dda22abfa73aef53827d5df84200bbe9415 100644 (file)
--- a/src/parse.c
+++ b/src/parse.c
@@ -160,7 +160,17 @@ adns_status adns__parse_domain_more(findlabel_state *fls, adns_state ads,
   if (!adns__vbuf_append(vb,"",1)) return adns_s_nomemory;
   return adns_s_ok;
 }
   if (!adns__vbuf_append(vb,"",1)) return adns_s_nomemory;
   return adns_s_ok;
 }

-       
+
+bool adns__labels_equal(const byte *a, int al, const byte *b, int bl) {
+  if (al != bl) return 0;
+  while (al-- > 0) {
+    int ac= ctype_toupper(*a++);
+    int bc= ctype_toupper(*b++);
+    if (ac != bc) return 0;
+  }
+  return 1;
+}
+

 adns_status adns__findrr_anychk(adns_query qu, int serv,
                                const byte *dgram, int dglen, int *cbyte_io,
                                int *type_r, int *class_r,
 adns_status adns__findrr_anychk(adns_query qu, int serv,
                                const byte *dgram, int dglen, int *cbyte_io,
                                int *type_r, int *class_r,


@@ -168,24 +178,25 @@ adns_status adns__findrr_anychk(adns_query qu, int serv,
                                int *rdlen_r, int *rdstart_r,
                                const byte *eo_dgram, int eo_dglen,
                                int eo_cbyte, int *eo_matched_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;
+  findlabel_state fls, eo_fls_buf;
+  findlabel_state *eo_fls; /* 0 iff we know it's not matching eo_... */

   int cbyte;
   
   int cbyte;
   

-  int tmp, rdlen, mismatch;
+  int tmp, rdlen;

   unsigned long ttl;
   unsigned long ttl;

-  int lablen, labstart, ch;
-  int eo_lablen, eo_labstart, eo_ch;
+  int lablen, labstart;
+  int eo_lablen, eo_labstart;

   adns_status st;
 
   cbyte= *cbyte_io;
 
   adns__findlabel_start(&fls,qu->ads, serv,qu, dgram,dglen,dglen,cbyte,&cbyte);
   if (eo_dgram) {
   adns_status st;
 
   cbyte= *cbyte_io;
 
   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_fls= &eo_fls_buf;
+    adns__findlabel_start(eo_fls,qu->ads, -1,0,

                          eo_dgram,eo_dglen,eo_dglen,eo_cbyte,0);
                          eo_dgram,eo_dglen,eo_dglen,eo_cbyte,0);

-    mismatch= 0;

   } else {
   } else {

-    mismatch= 1;
+    eo_fls= 0;

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


@@ -193,19 +204,16 @@ adns_status adns__findrr_anychk(adns_query qu, int serv,
     if (st) return st;
     if (lablen<0) goto x_truncated;
 
     if (st) return st;
     if (lablen<0) goto x_truncated;
 

-    if (!mismatch) {
-      st= adns__findlabel_next(&eo_fls,&eo_lablen,&eo_labstart);
+    if (eo_fls) {
+      st= adns__findlabel_next(eo_fls,&eo_lablen,&eo_labstart);

       assert(!st); assert(eo_lablen>=0);
       assert(!st); assert(eo_lablen>=0);

-      if (lablen != eo_lablen) mismatch= 1;
-      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;
-      }
+      if (!adns__labels_equal(dgram+labstart, lablen,
+                             eo_dgram+eo_labstart, eo_lablen))
+       eo_fls= 0;

     }
     if (!lablen) break;
   }
     }
     if (!lablen) break;
   }

-  if (eo_matched_r) *eo_matched_r= !mismatch;
+  if (eo_matched_r) *eo_matched_r= !!eo_fls;

    
   if (cbyte+10>dglen) goto x_truncated;
   GET_W(cbyte,tmp); *type_r= tmp;
    
   if (cbyte+10>dglen) goto x_truncated;
   GET_W(cbyte,tmp); *type_r= tmp;