diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-02-27 23:23:33 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-02-27 23:23:33 +0000 |
| commit | 611f117ce1bfd8ed39be622f394e925bc13b8252 (patch) | |
| tree | 687de53819e90e9f044c072d1b7df67faf683f33 /src/or/connection.c | |
| parent | c5bbb571d2a27d0b81bfe7a1d374ba965497f267 (diff) | |
| download | tor-611f117ce1bfd8ed39be622f394e925bc13b8252.tar.gz tor-611f117ce1bfd8ed39be622f394e925bc13b8252.zip | |
patches/answers to nick's commit
svn:r1146
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 5917c0a577..134836c447 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -350,10 +350,11 @@ int connection_connect(connection_t *conn, char *address, uint32_t addr, uint16_ } static void listener_close_if_present(int type) { + connection_t *conn; assert(type == CONN_TYPE_OR_LISTENER || type == CONN_TYPE_AP_LISTENER || type == CONN_TYPE_DIR_LISTENER); - connection_t *conn = connection_get_by_type(type); + conn = connection_get_by_type(type); if (conn) { close(conn->s); conn->s = -1; @@ -736,10 +737,6 @@ int connection_send_destroy(uint16_t circ_id, connection_t *conn) { if(!connection_speaks_cells(conn)) { log_fn(LOG_INFO,"CircID %d: At an edge. Marking connection for close.", circ_id); - if(conn->type == CONN_TYPE_EXIT && conn->state == EXIT_CONN_STATE_RESOLVING) { - log_fn(LOG_INFO,"...and informing resolver we don't want the answer anymore."); - dns_cancel_pending_resolve(conn->address, conn); - } connection_mark_for_close(conn, END_STREAM_REASON_DESTROY); return 0; } |