diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-31 16:17:04 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-31 16:17:04 -0500 |
| commit | d1c2597096cac27eb9ee842f52384ca4cb28a195 (patch) | |
| tree | aaa1b859ea69b01c1945d4d19a40ac97308bbf71 | |
| parent | 8b0b850efa0f77b627f31e9907acc6d29482f362 (diff) | |
| parent | 33d9889a2bdd611bcc255c68c43d60b8919ab663 (diff) | |
| download | tor-d1c2597096cac27eb9ee842f52384ca4cb28a195.tar.gz tor-d1c2597096cac27eb9ee842f52384ca4cb28a195.zip | |
Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
| -rw-r--r-- | changes/bug24952 | 5 | ||||
| -rw-r--r-- | src/or/channeltls.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug24952 b/changes/bug24952 new file mode 100644 index 0000000000..93174c04f5 --- /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 023ccdefd3..ba35178520 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -522,7 +522,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); |