X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fparse.c;h=9a4e0c7483498daad8ed12180398cd31fe68dccd;hb=226c5eef1caec08ee33276de158e263c0593c0d0;hp=22d9d96cea3fb4269b5420955c8a3925abc321c3;hpb=a719a4bedec2bc512b7f95f7446e02f6662ebbc7;p=adns.git

diff --git a/src/parse.c b/src/parse.c
index 22d9d96..9a4e0c7 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -3,7 +3,12 @@
  * - parsing assistance functions (mainly for domains inside datagrams)
  */
 /*
- *  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+ *  This file is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  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>
  *  
  *  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
@@ -117,18 +122,28 @@ adns_status adns__parse_domain(adns_state ads, int serv, adns_query qu,
 			       const byte *dgram, int dglen, int *cbyte_io, int max) {
   findlabel_state fls;
   
-  int lablen, labstart, i, ch;
-  adns_status st;
-
   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,
+				    adns_query qu, vbuf *vb, parsedomain_flags flags,
+				    const byte *dgram) {
+  int lablen, labstart, i, ch, first;
+  adns_status st;
+
+  first= 1;
   for (;;) {
-    st= adns__findlabel_next(&fls,&lablen,&labstart);
+    st= adns__findlabel_next(fls,&lablen,&labstart);
     if (st) return st;
     if (lablen<0) { vb->used=0; return adns_s_ok; }
     if (!lablen) break;
-    if (vb->used)
+    if (first) {
+      first= 0;
+    } else {
       if (!adns__vbuf_append(vb,".",1)) return adns_s_nomemory;
+    }
     if (flags & pdf_quoteok) {
       if (!vbuf__append_quoted1035(vb,dgram+labstart,lablen))
 	return adns_s_nomemory;
@@ -150,13 +165,15 @@ adns_status adns__parse_domain(adns_state ads, int serv, adns_query qu,
 	
 adns_status adns__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,
+				int *type_r, int *class_r, unsigned long *ttl_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;
+  unsigned long ttl;
   int lablen, labstart, ch;
   int eo_lablen, eo_labstart, eo_ch;
   adns_status st;
@@ -193,7 +210,11 @@ adns_status adns__findrr_anychk(adns_query qu, int serv,
   if (cbyte+10>dglen) goto x_truncated;
   GET_W(cbyte,tmp); *type_r= tmp;
   GET_W(cbyte,tmp); *class_r= tmp;
-  cbyte+= 4; /* we skip the TTL */
+
+  GET_L(cbyte,ttl);
+  if (ttl > MAXTTLBELIEVE) ttl= MAXTTLBELIEVE;
+  *ttl_r= ttl;
+  
   GET_W(cbyte,rdlen); if (rdlen_r) *rdlen_r= rdlen;
   if (rdstart_r) *rdstart_r= cbyte;
   cbyte+= rdlen;
@@ -208,23 +229,24 @@ adns_status adns__findrr_anychk(adns_query qu, int serv,
 
 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 *type_r, int *class_r, unsigned long *ttl_r,
+			 int *rdlen_r, int *rdstart_r,
 			 int *ownermatchedquery_r) {
   if (!ownermatchedquery_r) {
     return adns__findrr_anychk(qu,serv,
 			       dgram,dglen,cbyte_io,
-			       type_r,class_r,rdlen_r,rdstart_r,
+			       type_r,class_r,ttl_r,rdlen_r,rdstart_r,
 			       0,0,0, 0);
   } else if (!qu->cname_dgram) {
     return adns__findrr_anychk(qu,serv,
 			       dgram,dglen,cbyte_io,
-			       type_r,class_r,rdlen_r,rdstart_r,
+			       type_r,class_r,ttl_r,rdlen_r,rdstart_r,
 			       qu->query_dgram,qu->query_dglen,DNS_HDRSIZE,
 			       ownermatchedquery_r);
   } else {
     return adns__findrr_anychk(qu,serv,
 			       dgram,dglen,cbyte_io,
-			       type_r,class_r,rdlen_r,rdstart_r,
+			       type_r,class_r,ttl_r,rdlen_r,rdstart_r,
 			       qu->cname_dgram,qu->cname_dglen,qu->cname_begin,
 			       ownermatchedquery_r);
   }