Revert an erroneous part of the non-fix to bug 326, and add comments to explain why it was erroneous.

svn:r18494
This commit is contained in:
Nick Mathewson 2009-02-11 17:23:11 +00:00
parent 6e4afe6f13
commit 65dc835773
2 changed files with 9 additions and 6 deletions

View File

@ -16,6 +16,9 @@ Changes in version 0.2.1.13-????? - 2009-0?-??
logs. Bugfix on 0.2.1.8-alpha. logs. Bugfix on 0.2.1.8-alpha.
- Clients no longer cache certificates for authorities they do not - Clients no longer cache certificates for authorities they do not
recognize. Bugfix on 0.2.0.9-alpha. recognize. Bugfix on 0.2.0.9-alpha.
- When we can't transmit a DNS request due to a network error, retry
it after a while, and eventually transmit a failing response to the
RESOLVED cell. Bugfix on 0.1.2.5-alpha.
o Minor features: o Minor features:
- On Linux, use the prctl call to re-enable core dumps when the user - On Linux, use the prctl call to re-enable core dumps when the user

View File

@ -2046,9 +2046,10 @@ evdns_request_transmit(struct evdns_request *req) {
nameserver_write_waiting(req->ns, 1); nameserver_write_waiting(req->ns, 1);
return 1; return 1;
case 2: case 2:
/* failed in some other way */ /* failed to transmit the request entirely. */
retcode = 1; retcode = 1;
break; /* fall through: we'll set a timeout, which will time out,
* and make us retransmit the request anyway. */
default: default:
/* transmitted; we need to check for timeout. */ /* transmitted; we need to check for timeout. */
log(EVDNS_LOG_DEBUG, log(EVDNS_LOG_DEBUG,
@ -2060,11 +2061,10 @@ evdns_request_transmit(struct evdns_request *req) {
(unsigned long) req); (unsigned long) req);
/* ???? Do more? */ /* ???? Do more? */
} }
req->tx_count++;
req->transmit_me = 0;
return retcode;
} }
req->tx_count++;
req->transmit_me = 0;
return retcode;
} }
static void static void