summaryrefslogtreecommitdiff
path: root/src/or/relay.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-04-06 06:43:21 +0000
committerNick Mathewson <nickm@torproject.org>2005-04-06 06:43:21 +0000
commit88dc243bb53d8e3a320d04ce525452e692df4fb6 (patch)
tree56a726cbf6579b1f9f973bf7e04d4a7e9cf3e9e7 /src/or/relay.c
parent716d9bc99ae876ffc108f1b172f13a9d68eb3d06 (diff)
downloadtor-88dc243bb53d8e3a320d04ce525452e692df4fb6.tar.gz
tor-88dc243bb53d8e3a320d04ce525452e692df4fb6.zip
Rename circuit_get_by_stream to circuit_get_by_edge_conn, and actually start using it. Watch out, kids!
svn:r4026
Diffstat (limited to 'src/or/relay.c')
-rw-r--r--src/or/relay.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/relay.c b/src/or/relay.c
index 5bc8dc46c3..c5554c2634 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1008,7 +1008,7 @@ int connection_edge_package_raw_inbuf(connection_t *conn, int package_partial) {
repeat_connection_edge_package_raw_inbuf:
- circ = circuit_get_by_conn(conn);
+ circ = circuit_get_by_edge_conn(conn);
if (!circ) {
log_fn(LOG_INFO,"conn has no circuit! Closing.");
return -1;
@@ -1085,7 +1085,7 @@ void connection_edge_consider_sending_sendme(connection_t *conn) {
if (connection_outbuf_too_full(conn))
return;
- circ = circuit_get_by_conn(conn);
+ circ = circuit_get_by_edge_conn(conn);
if (!circ) {
/* this can legitimately happen if the destroy has already
* arrived and torn down the circuit */