Set correct address and port mappings on outgoing rendezvous connections

svn:r1513

1 files changed, 1 insertions, 15 deletions

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index dd5e8ebfd..ac47c8f81 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1134,7 +1134,7 @@ static int connection_exit_begin_conn(cell_t *cell, circuit_t *circ) {
   if(circ->purpose == CIRCUIT_PURPOSE_S_REND_JOINED) {
     n_stream->address = tor_strdup("(rendezvous)");
     strcpy(n_stream->rend_query, "yes"); /* XXX kludge */
-    if(connection_exit_set_rendezvous_addr_port(n_stream) < 0) {
+    if(rend_service_set_connection_addr_port(n_stream, circ) < 0) {
       log_fn(LOG_WARN,"Didn't find rendezvous service (port %d)",n_stream->port);
       connection_mark_for_close(n_stream,0 /* XXX */);
       return 0;
@@ -1211,20 +1211,6 @@ void connection_exit_connect(connection_t *conn) {
   }
 }
 
-/* This is a beginning rendezvous stream. Look up conn->port,
- * and assign the actual conn->addr and conn->port. Return -1
- * if failure, or 0 for success.
- */
-static int
-connection_exit_set_rendezvous_addr_port(connection_t *conn) {
-
-  /* XXX fill me in */
-
-  conn->addr = 0x7F000001u; /* 127.0.0.1, host order */
-
-  return 0;
-}
-
 int connection_edge_is_rendezvous_stream(connection_t *conn) {
   assert(conn);
   if(*conn->rend_query) /* XXX */