Commit bfaab318 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

ares: better error return on timeouts 

Assisted-by: Ray Satiro

Bug: https://curl.haxx.se/mail/lib-2017-03/0009.html
parent f023f258

lib/asyn-ares.c

+9 −12
Original line number Original line Diff line number Diff line
@@ -368,7 +368,7 @@ CURLcode Curl_resolver_wait_resolv(struct connectdata *conn, 
    timeout = CURL_TIMEOUT_RESOLVE * 1000; /* default name resolve timeout */

    timeout = CURL_TIMEOUT_RESOLVE * 1000; /* default name resolve timeout */





  /* Wait for the name resolve query to complete. */

  /* Wait for the name resolve query to complete. */

  for(;;) {

  while(!result) {

    struct timeval *tvp, tv, store;

    struct timeval *tvp, tv, store;

    long timediff;

    long timediff;

    int itimeout;

    int itimeout;
@@ -390,28 +390,25 @@ CURLcode Curl_resolver_wait_resolv(struct connectdata *conn, 
      timeout_ms = 1000;

      timeout_ms = 1000;





    waitperform(conn, timeout_ms);

    waitperform(conn, timeout_ms);

    Curl_resolver_is_resolved(conn, &temp_entry);

    result = Curl_resolver_is_resolved(conn, &temp_entry);





    if(conn->async.done)

    if(result || conn->async.done)

      break;

      break;





    if(Curl_pgrsUpdate(conn)) {

    if(Curl_pgrsUpdate(conn))

      result = CURLE_ABORTED_BY_CALLBACK;

      result = CURLE_ABORTED_BY_CALLBACK;

      timeout = -1; /* trigger the cancel below */

    }

    else {

    else {

      struct timeval now2 = Curl_tvnow();

      struct timeval now2 = Curl_tvnow();

      timediff = Curl_tvdiff(now2, now); /* spent time */

      timediff = Curl_tvdiff(now2, now); /* spent time */

      timeout -= timediff?timediff:1; /* always deduct at least 1 */

      timeout -= timediff?timediff:1; /* always deduct at least 1 */

      now = now2; /* for next loop */

      now = now2; /* for next loop */

    }

    }



    if(timeout < 0)

    if(timeout < 0) {

      result = CURLE_OPERATION_TIMEDOUT;

      /* our timeout, so we cancel the ares operation */

      ares_cancel((ares_channel)data->state.resolver);

      break;

    }

  }

  }

  if(result)

    /* failure, so we cancel the ares operation */

    ares_cancel((ares_channel)data->state.resolver);





  /* Operation complete, if the lookup was successful we now have the entry

  /* Operation complete, if the lookup was successful we now have the entry

     in the cache. */

     in the cache. */