Merge remote-tracking branch 'origin/maint-0.2.2'

This commit is contained in:
Nick Mathewson 2011-04-27 17:26:40 -04:00
commit 26c022ecbc
2 changed files with 7 additions and 2 deletions

View File

@ -0,0 +1,5 @@
o Minor bugfixes:
- Fix a bug in the code where we could keep trying to use a
TrackHostExits-based mapping after we failed to reach the intended
destination node. Fixes bug 2999. Bugfix on 0.2.0.20-rc.

View File

@ -799,8 +799,8 @@ clear_trackexithost_mappings(const char *exitname)
tor_strlower(suffix); tor_strlower(suffix);
STRMAP_FOREACH_MODIFY(addressmap, address, addressmap_entry_t *, ent) { STRMAP_FOREACH_MODIFY(addressmap, address, addressmap_entry_t *, ent) {
/* XXXX022 HEY! Shouldn't this look at ent->new_address? */ if (ent->source == ADDRMAPSRC_TRACKEXIT &&
if (ent->source == ADDRMAPSRC_TRACKEXIT && !strcmpend(address, suffix)) { !strcmpend(ent->new_address, suffix)) {
addressmap_ent_remove(address, ent); addressmap_ent_remove(address, ent);
MAP_DEL_CURRENT(address); MAP_DEL_CURRENT(address);
} }