X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/ddfda8613e6fd8b49d8532a6d34d26df29add034..8e5b0abb4e5416f4bd244500d9ba8dd45788093e:/src/submit.c

diff --git a/src/submit.c b/src/submit.c
index b1fd51e..ee73b37 100644
--- a/src/submit.c
+++ b/src/submit.c
@@ -1,41 +1,95 @@
 /**/
 
-#include "adns-internal.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
 
-static adns_query allocquery(adns_state ads, const char *owner, int ol,
-			     int qml, int id, adns_rrtype type,
-			     adns_queryflags flags, void *context) {
+#include <sys/time.h>
+
+#include "internal.h"
+
+int adns__internal_submit(adns_state ads, adns_query *query_r,
+			  adns_rrtype type, char *query_dgram, int query_len,
+			  adns_queryflags flags, struct timeval now,
+			  adns_status failstat, const qcontext *ctx) {
+  /* Submits a query (for internal use, called during external submits).
+   *
+   * The new query is returned in *query_r, or we return adns_s_nomemory.
+   *
+   * The query datagram should already have been assembled; memory for it
+   * is taken over by this routine whether it succeeds or fails.
+   *
+   * If failstat is nonzero then if we are successful in creating the query
+   * it is immediately failed with code failstat (but _submit still succeds).
+   *
+   * ctx is copied byte-for-byte into the query.
+   */
   adns_query qu;
-  unsigned char *qm;
-  
-  qu= malloc(sizeof(*qu)+ol+1+qml); if (!qu) return 0;
-  qu->next= qu->back= qu->parent= 0;
-  qu->children.head= qu->children.tail= 0;
+  adns_status stat;
+  int ol, id, r;
+  struct timeval now;
+  const typeinfo *typei;
+  adns_query qu;
+
+  id= ads->nextid++;
+
+  qu= malloc(sizeof(*qu)); if (!qu) goto x_nomemory;
+  qu->answer= malloc(sizeof(*qu->answer)); if (!qu->answer) goto x_freequ_nomemory;
+
+  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->perm_used= 0;
+
+  qu->typei= adns__findtype(type);
+  qu->query_dgram= query_dgram;
+  qu->query_dglen= query_dglen;
+  adns__vbuf_init(&qu->vb);
+
+  qu->cname_dgram= 0;
+  qu->cname_dglen= qu->cname_begin= 0;
+  
   qu->id= id;
-  qu->type= type;
-  qu->answer= 0;
   qu->flags= flags;
-  qu->context= context;
   qu->udpretries= 0;
-  qu->sentudp= qu->senttcp= 0;
-  qu->nextserver= 0;
+  qu->udpnextserver= 0;
+  qu->udpsent= qu->tcpfailed= 0;
+  timerclear(&qu->timeout);
+  memcpy(&qu->context,ctx,sizeof(qu->context));
   memcpy(qu->owner,owner,ol); qu->owner[ol]= 0;
-  qu->querymsg= qm= qu->owner+ol+1;
-  memcpy(qm,ads->qbuf,qml);
-  qu->querylen= qml;
-  return qu;
-}
 
-static int failsubmit(adns_state ads, void *context, adns_query *query_r,
-		      adns_rrtype type, adns_queryflags flags,
-		      int id, adns_status stat) {
-  adns_query qu;
+  qu->answer->status= adns_s_ok;
+  qu->answer->cname= 0;
+  qu->answer->type= type;
+  qu->answer->nrrs= 0;
+  qu->answer->rrs= 0;
 
-  qu= allocquery(ads,0,0,0,id,type,flags,context); if (!qu) return errno;
-  query_fail(ads,qu,stat);
   *query_r= qu;
+
+  if (qu->typei) {
+    qu->answer->rrsz= qu->rrsz;
+  } else {
+    qu->answer->rrsz= -1;
+    failstat= adns_s_notimplemented;
+  }
+  if (failstat) {
+    adns__query_fail(ads,qu,failstat);
+    return;
+  }
+
+  adns__query_udp(ads,qu,now);
+  adns__autosys(ads,now);
+
   return 0;
+
+ x_freequ_nomemory:
+  free(qu);
+ x_nomemory:
+  free(query_dgram);
+  return adns_s_nomemory;
 }
 
 int adns_submit(adns_state ads,
@@ -44,28 +98,20 @@ int adns_submit(adns_state ads,
 		adns_queryflags flags,
 		void *context,
 		adns_query *query_r) {
-  adns_query qu;
-  adns_status stat;
-  int ol, id, qml;
-
-  id= ads->nextid++;
+  qcontext ctx;
 
+  ctx.ext= context;
   r= gettimeofday(&now,0); if (r) return errno;
 
   ol= strlen(owner);
-  if (ol<=1 || ol>MAXDNAME+1)
-    return failsubmit(ads,context,query_r,type,flags,id,adns_s_invaliddomain);
-  if (owner[ol-1]=='.' && owner[ol-2]!='\\') { flags &= ~adns_f_search; ol--; }
-
-  stat= adns__mkquery(ads,owner,ol,id,type,flags,&qml);
-  if (stat) return failsubmit(ads,context,query_r,type,flags,id,stat);
+  if (ol<=1 || ol>DNS_MAXDOMAIN+1)
+    return failsubmit(ads,context,query_r,flags,id,adns_s_invaliddomain);
+  if (owner[ol-1]=='.' && owner[ol-2]!='\\') { flags &= ~adns_qf_search; ol--; }
 
-  qu= allocquery(ads,owner,ol,qml,id,type,flags,context); if (!qu) return errno;
-  adns__query_udp(ads,qu,now);
-  autosys(ads,now);
-
-  *query_r= qu;
-  return 0;
+  stat= adns__mkquery(ads,owner,ol,id,typei,flags);
+  if (stat) return failsubmit(ads,context,query_r,flags,id,stat);
+  
+  adns__internal_submit(ads,type,flags,now,query_r
 }
 
 int adns_synchronous(adns_state ads,
@@ -87,5 +133,20 @@ int adns_synchronous(adns_state ads,
 }
 
 void adns_cancel(adns_state ads, adns_query query) {
-  abort(); /* FIXME */
+  abort(); /* fixme */
+}
+
+void *adns__alloc_interim(adns_state ads, adns_query qu, size_t sz) {
+  allocnode *an;
+
+  sz= MEM_ROUND(sz);
+  an= malloc(MEM_ROUND(MEM_ROUND(sizeof(*an)) + sz));
+  if (!an) {
+    adns__query_fail(ads,qu,adns_s_nolocalmem);
+    return 0;
+  }
+  qu->permalloclen += sz;
+  an->next= qu->allocations;
+  qu->allocations= an;
+  return (byte*)an + MEM_ROUND(sizeof(*an));
 }