diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-02-11 17:23:11 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-02-11 17:23:11 +0000 |
| commit | 65dc835773f6f4ab47fe4bada7036f1a8b0c8e4a (patch) | |
| tree | 828bc757325a29d81cce87a7399898b69c850295 /src/or/eventdns.c | |
| parent | 6e4afe6f13b827b539b73e7e3126c6e36b877dd5 (diff) | |
| download | tor-65dc835773f6f4ab47fe4bada7036f1a8b0c8e4a.tar.gz tor-65dc835773f6f4ab47fe4bada7036f1a8b0c8e4a.zip | |
Revert an erroneous part of the non-fix to bug 326, and add comments to explain why it was erroneous.
svn:r18494
Diffstat (limited to 'src/or/eventdns.c')
| -rw-r--r-- | src/or/eventdns.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 5638d2d4a6..12a291d1b8 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -2046,9 +2046,10 @@ evdns_request_transmit(struct evdns_request *req) { nameserver_write_waiting(req->ns, 1); return 1; case 2: - /* failed in some other way */ + /* failed to transmit the request entirely. */ retcode = 1; - break; + /* fall through: we'll set a timeout, which will time out, + * and make us retransmit the request anyway. */ default: /* transmitted; we need to check for timeout. */ log(EVDNS_LOG_DEBUG, @@ -2060,11 +2061,10 @@ evdns_request_transmit(struct evdns_request *req) { (unsigned long) req); /* ???? Do more? */ } + req->tx_count++; + req->transmit_me = 0; + return retcode; } - - req->tx_count++; - req->transmit_me = 0; - return retcode; } static void |