X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=src%2Fquery.c;h=f8feef7dae6c82171edd0d332ed6b93747459837;hp=d3139dd1e6e48c797bf5f54471c808096fc1de8a;hb=3955725ceceb330041f8e7a27e6629a2e8a9b5ba;hpb=98a3f706175de88b2c9f0729b405330457ae680b

diff --git a/src/query.c b/src/query.c
index d3139dd..f8feef7 100644
--- a/src/query.c
+++ b/src/query.c
@@ -1,204 +1,244 @@
-/**/
+/*
+ * query.c
+ * - overall query management (allocation, completion)
+ * - per-query memory management
+ * - query submission and cancellation (user-visible and internal)
+ */
+/*
+ *  This file is part of adns, which is Copyright (C) 1997, 1998 Ian Jackson
+ *  
+ *  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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software Foundation,
+ *  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+ */
+
+#include "internal.h"
 
-#include <errno.h>
-#include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
 
-#include <sys/uio.h>
+#include <sys/time.h>
 
 #include "internal.h"
 
-adns_status adns__mkquery(adns_state ads, const char *owner, int ol, int id,
-			  const typeinfo *typei, adns_queryflags flags) {
-  /* Assembles a query packet in ads->rqbuf. */
-  int ll, c, nlabs;
-  byte label[255], *rqp;
-  const char *p, *pe;
-
-#define MKQUERY_ADDB(b) *rqp++= (b)
-#define MKQUERY_ADDW(w) (MKQUERY_ADDB(((w)>>8)&0x0ff), MKQUERY_ADDB((w)&0x0ff))
-
-  if (!adns__vbuf_ensure(&ads->rqbuf,DNS_HDRSIZE+strlen(owner)+1+5))
-    return adns_s_nolocalmem;
-  rqp= ads->rqbuf.buf;
-
-  MKQUERY_ADDW(id);
-  MKQUERY_ADDB(0x01); /* QR=Q(0), OPCODE=QUERY(0000), !AA, !TC, RD */
-  MKQUERY_ADDB(0x00); /* !RA, Z=000, RCODE=NOERROR(0000) */
-  MKQUERY_ADDW(1); /* QDCOUNT=1 */
-  MKQUERY_ADDW(0); /* ANCOUNT=0 */
-  MKQUERY_ADDW(0); /* NSCOUNT=0 */
-  MKQUERY_ADDW(0); /* ARCOUNT=0 */
-  p= owner; pe= owner+ol;
-  nlabs= 0;
-  if (!*p) return adns_s_invaliddomain;
-  do {
-    ll= 0;
-    while (p!=pe && (c= *p++)!='.') {
-      if (c=='\\') {
-	if (!(flags & adns_qf_anyquote)) return adns_s_invaliddomain;
-	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_invaliddomain;
-	  } else {
-	    return adns_s_invaliddomain;
-	  }
-	} else if (!(c= *p++)) {
-	  return adns_s_invaliddomain;
-	}
-      }
-      if (!(flags & adns_qf_anyquote)) {
-	if (ctype_digit(c) || c == '-') {
-	  if (!ll) return adns_s_invaliddomain;
-	} else if (!ctype_alpha(c)) {
-	  return adns_s_invaliddomain;
-	}
-      }
-      if (ll == sizeof(label)) return adns_s_invaliddomain;
-      label[ll++]= c;
-    }
-    if (!ll) return adns_s_invaliddomain;
-    if (nlabs++ > 63) return adns_s_invaliddomain;
-    MKQUERY_ADDB(ll);
-    memcpy(rqp,label,ll); rqp+= ll;
-  } while (p!=pe);
-
-  MKQUERY_ADDB(0);
-  MKQUERY_ADDW(typei->type & adns__rrt_typemask); /* QTYPE */
-  MKQUERY_ADDW(DNS_CLASS_IN); /* QCLASS=IN */
-
-  ads->rqbuf.used= rqp - ads->rqbuf.buf;
-  assert(ads->rqbuf.used <= ads->rqbuf.avail);
+int adns__internal_submit(adns_state ads, adns_query *query_r,
+			  const typeinfo *typei, vbuf *qumsg_vb, int id,
+			  adns_queryflags flags, struct timeval now,
+			  adns_status failstat, const qcontext *ctx) {
+  adns_query qu;
+
+  qu= malloc(sizeof(*qu)); if (!qu) goto x_nomemory;
+  qu->answer= malloc(sizeof(*qu->answer)); if (!qu->answer) goto x_freequ_nomemory;
+
+  qu->ads= ads;
+  qu->state= query_udp;
+  qu->back= qu->next= qu->parent= 0;
+  LIST_INIT(qu->children);
+  qu->siblings.next= qu->siblings.back= 0;
+  qu->allocations= 0;
+  qu->interim_allocd= 0;
+  qu->final_allocspace= 0;
+
+  qu->typei= typei;
+  adns__vbuf_init(&qu->vb);
+
+  qu->cname_dgram= 0;
+  qu->cname_dglen= qu->cname_begin= 0;
   
+  qu->id= id;
+  qu->flags= flags;
+  qu->udpretries= 0;
+  qu->udpnextserver= 0;
+  qu->udpsent= qu->tcpfailed= 0;
+  timerclear(&qu->timeout);
+  memcpy(&qu->context,ctx,sizeof(qu->context));
+
+  qu->answer->status= adns_s_ok;
+  qu->answer->cname= 0;
+  qu->answer->type= typei->type;
+  qu->answer->nrrs= 0;
+  qu->answer->rrs= 0;
+  qu->answer->rrsz= typei->rrsz;
+  
+  *query_r= qu;
+
+  qu->query_dgram= malloc(qumsg_vb->used);
+  if (!qu->query_dgram) {
+    adns__query_fail(qu,adns_s_nolocalmem);
+    return adns_s_ok;
+  }
+  memcpy(qu->query_dgram,qumsg_vb->buf,qumsg_vb->used);
+  qu->vb= *qumsg_vb;
+  adns__vbuf_init(qumsg_vb);
+  
+  if (failstat) {
+    adns__query_fail(qu,failstat);
+    return adns_s_ok;
+  }
+  adns__query_udp(qu,now);
+  adns__autosys(ads,now);
+
   return adns_s_ok;
+
+ x_freequ_nomemory:
+  free(qu);
+ x_nomemory:
+  adns__vbuf_free(qumsg_vb);
+  return adns_s_nolocalmem;
 }
 
