From c83f18011697d3b3c3434464280271697f79d20a Mon Sep 17 00:00:00 2001 From: "Francisco Blas Izquierdo Riera (klondike)" Date: Tue, 23 Dec 2014 12:55:48 -0500 Subject: [PATCH 1/2] Fix Matthews code to actually use tmp Matthew's autoaddr code returned an undecorated address when trying to check that the code didn't insert an undecorated one into the map. This patch fixes this by actually storing the undecorated address in tmp instead of buf as it was originally intended. This patch is released under the same license as the original file as long as the author iscredited. Signed-off-by: Francisco Blas Izquierdo Riera (klondike) --- src/or/addressmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/addressmap.c b/src/or/addressmap.c index 998770a3db..9062d76eed 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); From c10ff2626502531a3d87989236e932c656e86801 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 23 Dec 2014 13:00:21 -0500 Subject: [PATCH 2/2] Changes file for 13811 --- changes/bug13811 | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changes/bug13811 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