All except rrtype-specific stuff complete but largely untest. That is

[adns.git] / src / submit.c

diff --git a/src/submit.c b/src/submit.c
index d29a14044911b27b7cdadf81606bc8acc0abed0d..a6d0e637bfe085ad3a2217cc92596b477ef6d6b9 100644 (file)
--- a/src/submit.c
+++ b/src/submit.c
@@ -13,14 +13,23 @@ static adns_query allocquery(adns_state ads, const char *owner, int ol,
                             adns_queryflags flags, const qcontext *ctx) {
   /* Query message used is the one assembled in ads->rqbuf */
   adns_query qu;
+  adns_answer *ans;
 
   qu= malloc(sizeof(*qu)+ol+1+ads->rqbuf.used); if (!qu) return 0;
+  
+  adns__vbuf_init(&qu->ans);
+  if (!adns__vbuf_ensure(&qu->ans,sizeof(adns_answer))) { free(qu); return 0; }
+  ans= (adns_answer*)qu->ans.buf;
+  ans->status= adns_s_ok;
+  ans->type= qu->typei->type;
+  ans->nrrs= 0;
+  ans->rrs.str= 0;
+  
   qu->state= query_udp;
   qu->next= qu->back= qu->parent= 0;
   LIST_INIT(qu->children);
   qu->siblings.next= qu->siblings.back= 0;
   qu->typei= typei;
-  adns__vbuf_init(&qu->answer);
   qu->id= id;
   qu->flags= flags;
   qu->udpretries= 0;
@@ -32,16 +41,16 @@ static adns_query allocquery(adns_state ads, const char *owner, int ol,
   qu->querymsg= qu->owner+ol+1;
   memcpy(qu->owner+ol+1,ads->rqbuf.buf,ads->rqbuf.used);
   qu->querylen= ads->rqbuf.used;
+  
   return qu;
 }
 
 static int failsubmit(adns_state ads, const qcontext *ctx, adns_query *query_r,
-                     adns_rrtype type, adns_queryflags flags,
-                     int id, adns_status stat) {
+                     adns_queryflags flags, int id, adns_status stat) {
   adns_query qu;
 
   ads->rqbuf.used= 0;
-  qu= allocquery(ads,0,0,id,type,flags,ctx); if (!qu) return errno;
+  qu= allocquery(ads,0,0,id,0,flags,ctx); if (!qu) return errno;
   adns__query_fail(ads,qu,stat);
   *query_r= qu;
   return 0;
@@ -58,23 +67,23 @@ int adns_submit(adns_state ads,
   int ol, id, r;
   qcontext ctx;
   struct timeval now;
-  const typeinfo typei;
+  const typeinfo *typei;
 
   ctx.ext= context;
   id= ads->nextid++;
 
   r= gettimeofday(&now,0); if (r) return errno;
 
-  typei= findtype(type);
-  if (!typei) return failsubmit(ads,context,query_r,0,flags,id,adns_s_notimplemented);
+  typei= adns__findtype(type);
+  if (!typei) return failsubmit(ads,context,query_r,flags,id,adns_s_notimplemented);
 
   ol= strlen(owner);
-  if (ol<=1 || ol>MAXDNAME+1)
-    return failsubmit(ads,context,query_r,0,flags,id,adns_s_invaliddomain);
+  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--; }
 
-  stat= adns__mkquery(ads,owner,ol,id,type,flags);
-  if (stat) return failsubmit(ads,context,query_r,type,flags,id,stat);
+  stat= adns__mkquery(ads,owner,ol,id,typei,flags);
+  if (stat) return failsubmit(ads,context,query_r,flags,id,stat);
   
   qu= allocquery(ads,owner,ol,id,typei,flags,&ctx); if (!qu) return errno;
   adns__query_udp(ads,qu,now);