X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/7da210700fbdd45a273d6735f6a2a55ae3838633..ea1e31e326a99219a0a6edf28a75845b79b74893:/src/types.c

diff --git a/src/types.c b/src/types.c
index e494ab3..e59da80 100644
--- a/src/types.c
+++ b/src/types.c
@@ -27,15 +27,16 @@
 
 #include "internal.h"
 
-#define R_NOMEM           return adns_s_nolocalmem
+#define R_NOMEM           return adns_s_nomemory
 #define CSP_ADDSTR(s)     if (!adns__vbuf_appendstr(vb,(s))) R_NOMEM; else;
 
 /*
  * order of sections:
  *
+ * _string                    (pap)
  * _textdata, _qstring        (csp)
  * _str                       (mf,cs)
- * _intstr                    (mf,cs)
+ * _intstr                    (mf,csp,cs)
  * _manyistr                  (mf,cs)
  * _txt                       (pa)
  * _inaddr                    (pa,dip,di)
@@ -46,6 +47,13 @@
  * _mx_raw                    (pa,di)
  * _mx                        (pa,di)
  * _inthostaddr               (mf,cs)
+ * _ptr                       (pa)
+ * _strpair                   (mf,cs)
+ * _intstrpair                (mf,cs)
+ * _hinfo                     (pa)
+ * _mailbox                   (pap)
+ * _rp                        (pa)
+ * _soa                       (pa,mf,cs)
  * _flat                      (mf)
  *
  * within each section:
@@ -60,9 +68,38 @@
  */
 
 /*
+ * _string               (pap)
  * _textdata, _qstring   (csp)
  */
 
