diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-12-23 13:02:37 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-12-23 13:02:37 -0500 |
| commit | d7776315df8ec12a496127a5d5c3c9fcbec9c092 (patch) | |
| tree | ca4f325cb4b4cc4312d19253bae9f8059efdba9e | |
| parent | 45b911b79b66d5df700cd3cae0c7c1dcb9cec843 (diff) | |
| parent | c10ff2626502531a3d87989236e932c656e86801 (diff) | |
| download | tor-d7776315df8ec12a496127a5d5c3c9fcbec9c092.tar.gz tor-d7776315df8ec12a496127a5d5c3c9fcbec9c092.zip | |
Merge remote-tracking branch 'public/bug13811_025'
| -rw-r--r-- | changes/bug13811 | 6 | ||||
| -rw-r--r-- | src/or/addressmap.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug13811 b/changes/bug13811 new file mode 100644 index 0000000000..1b9bd9c68d --- /dev/null +++ b/changes/bug13811 @@ -0,0 +1,6 @@ + o Major bugfixes (client, automap): + - Repair automapping with IPv6 addresses; this automapping should + have worked previously, but one piece of debugging code that we + inserted to detect a regression actually caused the regression + to manifest itself again. Fixes bug 13811; bugfix on + 0.2.4.7-alpha. Diagnosed and fixed by Francisco Blas Izquierdo Riera.
\ No newline at end of file diff --git a/src/or/addressmap.c b/src/or/addressmap.c index d7ac7c8ec7..e28b5e3341 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -888,7 +888,7 @@ addressmap_get_virtual_address(int type) /* XXXX This code is to make sure I didn't add an undecorated version * by mistake. I hope it's needless. */ char tmp[TOR_ADDR_BUF_LEN]; - tor_addr_to_str(buf, &addr, sizeof(tmp), 0); + tor_addr_to_str(tmp, &addr, sizeof(tmp), 0); if (strmap_get(addressmap, tmp)) { log_warn(LD_BUG, "%s wasn't in the addressmap, but %s was.", buf, tmp); |