Restarting a TCP-using query doesn't abort.

[adns] / src / reply.c

diff --git a/src/reply.c b/src/reply.c
index ab7c8ff4aadbc37c6cdb589baf43b49aa384cc88..96e43edca4d4b004e07c376b5b46c9388c70a783 100644 (file)
--- a/src/reply.c
+++ b/src/reply.c
@@ -170,7 +170,7 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
        if (!qu->vb.used) goto x_truncated;
        if (st) { adns__query_fail(qu,st); return; }
        l= strlen(qu->vb.buf)+1;
        if (!qu->vb.used) goto x_truncated;
        if (st) { adns__query_fail(qu,st); return; }
        l= strlen(qu->vb.buf)+1;

-       qu->answer->cname= adns__alloc_interim(qu,l);
+       qu->answer->cname= adns__alloc_preserved(qu,l);

        if (!qu->answer->cname) { adns__query_fail(qu,adns_s_nomemory); return; }
 
        qu->cname_dgram= adns__alloc_mine(qu,dglen);
        if (!qu->answer->cname) { adns__query_fail(qu,adns_s_nomemory); return; }
 
        qu->cname_dgram= adns__alloc_mine(qu,dglen);


@@ -307,7 +307,6 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
     LIST_LINK_TAIL(ads->childw,qu);
     return;
   }
     LIST_LINK_TAIL(ads->childw,qu);
     return;
   }

-

   adns__query_done(qu);
   return;
 
   adns__query_done(qu);
   return;
 


@@ -321,7 +320,6 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
   qu->flags |= adns_qf_usevc;
   
  x_restartquery:
   qu->flags |= adns_qf_usevc;
   
  x_restartquery:

-  

   if (qu->cname_dgram) {
     st= adns__mkquery_frdgram(qu->ads,&qu->vb,&qu->id,
                              qu->cname_dgram, qu->cname_dglen, qu->cname_begin,
   if (qu->cname_dgram) {
     st= adns__mkquery_frdgram(qu->ads,&qu->vb,&qu->id,
                              qu->cname_dgram, qu->cname_dglen, qu->cname_begin,


@@ -336,6 +334,7 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
     memcpy(newquery,qu->vb.buf,qu->vb.used);
   }
   
     memcpy(newquery,qu->vb.buf,qu->vb.used);
   }
   

-  adns__reset_cnameonly(qu);
-  adns__query_udp(qu,now);
+  if (qu->state == query_tcpsent) qu->state= query_tosend;
+  adns__reset_preserved(qu);
+  adns__query_send(qu,now);

 }
 }