+static adns_status pap_string(const parseinfo *pai, int *cbyte_io, int max,
+			      int *len_r, char **str_r) {
+  /* Neither len_r nor str_r may be null.
+   * End of datagram (overrun) is indicated by returning adns_s_invaliddata;
+   */
+  const byte *dgram= pai->dgram;
+  int l, cbyte;
+  char *str;
+
+  cbyte= *cbyte_io;
+
+  if (cbyte >= max) return adns_s_invaliddata;
+  GET_B(cbyte,l);
+  if (cbyte+l > max) return adns_s_invaliddata;
+  
+  str= adns__alloc_interim(pai->qu, l+1);
+  if (!str) R_NOMEM;
+  
+  str[l]= 0;
+  memcpy(str,dgram+cbyte,l);
+
+  *len_r= l;
+  *str_r= str;
+  *cbyte_io= cbyte+l;
+  
+  return adns_s_ok;
+}
+
 static adns_status csp_textdata(vbuf *vb, const char *dp, int len) {
   unsigned char ch;
   char buf[10];
@@ -73,8 +110,10 @@ static adns_status csp_textdata(vbuf *vb, const char *dp, int len) {
     ch= *dp++;
     if (ch >= 32 && ch <= 126 && ch != '"' && ch != '\\') {
       if (!adns__vbuf_append(vb,&ch,1)) R_NOMEM;
+    } else if (ch == '\\') {
+      CSP_ADDSTR("\\\\");
     } else {
-      sprintf(buf,"\\%02x",ch);
+      sprintf(buf,"\\x%02x",ch);
       CSP_ADDSTR(buf);
     }
   }
@@ -104,7 +143,7 @@ static adns_status cs_str(vbuf *vb, const void *datap) {
 }
 
 /*
- * _intstr  (mf,cs)
+ * _intstr  (mf,csp,cs)
  */
 
 static void mf_intstr(adns_query qu, void *datap) {
@@ -113,8 +152,7 @@ static void mf_intstr(adns_query qu, void *datap) {
   adns__makefinal_str(qu,&rrp->str);
 }
 
-static adns_status cs_intstr(vbuf *vb, const void *datap) {
-  const adns_rr_intstr *rrp= datap;
+static adns_status csp_intstr(vbuf *vb, const adns_rr_intstr *rrp) {
   char buf[10];
 
   sprintf(buf,"%u ",rrp->i);
@@ -122,6 +160,12 @@ static adns_status cs_intstr(vbuf *vb, const void *datap) {
   return csp_qstring(vb,rrp->str);
 }
 
+static adns_status cs_intstr(vbuf *vb, const void *datap) {
+  const adns_rr_intstr *rrp= datap;
+  
+  return csp_intstr(vb,rrp);
+}
+
 /*
  * _manyistr   (mf,cs)
  */
@@ -161,6 +205,7 @@ static adns_status pa_txt(const parseinfo *pai, int cbyte, int max, void *datap)
   adns_rr_intstr **rrp= datap, *table, *te;
   const byte *dgram= pai->dgram;
   int ti, tc, l, startbyte;
+  adns_status st;
 
   startbyte= cbyte;
   if (cbyte >= max) return adns_s_invaliddata;
@@ -168,6 +213,7 @@ static adns_status pa_txt(const parseinfo *pai, int cbyte, int max, void *datap)
   while (cbyte < max) {
     GET_B(cbyte,l);
     cbyte+= l;
+    tc++;
   }
   if (cbyte != max) return adns_s_invaliddata;
 
@@ -175,12 +221,8 @@ static adns_status pa_txt(const parseinfo *pai, int cbyte, int max, void *datap)
   if (!table) R_NOMEM;
 
   for (cbyte=startbyte, ti=0, te=table; ti<tc; ti++, te++) {
-    GET_B(cbyte,l);
-    te->str= adns__alloc_interim(pai->qu, l+1);
-    if (!te->str) R_NOMEM;
-    te->str[l]= 0;
-    memcpy(te->str,dgram+cbyte,l);
-    te->i= l;
+    st= pap_string(pai, &cbyte, max, &te->i, &te->str);
+    if (st) return st;
   }
   assert(cbyte == max);
 
@@ -228,26 +270,25 @@ static adns_status cs_inaddr(vbuf *vb, const void *datap) {
  */
 
 static adns_status pa_addr(const parseinfo *pai, int cbyte, int max, void *datap) {
-  adns_addr *storeto= datap;
+  adns_rr_addr *storeto= datap;
   const byte *dgram= pai->dgram;
 
   if (max-cbyte != 4) return adns_s_invaliddata;
   storeto->len= sizeof(storeto->addr.inet);
   memset(&storeto->addr,0,sizeof(storeto->addr.inet));
   storeto->addr.inet.sin_family= AF_INET;
-  storeto->addr.inet.sin_port= 0;
   memcpy(&storeto->addr.inet.sin_addr,dgram+cbyte,4);
   return adns_s_ok;
 }
 
 static int di_addr(const void *datap_a, const void *datap_b) {
-  const adns_addr *ap= datap_a, *bp= datap_b;
+  const adns_rr_addr *ap= datap_a, *bp= datap_b;
 
   assert(ap->addr.sa.sa_family == AF_INET);
   return dip_inaddr(ap->addr.inet.sin_addr,bp->addr.inet.sin_addr);
 }
 
-static adns_status csp_addr(vbuf *vb, const adns_addr *rrp) {
+static adns_status csp_addr(vbuf *vb, const adns_rr_addr *rrp) {
   const char *ia;
   static char buf[30];
 
@@ -266,7 +307,7 @@ static adns_status csp_addr(vbuf *vb, const adns_addr *rrp) {
 }
 
 static adns_status cs_addr(vbuf *vb, const void *datap) {
-  const adns_addr *rrp= datap;
+  const adns_rr_addr *rrp= datap;
 
   return csp_addr(vb,rrp);
 }
@@ -312,7 +353,7 @@ static adns_status pa_host_raw(const parseinfo *pai, int cbyte, int max, void *d
 }
 
 /*
- * _hostaddr   (pap,pa,dip,di,mfp,mf,csp,cs +pap_findaddrs)
+ * _hostaddr   (pap,pa,dip,di,mfp,mf,csp,cs +icb_hostaddr, pap_findaddrs)
  */
 
 static adns_status pap_findaddrs(const parseinfo *pai, adns_rr_hostaddr *ha,
@@ -332,23 +373,36 @@ static adns_status pap_findaddrs(const parseinfo *pai, adns_rr_hostaddr *ha,
     if (naddrs == -1) {
       naddrs= 0;
     }
-    if (!adns__vbuf_ensure(&pai->qu->vb, (naddrs+1)*sizeof(adns_addr))) R_NOMEM;
-    st= pa_addr(pai, rdstart,rdstart+rdlen, pai->qu->vb.buf + naddrs*sizeof(adns_addr));
+    if (!adns__vbuf_ensure(&pai->qu->vb, (naddrs+1)*sizeof(adns_rr_addr))) R_NOMEM;
+    st= pa_addr(pai, rdstart,rdstart+rdlen,
+		pai->qu->vb.buf + naddrs*sizeof(adns_rr_addr));
     if (st) return st;
     naddrs++;
   }
   if (naddrs >= 0) {
-    ha->addrs= adns__alloc_interim(pai->qu, naddrs*sizeof(adns_addr));
+    ha->addrs= adns__alloc_interim(pai->qu, naddrs*sizeof(adns_rr_addr));
     if (!ha->addrs) R_NOMEM;
-    memcpy(ha->addrs, pai->qu->vb.buf, naddrs*sizeof(adns_addr));
+    memcpy(ha->addrs, pai->qu->vb.buf, naddrs*sizeof(adns_rr_addr));
     ha->naddrs= naddrs;
     ha->astatus= adns_s_ok;
 
-    adns__isort(ha->addrs, naddrs, sizeof(adns_addr), pai->qu->vb.buf, di_addr);
+    adns__isort(ha->addrs, naddrs, sizeof(adns_rr_addr), pai->qu->vb.buf, di_addr);
   }
   return adns_s_ok;
 }
 
+static void icb_hostaddr(adns_query parent, adns_query child) {
+  adns_answer *cans= child->answer;
+  adns_rr_hostaddr *rrp= child->ctx.info.hostaddr;
+
+  rrp->astatus= cans->status;
+  rrp->naddrs= cans->nrrs;
+  rrp->addrs= cans->rrs.addr;
+  adns__transfer_interim(child, parent, rrp->addrs, rrp->naddrs*sizeof(adns_rr_addr));
+
+  if (!parent->children.head) adns__query_done(parent);
+}
+
 static adns_status pap_hostaddr(const parseinfo *pai, int *cbyte_io,
 				int max, adns_rr_hostaddr *rrp) {
   adns_status st;
@@ -381,8 +435,10 @@ static adns_status pap_hostaddr(const parseinfo *pai, int *cbyte_io,
 			    pai->dgram, pai->dglen, dmstart,
 			    adns_r_addr, adns_qf_quoteok_query);
   if (st) return st;
-  
-  ctx.hostaddr= rrp;
+
+  ctx.ext= 0;
+  ctx.callback= icb_hostaddr;
+  ctx.info.hostaddr= rrp;
   st= adns__internal_submit(pai->ads, &nqu, adns__findtype(adns_r_addr),
 			    &pai->qu->vb, id,
 			    adns_qf_quoteok_query, pai->now, 0, &ctx);
@@ -539,6 +595,247 @@ static adns_status cs_inthostaddr(vbuf *vb, const void *datap) {
 }
 
 /*
+ * _ptr   (pa, +icb_ptr)
+ */
+
+static void icb_ptr(adns_query parent, adns_query child) {
+  adns_answer *cans= child->answer;
+  const adns_rr_addr *queried, *found;
+  int i;
+
+  if (cans->status == adns_s_nxdomain || cans->status == adns_s_nodata) {
+    adns__query_fail(parent,adns_s_inconsistent);
+    return;
+  } else if (cans->status) {
+    adns__query_fail(parent,cans->status);
+    return;
+  }
+
+  queried= &parent->ctx.info.ptr_parent_addr;
+  for (i=0, found=cans->rrs.addr; i<cans->nrrs; i++, found++) {
+    if (queried->len == found->len &&
+	!memcmp(&queried->addr,&found->addr,queried->len)) {
+      if (!parent->children.head) adns__query_done(parent);
+      return;
+    }
+  }
+
+  adns__query_fail(parent,adns_s_inconsistent);
+}
+
+static adns_status pa_ptr(const parseinfo *pai, int dmstart, int max, void *datap) {
+  static const char *(expectdomain[])= { DNS_INADDR_ARPA };
+  
+  char **rrp= datap;
+  adns_status st;
+  adns_rr_addr *ap;
+  findlabel_state fls;
+  char *ep;
+  byte ipv[4];
+  char labbuf[4];
+  int cbyte, i, lablen, labstart, l, id;
+  adns_query nqu;
+  qcontext ctx;
+
+  cbyte= dmstart;
+  st= pap_domain(pai, &cbyte, max, rrp,
+		 pai->qu->flags & adns_qf_quoteok_anshost ? pdf_quoteok : 0);
+  if (st) return st;
+  if (cbyte != max) return adns_s_invaliddata;
+
+  ap= &pai->qu->ctx.info.ptr_parent_addr;
+  if (!ap->len) {
+    adns__findlabel_start(&fls, pai->ads, -1, pai->qu,
+			  pai->qu->query_dgram, pai->qu->query_dglen,
+			  pai->qu->query_dglen, DNS_HDRSIZE, 0);
+    for (i=0; i<4; i++) {
+      st= adns__findlabel_next(&fls,&lablen,&labstart); assert(!st);
+      if (lablen<=0 || lablen>3) return adns_s_querydomainwrong;
+      memcpy(labbuf, pai->qu->query_dgram + labstart, lablen);  labbuf[lablen]= 0;
+      ipv[3-i]= strtoul(labbuf,&ep,10);  if (*ep) return adns_s_querydomainwrong;
+      if (lablen>1 && pai->qu->query_dgram[labstart]=='0')
+	return adns_s_querydomainwrong;
+    }
+    for (i=0; i<sizeof(expectdomain)/sizeof(*expectdomain); i++) {
+      st= adns__findlabel_next(&fls,&lablen,&labstart); assert(!st);
+      l= strlen(expectdomain[i]);
+      if (lablen != l || memcmp(pai->qu->query_dgram + labstart, expectdomain[i], l))
+	return adns_s_querydomainwrong;
+    }
+    st= adns__findlabel_next(&fls,&lablen,0); assert(!st);
+    if (lablen) return adns_s_querydomainwrong;
+    
+    ap->len= sizeof(struct sockaddr_in);
+    memset(&ap->addr,0,sizeof(ap->addr.inet));
+    ap->addr.inet.sin_family= AF_INET;
+    ap->addr.inet.sin_addr.s_addr=
+      htonl((ipv[0]<<24) | (ipv[1]<<16) | (ipv[2]<<8) | (ipv[3]));
+  }
+
+  st= adns__mkquery_frdgram(pai->ads, &pai->qu->vb, &id,
+			    pai->dgram, pai->dglen, dmstart,
+			    adns_r_addr, adns_qf_quoteok_query);
+  if (st) return st;
+
+  ctx.ext= 0;
+  ctx.callback= icb_ptr;
+  memset(&ctx.info,0,sizeof(ctx.info));
+  st= adns__internal_submit(pai->ads, &nqu, adns__findtype(adns_r_addr),
+			    &pai->qu->vb, id,
+			    adns_qf_quoteok_query, pai->now, 0, &ctx);
+  if (st) return st;
+
+  nqu->parent= pai->qu;
+  LIST_LINK_TAIL_PART(pai->qu->children,nqu,siblings.);
+  
+  return adns_s_ok;
+}
+
+/*
+ * _strpair   (mf,cs)
+ */
+
+static void mf_strpair(adns_query qu, void *datap) {
+  adns_rr_strpair *rrp= datap;
+
+  adns__makefinal_str(qu,&rrp->array[0]);
+  adns__makefinal_str(qu,&rrp->array[1]);
+}
+
+static adns_status cs_strpair(vbuf *vb, const void *datap) {
+  const adns_rr_strpair *rrp= datap;
+  adns_status st;
+
+  st= csp_qstring(vb,rrp->array[0]);  if (st) return st;
+  CSP_ADDSTR(" ");
+  st= csp_qstring(vb,rrp->array[1]);  if (st) return st;
+
+  return adns_s_ok;
+}
+
+/*
+ * _intstrpair   (mf,cs)
+ */
+
+static void mf_intstrpair(adns_query qu, void *datap) {
+  adns_rr_intstrpair *rrp= datap;
+
+  adns__makefinal_str(qu,&rrp->array[0].str);
+  adns__makefinal_str(qu,&rrp->array[1].str);
+}
+
+static adns_status cs_intstrpair(vbuf *vb, const void *datap) {
+  const adns_rr_intstrpair *rrp= datap;
+  adns_status st;
+
+  st= csp_intstr(vb,&rrp->array[0]);  if (st) return st;
+  CSP_ADDSTR(" ");
+  st= csp_intstr(vb,&rrp->array[1]);  if (st) return st;
+
+  return adns_s_ok;
+}
+
+/*
+ * _hinfo   (pa)
+ */
+
+static adns_status pa_hinfo(const parseinfo *pai, int cbyte, int max, void *datap) {
+  adns_rr_intstrpair *rrp= datap;
+  adns_status st;
+  int i;
+
+  for (i=0; i<2; i++) {
+    st= pap_string(pai, &cbyte, max, &rrp->array[i].i, &rrp->array[i].str);
+    if (st) return st;
+  }
+
+  if (cbyte != max) return adns_s_invaliddata;
+  
+  return adns_s_ok;
+}
+
+/*
+ * _mailbox   (pap)
+ */
+
+static adns_status pap_mailbox(const parseinfo *pai, int *cbyte_io, int max,
+			       char **mb_r) {
+  return pap_domain(pai, cbyte_io, max, mb_r, pdf_quoteok);
+  /* fixme: mailbox quoting */
+}
+
+/*
+ * _rp   (pa)
+ */
+
+static adns_status pa_rp(const parseinfo *pai, int cbyte, int max, void *datap) {
+  adns_rr_strpair *rrp= datap;
+  adns_status st;
+
+  st= pap_mailbox(pai, &cbyte, max, &rrp->array[0]);
+  if (st) return st;
+
+  st= pap_domain(pai, &cbyte, max, &rrp->array[1], pdf_quoteok);
+  if (st) return st;
+
+  if (cbyte != max) return adns_s_invaliddata;
+  return adns_s_ok;
+}
+
+/*
+ * _soa   (pa,mf,cs)
+ */
+
+static adns_status pa_soa(const parseinfo *pai, int cbyte, int max, void *datap) {
+  adns_rr_soa *rrp= datap;
+  const byte *dgram= pai->dgram;
+  adns_status st;
+  int msw, lsw, i;
+
+  st= pap_domain(pai, &cbyte, max, &rrp->mname,
+		 pai->qu->flags & adns_qf_quoteok_anshost ? pdf_quoteok : 0);
+  if (st) return st;
+
+  st= pap_mailbox(pai, &cbyte, max, &rrp->rname);
+  if (st) return st;
+
+  if (cbyte+20 != max) return adns_s_invaliddata;
+  
+  for (i=0; i<5; i++) {
+    GET_W(cbyte,msw);
+    GET_W(cbyte,lsw);
+    (&rrp->serial)[i]= (msw<<16) | lsw;
+  }
+
+  return adns_s_ok;
+}
+
+static void mf_soa(adns_query qu, void *datap) {
+  adns_rr_soa *rrp= datap;
+
+  adns__makefinal_str(qu,&rrp->mname);
+  adns__makefinal_str(qu,&rrp->rname);
+}
+
+static adns_status cs_soa(vbuf *vb, const void *datap) {
+  const adns_rr_soa *rrp= datap;
+  char buf[20];
+  int i;
+  adns_status st;
+  
+  st= csp_qstring(vb,rrp->mname);  if (st) return st;
+  CSP_ADDSTR(" ");
+  st= csp_qstring(vb,rrp->rname);  if (st) return st;
+
+  for (i=0; i<5; i++) {
+    sprintf(buf," %lu",(&rrp->serial)[i]);
+    CSP_ADDSTR(buf);
+  }
+
+  return adns_s_ok;
+}
+
+/*
  * _flat   (mf)
  */
 
@@ -565,30 +862,20 @@ static const typeinfo typeinfos[] = {
   FLAT_TYPE(a,       "A",     0,      inaddr,      pa_inaddr,    di_inaddr   ),
   DEEP_TYPE(ns_raw,  "NS",   "raw",   str,         pa_host_raw,  0           ),
   DEEP_TYPE(cname,   "CNAME", 0,      str,         pa_host_raw,  0           ),
-#if 0
   DEEP_TYPE(soa_raw, "SOA",  "raw",   soa,         pa_soa,       0           ),
-#endif							     		 	     
   DEEP_TYPE(ptr_raw, "PTR",  "raw",   str,         pa_host_raw,  0           ),
-#if 0
-  DEEP_TYPE(hinfo,   "HINFO", 0,      strpair,     pa_hinfo,     0           ),
-#endif							     		 	     
+  DEEP_TYPE(hinfo,   "HINFO", 0,      intstrpair,  pa_hinfo,     0           ),
   DEEP_TYPE(mx_raw,  "MX",   "raw",   intstr,      pa_mx_raw,    di_mx_raw   ),
   DEEP_TYPE(txt,     "TXT",   0,      manyistr,    pa_txt,       0           ),
-#if 0
   DEEP_TYPE(rp_raw,  "RP",   "raw",   strpair,     pa_rp,        0           ),
-#endif							     		 	     
    		      	                                     		  	     
   FLAT_TYPE(addr,    "A",  "addr",    addr,        pa_addr,      di_addr     ),
   DEEP_TYPE(ns,      "NS", "+addr",   hostaddr,    pa_hostaddr,  di_hostaddr ),
-#if 0
   DEEP_TYPE(ptr,     "PTR","checked", str,         pa_ptr,       0           ),
-#endif
   DEEP_TYPE(mx,      "MX", "+addr",   inthostaddr, pa_mx,        di_mx       ),
    		      	                                  		   
-#if 0
-  DEEP_TYPE(soa,     "SOA","822",     soa,         pa_soa,        0          ),
-  DEEP_TYPE(rp,      "RP", "822",     strpair,     pa_rp,         0          ),
-#endif /* fixme - implement all types */
+  DEEP_TYPE(soa,     "SOA","822",     soa,         pa_soa,       0           ),
+  DEEP_TYPE(rp,      "RP", "822",     strpair,     pa_rp,        0           ),
 };
 
 const typeinfo *adns__findtype(adns_rrtype type) {