[tor-commits] [tor/maint-0.2.2] Use real_addr in send_netinfo

[nickm at torproject.org]

commit 5bea660f8ebf8ec1a78c21ce5e2a6bd5dd681eed
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 14 22:42:10 2011 -0500

    Use real_addr in send_netinfo
    
    Reported by "troll_un"; bugfix on 0.2.0.10-alpha; fixes bug 4349.
---
 changes/bug4349        |    4 ++++
 src/or/connection_or.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/changes/bug4349 b/changes/bug4349
new file mode 100644
index 0000000..633916b
--- /dev/null
+++ b/changes/bug4349
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - When sending a NETINFO cell, include the original address
+      received for the other side, not its canonical address.  Found
+      by "troll_un"; fixes bug 4349; bugfix on 0.2.0.10-alpha.
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 27a34d3..1fffba7 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1410,7 +1410,7 @@ connection_or_send_netinfo(or_connection_t *conn)
 
   /* Their address. */
   out = cell.payload + 4;
-  len = append_address_to_payload(out, &conn->_base.addr);
+  len = append_address_to_payload(out, &conn->real_addr);
   if (len<0)
     return -1;
   out += len;