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

Fix GETINFO address-mappings/... with wildcarded addresses.

Browse Source
This commit is contained in:
Nick Mathewson 2012-06-27 23:55:01 -04:00
parent 23f2e37ff7
commit 28c42fe029
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug6244_part2 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes:
- When formatting wildcarded address mappings for the controller,
be sure to include "*." as appropriate. Partial fix for bug 6244;
bugfix on 0.2.3.9-alpha.

13
src/or/connection_edge.c
View File

@ -1702,17 +1702,22 @@ addressmap_get_mappings(smartlist_t *sl, time_t min_expires,
addressmap_ent_remove(key, val); addressmap_ent_remove(key, val);
continue; continue;
} else if (val->new_address) { } else if (val->new_address) {
const char *src_wc = val->src_wildcard ? "*." : "";
const char *dst_wc = val->dst_wildcard ? "*." : "";
if (want_expiry) { if (want_expiry) {
if (val->expires < 3 || val->expires == TIME_MAX) if (val->expires < 3 || val->expires == TIME_MAX)
smartlist_add_asprintf(sl, "%s %s NEVER", key, val->new_address); smartlist_add_asprintf(sl, "%s%s %s%s NEVER",
src_wc, key, dst_wc, val->new_address);
else { else {
char time[ISO_TIME_LEN+1]; char time[ISO_TIME_LEN+1];
format_iso_time(time, val->expires); format_iso_time(time, val->expires);
smartlist_add_asprintf(sl, "%s %s \"%s\"", key, val->new_address, smartlist_add_asprintf(sl, "%s%s %s%s \"%s\"",
time); src_wc, key, dst_wc, val->new_address,
time);
} }
} else { } else {
smartlist_add_asprintf(sl, "%s %s", key, val->new_address); smartlist_add_asprintf(sl, "%s%s %s%s",
src_wc, key, dst_wc, val->new_address);
} }
} }
} }