src/query.c: Remove flag hacking from adns_submit.

[adns] / src / query.c

diff --git a/src/query.c b/src/query.c
index 30108f2a6b7a24e2e3f8196ce8dbb0f4d72f83c7..71d635de0764438af8a396f92722523c57665a42 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -105,12 +105,8 @@ static void query_submit(adns_state ads, adns_query qu,
   qu->query_dglen= qu->vb.used;
   memcpy(qu->query_dgram,qu->vb.buf,qu->vb.used);
 
-  if (flags & adns__qf_nosend)
-    ;
-  else if (typei->query_send && !(flags & adns__qf_senddirect))
-    typei->query_send(qu,now);
-  else
-    adns__query_send(qu, now);
+  if (typei->query_send) typei->query_send(qu,now);
+  else adns__query_send(qu, now);
 }
 
 adns_status adns__internal_submit(adns_state ads, adns_query *query_r,
@@ -120,7 +116,7 @@ adns_status adns__internal_submit(adns_state ads, adns_query *query_r,
                                  const qcontext *ctx) {
   adns_query qu;
 
-  qu= query_alloc(ads,typei,type,flags & ~adns__qf_nosend,now);
+  qu= query_alloc(ads,typei,type,flags,now);
   if (!qu) { adns__vbuf_free(qumsg_vb); return adns_s_nomemory; }
   *query_r= qu;
 
@@ -227,9 +223,6 @@ int adns_submit(adns_state ads,
 
   adns__consistency(ads,0,cc_entex);
 
-  if (!(type & adns__qtf_bigaddr) || !(type & adns__qtf_manyaf))
-    flags = (flags & ~adns__qf_afmask) | adns_qf_ipv4_only;
-
   typei= adns__findtype(type);
   if (!typei) return ENOSYS;
 
@@ -238,7 +231,8 @@ int adns_submit(adns_state ads,
   
   qu->ctx.ext= context;
   qu->ctx.callback= 0;
-  memset(&qu->ctx.info,0,sizeof(qu->ctx.info));
+  memset(&qu->ctx.pinfo,0,sizeof(qu->ctx.pinfo));
+  memset(&qu->ctx.tinfo,0,sizeof(qu->ctx.tinfo));
 
   *query_r= qu;