nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug13811_025'

Browse Source
This commit is contained in:
Nick Mathewson 2014-12-23 13:02:37 -05:00
commit d7776315df
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug13811 Normal file
View File

@ -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.

2
src/or/addressmap.c
View File

@ -888,7 +888,7 @@ addressmap_get_virtual_address(int type)
/* XXXX This code is to make sure I didn't add an undecorated version /* XXXX This code is to make sure I didn't add an undecorated version
* by mistake. I hope it's needless. */ * by mistake. I hope it's needless. */
char tmp[TOR_ADDR_BUF_LEN]; 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)) { if (strmap_get(addressmap, tmp)) {
log_warn(LD_BUG, "%s wasn't in the addressmap, but %s was.", log_warn(LD_BUG, "%s wasn't in the addressmap, but %s was.",
buf, tmp); buf, tmp);