aboutsummaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-06-09 05:17:33 +0000
committerRoger Dingledine <arma@torproject.org>2007-06-09 05:17:33 +0000
commiteebeda2c7123e69c7c3fb5e31a6293cf01245ba0 (patch)
tree431acbec958437cb698cf66b2f12d0d23d74c6d6 /src/or/directory.c
parent15270358eb078f87397234ec688a9b2a3c0404fa (diff)
downloadtor-eebeda2c7123e69c7c3fb5e31a6293cf01245ba0.tar.gz
tor-eebeda2c7123e69c7c3fb5e31a6293cf01245ba0.zip
scrub out some more references to the misnamed 'bridge' concept
svn:r10543
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index 03acbfe2c3..3290b0f4f8 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -538,20 +538,20 @@ directory_initiate_command(const char *address, uint32_t addr,
*/
conn->dirconn_direct = 0;
linked_conn =
- connection_ap_make_bridge(conn->_base.address, conn->_base.port,
- digest,
- anonymized_connection ?
- SOCKS_COMMAND_CONNECT :
- SOCKS_COMMAND_CONNECT_DIR);
+ connection_ap_make_link(conn->_base.address, conn->_base.port,
+ digest,
+ anonymized_connection ?
+ SOCKS_COMMAND_CONNECT :
+ SOCKS_COMMAND_CONNECT_DIR);
if (!linked_conn) {
- log_warn(LD_NET,"Making AP bridge to dirserver failed.");
+ log_warn(LD_NET,"Making tunnel to dirserver failed.");
connection_mark_for_close(TO_CONN(conn));
return;
}
connection_link_connections(TO_CONN(conn), TO_CONN(linked_conn));
if (connection_add(TO_CONN(conn)) < 0) {
- log_warn(LD_NET,"Unable to add AP bridge to dirserver.");
+ log_warn(LD_NET,"Unable to add connection for link to dirserver.");
connection_mark_for_close(TO_CONN(conn));
return;
}