diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-02-28 22:23:44 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-02-28 22:23:44 +0000 |
| commit | 0a673f44910e088f03eab4d3f9aeb963e02ee40a (patch) | |
| tree | 0f8e5efb62c4d70435b0fea31937b8d9ef551ced /src/or/connection.c | |
| parent | 9a557007475a9f8c79d4e6bbb56195fd0a81d60b (diff) | |
| download | tor-0a673f44910e088f03eab4d3f9aeb963e02ee40a.tar tor-0a673f44910e088f03eab4d3f9aeb963e02ee40a.tar.gz | |
Split dns_cancel_pending_resolve into dns_cancel_pending_resolve (kill a
resolve in response to a DNS worker dying) and connection_dns_remove (remove
a pending connection from the resolve structure.)
svn:r1168
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 9c0ac58e1..526d2aafc 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -182,14 +182,14 @@ _connection_mark_for_close(connection_t *conn, char reason) case CONN_TYPE_EXIT: case CONN_TYPE_AP: if (conn->state == EXIT_CONN_STATE_RESOLVING) - dns_cancel_pending_resolve(conn->address, conn); + connection_dns_remove(conn); if (!conn->has_sent_end && reason && connection_edge_end(conn, reason, conn->cpath_layer) < 0) return -1; break; case CONN_TYPE_DNSWORKER: if (conn->state == DNSWORKER_STATE_BUSY) { - dns_cancel_pending_resolve(conn->address, NULL); + dns_cancel_pending_resolve(conn->address); } break; default: |