aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_edge.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-06-11 00:17:02 +0000
committerRoger Dingledine <arma@torproject.org>2008-06-11 00:17:02 +0000
commit42f21007a34ed5f0474e7eccd0991f1d8c5423f0 (patch)
treeec27d9696db791d93734ea49173520575b60de06 /src/or/connection_edge.c
parentf6997c64c04395ce7636d95541194d40a95fe96d (diff)
downloadtor-42f21007a34ed5f0474e7eccd0991f1d8c5423f0.tar
tor-42f21007a34ed5f0474e7eccd0991f1d8c5423f0.tar.gz
consolidate all our edge/circ/orconn reason-to-foo-or-back functions
svn:r15115
Diffstat (limited to 'src/or/connection_edge.c')
-rw-r--r--src/or/connection_edge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 2dae1868d..84f80eb18 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -236,7 +236,7 @@ connection_edge_end_errno(edge_connection_t *conn)
{
uint8_t reason;
tor_assert(conn);
- reason = (uint8_t)errno_to_end_stream_reason(tor_socket_errno(conn->_base.s));
+ reason = (uint8_t)errno_to_stream_end_reason(tor_socket_errno(conn->_base.s));
return connection_edge_end(conn, reason);
}
@@ -2312,7 +2312,7 @@ connection_ap_handshake_socks_reply(edge_connection_t *conn, char *reply,
{
char buf[256];
socks5_reply_status_t status =
- connection_edge_end_reason_socks5_response(endreason);
+ stream_end_reason_to_socks5_response(endreason);
tor_assert(conn->socks_request); /* make sure it's an AP stream */