-void adns__query_tcp(adns_state ads, adns_query qu, struct timeval now) {
-  /* Query must be in state tcpwait/timew; it will be moved to a new state
-   * if possible and no further processing can be done on it for now.
-   * (Resulting state is one of tcpwait/timew (if server not connected),
-   *  tcpsent/timew, child/childw or done/output.)
-   *
-   * adns__tcp_tryconnect should already have been called - _tcp
-   * will only use an existing connection (if there is one), which it
-   * may break.  If the conn list lost then the caller is responsible for any
-   * reestablishment and retry.
-   */
-  byte length[2];
-  struct iovec iov[2];
-  int wr, r;
+int adns_submit(adns_state ads,
+		const char *owner,
+		adns_rrtype type,
+		adns_queryflags flags,
+		void *context,
+		adns_query *query_r) {
+  qcontext ctx;
+  int id, r, ol;
+  vbuf vb;
+  adns_status stat;
+  const typeinfo *typei;
+  struct timeval now;
+
+  typei= adns__findtype(type);
+  if (!typei) return adns_s_notimplemented;
+  
+  ctx.ext= context;
+  r= gettimeofday(&now,0); if (r) return errno;
+  id= 0;
+
+  adns__vbuf_init(&vb);
 
-  if (ads->tcpstate != server_ok) return;
+  ol= strlen(owner);
+  if (ol<=1 || ol>DNS_MAXDOMAIN+1) { stat= adns_s_invaliddomain; goto xit; }
+				 
+  if (owner[ol-1]=='.' && owner[ol-2]!='\\') { flags &= ~adns_qf_search; ol--; }
 
-  length[0]= (qu->querylen&0x0ff00U) >>8;
-  length[1]= (qu->querylen&0x0ff);
+  stat= adns__mkquery(ads,&vb,&id, owner,ol, typei,flags);
+			
+ xit:
+  return adns__internal_submit(ads,query_r, typei,&vb,id, flags,now, stat,&ctx);	
+}
+
+int adns_synchronous(adns_state ads,
+		     const char *owner,
+		     adns_rrtype type,
+		     adns_queryflags flags,
+		     adns_answer **answer_r) {
+  adns_query qu;
+  int r;
   
-  if (!adns__vbuf_ensure(&ads->tcpsend,ads->tcpsend.used+qu->querylen+2)) return;
-
-  timevaladd(&now,TCPMS);
-  qu->timeout= now;
-  qu->state= query_tcpsent;
-  LIST_LINK_TAIL(ads->timew,qu);
-
-  if (ads->tcpsend.used) {
-    wr= 0;
-  } else {
-    iov[0].iov_base= length;
-    iov[0].iov_len= 2;
-    iov[1].iov_base= qu->querymsg;
-    iov[1].iov_len= qu->querylen;
-    wr= writev(ads->tcpsocket,iov,2);
-    if (wr < 0) {
-      if (!(errno == EAGAIN || errno == EINTR || errno == ENOSPC ||
-	    errno == ENOBUFS || errno == ENOMEM)) {
-	adns__tcp_broken(ads,"write",strerror(errno));
-	return;
-      }
-      wr= 0;
-    }
-  }
+  r= adns_submit(ads,owner,type,flags,0,&qu);
+  if (r) return r;
 
-  if (wr<2) {
-    r= adns__vbuf_append(&ads->tcpsend,length,2-wr); assert(r);
-    wr= 0;
-  } else {
-    wr-= 2;
-  }
-  if (wr<qu->querylen) {
-    r= adns__vbuf_append(&ads->tcpsend,qu->querymsg+wr,qu->querylen-wr); assert(r);
-  }
+  do {
+    r= adns_wait(ads,&qu,answer_r,0);
+  } while (r==EINTR);
+  if (r) adns_cancel(qu);
+  return r;
 }
 
-static void query_usetcp(adns_state ads, adns_query qu, struct timeval now) {
-  timevaladd(&now,TCPMS);
-  qu->timeout= now;
-  qu->state= query_tcpwait;
-  LIST_LINK_TAIL(ads->timew,qu);
-  adns__query_tcp(ads,qu,now);
-  adns__tcp_tryconnect(ads,now);
+void adns_cancel(adns_query query) {
+  abort(); /* fixme */
 }
 
-void adns__query_udp(adns_state ads, adns_query qu, struct timeval now) {
-  /* Query must be in state udp/NONE; it will be moved to a new state,
-   * and no further processing can be done on it for now.
-   * (Resulting state is one of udp/timew, tcpwait/timew (if server not connected),
-   *  tcpsent/timew, child/childw or done/output.)
-   */
-  struct sockaddr_in servaddr;
-  int serv, r;
+void *adns__alloc_interim(adns_query qu, size_t sz) {
+  allocnode *an;
 
-  assert(qu->state == query_udp);
-  if ((qu->flags & adns_qf_usevc) || (qu->querylen > DNS_MAXUDP)) {
-    query_usetcp(ads,qu,now);
-    return;
+  assert(!qu->final_allocspace);
+  sz= MEM_ROUND(sz);
+  an= malloc(MEM_ROUND(MEM_ROUND(sizeof(*an)) + sz));
+  if (!an) {
+    adns__query_fail(qu,adns_s_nolocalmem);
+    return 0;
   }
+  qu->interim_allocd += sz;
+  an->next= qu->allocations;
+  qu->allocations= an;
+  return (byte*)an + MEM_ROUND(sizeof(*an));
+}
 
-  if (qu->udpretries >= UDPMAXRETRIES) {
-    adns__query_fail(ads,qu,adns_s_timeout);
-    return;
-  }
+void *adns__alloc_final(adns_query qu, size_t sz) {
+  /* When we're in the _final stage, we _subtract_ from interim_alloc'd
+   * each allocation, and use final_allocspace to point to the next free
+   * bit.
+   */
+  void *rp;
+
+  sz= MEM_ROUND(sz);
+  rp= qu->final_allocspace;
+  assert(rp);
+  qu->interim_allocd -= sz;
+  assert(qu->interim_allocd>=0);
+  qu->final_allocspace= (byte*)rp + sz;
+  return rp;
+}
 
-  serv= qu->udpnextserver;
-  memset(&servaddr,0,sizeof(servaddr));
-  servaddr.sin_family= AF_INET;
-  servaddr.sin_addr= ads->servers[serv].addr;
-  servaddr.sin_port= htons(DNS_PORT);
-  
-  r= sendto(ads->udpsocket,qu->querymsg,qu->querylen,0,&servaddr,sizeof(servaddr));
-  if (r<0 && errno == EMSGSIZE) { query_usetcp(ads,qu,now); return; }
-  if (r<0) adns__warn(ads,serv,"sendto failed: %s",strerror(errno));
-  
-  timevaladd(&now,UDPRETRYMS);
-  qu->timeout= now;
-  qu->udpsent |= (1<<serv);
-  qu->udpnextserver= (serv+1)%ads->nservers;
-  qu->udpretries++;
-  LIST_LINK_TAIL(ads->timew,qu);
+void adns__reset_cnameonly(adns_query qu) {
+  assert(qu->final_allocspace);
+  qu->answer->nrrs= 0;
+  qu->answer->rrs= 0;
+  qu->interim_allocd= qu->answer->cname ? MEM_ROUND(strlen(qu->answer->cname)+1) : 0;
 }
 
-void adns__query_finish(adns_state ads, adns_query qu, adns_status stat) {
+void adns__query_done(adns_query qu) {
   adns_answer *ans;
-  byte *newbuf;
-
-  newbuf= realloc(qu->ans.buf,qu->ans.used);
-  if (newbuf) qu->ans.buf= newbuf;
-  ans= (adns_answer*)qu->ans.buf;
-  ans->status= stat;
-  ans->cname= qu->cnameoff<0 ? 0 : qu->ans.buf + qu->cnameoff;
-  ans->rrs.str= qu->rrsoff<0 ? 0 : (char **)(qu->ans.buf + qu->rrsoff);
+  allocnode *an, *ann;
+  int i;
+
+  qu->answer= ans= realloc(qu->answer,
+			   MEM_ROUND(MEM_ROUND(sizeof(*ans)) +
+				     qu->interim_allocd));
+  qu->final_allocspace= (byte*)qu->answer + MEM_ROUND(sizeof(*ans));
+
+  adns__makefinal_str(qu,&ans->cname);
+  if (ans->nrrs) {
+    adns__makefinal_block(qu,&ans->rrs.untyped,ans->rrsz*ans->nrrs);
+    for (i=0; i<ans->nrrs; i++)
+      qu->typei->makefinal(qu,ans->rrs.bytes+ans->rrsz*i);
+  }
+
+  for (an= qu->allocations; an; an= ann) { ann= an->next; free(an); }
+
+  adns__vbuf_free(&qu->vb);
+  
   qu->id= -1;
-  LIST_LINK_TAIL(ads->output,qu);
+  LIST_LINK_TAIL(qu->ads->output,qu);
 }
 
-void adns__query_fail(adns_state ads, adns_query qu, adns_status stat) {
-  adns_answer *ans;
+void adns__query_fail(adns_query qu, adns_status stat) {
+  adns__reset_cnameonly(qu);
+  qu->answer->status= stat;
+  adns__query_done(qu);
+}
 
-  qu->ans.used= sizeof(adns_answer);
-  qu->cnameoff= -1;
-  qu->rrsoff= -1;
-  ans= (adns_answer*)qu->ans.buf;
-  ans->nrrs= 0;
+void adns__makefinal_str(adns_query qu, char **strp) {
+  int l;
+  char *before, *after;
 
-  adns__query_finish(ads,qu,stat);
+  before= *strp;
+  l= strlen(before)+1;
+  after= adns__alloc_final(qu,l);
+  memcpy(after,before,l);
+  *strp= after;  
 }
+
+void adns__makefinal_block(adns_query qu, void **blpp, size_t sz) {
+  void *after;
+
+  after= adns__alloc_final(qu,sz);
+  memcpy(after,*blpp,sz);
+  *blpp= after;
+}
+