X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=src%2Ftransmit.c;h=7afb90f2bd6777dceb6bcce1642fa94be60079dd;hp=3b148227ef48f87a6cc57c3fbe28155fb6fe0aa9;hb=382b81f736a471aafd75661b08e795ffc7521f92;hpb=609133ee3365572c56ffa2ffb14d274ff47eb94b

diff --git a/src/transmit.c b/src/transmit.c
index 3b14822..7afb90f 100644
--- a/src/transmit.c
+++ b/src/transmit.c
@@ -4,12 +4,11 @@
  * - send queries
  */
 /*
- *  This file is
- *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
- *
- *  It is part of adns, which is
- *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
- *    Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
+ *  This file is part of adns, which is
+ *    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+ *    Copyright (C) 1999-2000,2003,2006  Tony Finch
+ *    Copyright (C) 1991 Massachusetts Institute of Technology
+ *  (See the file INSTALL for full details.)
  *  
  *  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
@@ -67,7 +66,7 @@ static adns_status mkquery_footer(vbuf *vb, adns_rrtype type) {
   byte *rqp;
 
   MKQUERY_START(vb);
-  MKQUERY_ADDW(type & adns__rrt_typemask); /* QTYPE */
+  MKQUERY_ADDW(type & adns_rrt_typemask); /* QTYPE */
   MKQUERY_ADDW(DNS_CLASS_IN); /* QCLASS=IN */
   MKQUERY_STOP(vb);
   assert(vb->used <= vb->avail);
@@ -75,11 +74,57 @@ static adns_status mkquery_footer(vbuf *vb, adns_rrtype type) {
   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) {
-  int ll, c, nbytes;
-  byte label[255], *rqp;
+			  const typeinfo *typei, adns_rrtype type,
+			  adns_queryflags flags) {
+  int labelnum, ll, nbytes;
+  byte label[255];
+  byte *rqp;
   const char *p, *pe;
   adns_status st;
 
@@ -89,32 +134,11 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
 
   p= owner; pe= owner+ol;
   nbytes= 0;
+  labelnum= 0;
   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 + (*p++ - '0')*10 + (*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;
@@ -126,7 +150,7 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
 
   MKQUERY_STOP(vb);
   
-  st= mkquery_footer(vb,typei->type);
+  st= mkquery_footer(vb,type);
   
   return adns_s_ok;
 }