[or-cvs] r19292: {tor} fix the same bug in two more locations (thanks to lark for p (tor/trunk/src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2009-04-11 14:19:57 -0400 (Sat, 11 Apr 2009)
New Revision: 19292

Modified:
   tor/trunk/src/or/connection_edge.c
Log:
fix the same bug in two more locations (thanks to lark for prodding
me further)


Modified: tor/trunk/src/or/connection_edge.c
===================================================================
--- tor/trunk/src/or/connection_edge.c	2009-04-11 18:09:15 UTC (rev 19291)
+++ tor/trunk/src/or/connection_edge.c	2009-04-11 18:19:57 UTC (rev 19292)
@@ -2623,8 +2623,8 @@
 
   if (rh.command == RELAY_COMMAND_BEGIN_DIR) {
     tor_assert(or_circ);
-    if (or_circ->p_conn && !tor_addr_is_null(&or_circ->p_conn->_base.addr))
-      tor_addr_assign(&n_stream->_base.addr, &or_circ->p_conn->_base.addr);
+    if (or_circ->p_conn && !tor_addr_is_null(&or_circ->p_conn->real_addr))
+      tor_addr_assign(&n_stream->_base.addr, &or_circ->p_conn->real_addr);
     return connection_exit_connect_dir(n_stream);
   }
 
@@ -2798,7 +2798,7 @@
 
   dirconn->_base.addr = exitconn->_base.addr;
   dirconn->_base.port = 0;
-  dirconn->_base.address = tor_strdup(circ->p_conn->_base.address);
+  dirconn->_base.address = tor_strdup(exitconn->address);
   dirconn->_base.type = CONN_TYPE_DIR;
   dirconn->_base.purpose = DIR_PURPOSE_SERVER;
   dirconn->_base.state = DIR_CONN_STATE_SERVER_COMMAND_WAIT;