[tor-commits] [tor/maint-0.3.2] channel_tls_get_remote_addr_method now returns real_addr.

[nickm@xxxxxxxxxxxxxx]

commit 33d9889a2bdd611bcc255c68c43d60b8919ab663
Author: Fernando Fernandez Mancera <ffmancera@xxxxxxxxxx>
Date:   Mon Jan 22 15:20:17 2018 +0100

    channel_tls_get_remote_addr_method now returns real_addr.
    
    The accurate address of a connection is real_addr, not the addr member.
    channel_tls_get_remote_addr_method() now returns real_addr instead.
    
    Fixes #24952; bugfix on 707c1e2 in 0.2.4.11-alpha.
    
    Signed-off-by: Fernando Fernandez Mancera <ffmancera@xxxxxxxxxx>
---
 changes/bug24952    | 5 +++++
 src/or/channeltls.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug24952 b/changes/bug24952
new file mode 100644
index 000000000..93174c04f
--- /dev/null
+++ b/changes/bug24952
@@ -0,0 +1,5 @@
+  o Minor bugfix (channel connection):
+    - The accurate address of a connection is real_addr, not the addr member.
+      TLS Channel remote address is now real_addr content instead of addr
+      member. Fixes bug 24952; bugfix on 707c1e2e26 in 0.2.4.11-alpha.
+      Patch by "ffmancera".
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index 09cca95b6..890646989 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -514,7 +514,7 @@ channel_tls_get_remote_addr_method(channel_t *chan, tor_addr_t *addr_out)
   tor_assert(addr_out);
 
   if (tlschan->conn) {
-    tor_addr_copy(addr_out, &(TO_CONN(tlschan->conn)->addr));
+    tor_addr_copy(addr_out, &(tlschan->conn->real_addr));
     rv = 1;
   } else tor_addr_make_unspec(addr_out);
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits