diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-06-11 00:17:02 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-06-11 00:17:02 +0000 |
| commit | 42f21007a34ed5f0474e7eccd0991f1d8c5423f0 (patch) | |
| tree | ec27d9696db791d93734ea49173520575b60de06 /src/or/connection.c | |
| parent | f6997c64c04395ce7636d95541194d40a95fe96d (diff) | |
| download | tor-42f21007a34ed5f0474e7eccd0991f1d8c5423f0.tar.gz tor-42f21007a34ed5f0474e7eccd0991f1d8c5423f0.zip | |
consolidate all our edge/circ/orconn reason-to-foo-or-back functions
svn:r15115
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 0a6c69f2d0..8cbead64e3 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -504,7 +504,7 @@ connection_about_to_close_connection(connection_t *conn) control_event_bootstrap_problem( tor_socket_strerror(or_conn->socket_error), 0); } else { - int reason = control_tls_error_to_reason(or_conn->tls_error); + int reason = tls_error_to_orconn_end_reason(or_conn->tls_error); control_event_or_conn_status(or_conn, OR_CONN_EVENT_FAILED, reason); control_event_bootstrap_problem("foo", reason); @@ -518,11 +518,11 @@ connection_about_to_close_connection(connection_t *conn) * closing a connection. */ rep_hist_note_disconnect(or_conn->identity_digest, now); control_event_or_conn_status(or_conn, OR_CONN_EVENT_CLOSED, - control_tls_error_to_reason(or_conn->tls_error)); + tls_error_to_orconn_end_reason(or_conn->tls_error)); } else if (or_conn->identity_digest) { rep_hist_note_connection_died(or_conn->identity_digest, now); control_event_or_conn_status(or_conn, OR_CONN_EVENT_CLOSED, - control_tls_error_to_reason(or_conn->tls_error)); + tls_error_to_orconn_end_reason(or_conn->tls_error)); } /* Now close all the attached circuits on it. */ circuit_unlink_all_from_or_conn(TO_OR_CONN(conn), |