Restarting a TCP-using query doesn't abort.

[adns] / src / event.c

diff --git a/src/event.c b/src/event.c
index adb808b6709e0b73a9d1cd66d3e95c69f94477be..9e87429007404a87a44b0b4c639c21f314cfbcc7 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -59,7 +59,7 @@ void adns__tcp_broken(adns_state ads, const char *what, const char *why) {
   
   for (qu= ads->timew.head; qu; qu= nqu) {
     nqu= qu->next;
   
   for (qu= ads->timew.head; qu; qu= nqu) {
     nqu= qu->next;

-    if (qu->state == query_udp) continue;
+    if (qu->state == query_tosend) continue;

     assert(qu->state == query_tcpwait || qu->state == query_tcpsent);
     qu->state= query_tcpwait;
     qu->tcpfailed |= (1<<serv);
     assert(qu->state == query_tcpwait || qu->state == query_tcpsent);
     qu->state= query_tcpwait;
     qu->tcpfailed |= (1<<serv);


@@ -77,7 +77,7 @@ static void tcp_connected(adns_state ads, struct timeval now) {
   ads->tcpstate= server_ok;
   for (qu= ads->timew.head; qu; qu= nqu) {
     nqu= qu->next;
   ads->tcpstate= server_ok;
   for (qu= ads->timew.head; qu; qu= nqu) {
     nqu= qu->next;

-    if (qu->state == query_udp) continue;
+    if (qu->state == query_tosend) continue;

     assert (qu->state == query_tcpwait);
     adns__query_tcp(qu,now);
   }
     assert (qu->state == query_tcpwait);
     adns__query_tcp(qu,now);
   }


@@ -179,10 +179,10 @@ void adns__timeouts(adns_state ads, int act,
     } else {
       if (!act) continue;
       LIST_UNLINK(ads->timew,qu);
     } else {
       if (!act) continue;
       LIST_UNLINK(ads->timew,qu);

-      if (qu->state != query_udp) {
+      if (qu->state != query_tosend) {

        adns__query_fail(qu,adns_s_timeout);
       } else {
        adns__query_fail(qu,adns_s_timeout);
       } else {

-       adns__query_udp(qu,now);
+       adns__query_send(qu,now);

       }
       nqu= ads->timew.head;
     }
       }
       nqu= ads->timew.head;
     }