#define ADDRESSMAP_PRIVATE
#include "lib/crypt_ops/crypto_rand.h"
#include "core/or/or.h"
#include "feature/client/addressmap.h"
#include "core/or/circuituse.h"
#include "app/config/config.h"
#include "core/or/connection_edge.h"
#include "feature/control/control_events.h"
#include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerset.h"
#include "core/or/entry_connection_st.h"
typedef struct {
char *new_address;
time_t expires;
addressmap_entry_source_bitfield_t source:3;
unsigned src_wildcard:1;
unsigned dst_wildcard:1;
short num_resolve_failures;
} addressmap_entry_t;
typedef struct {
char *ipv4_address;
char *ipv6_address;
char *hostname_address;
} virtaddress_entry_t;
static strmap_t *addressmap=NULL;
static strmap_t *virtaddress_reversemap=NULL;
void
addressmap_init(void)
{
addressmap = strmap_new();
virtaddress_reversemap = strmap_new();
}
#define addressmap_ent_free(ent) \
FREE_AND_NULL(addressmap_entry_t, addressmap_ent_free_, (ent))
static void
addressmap_ent_free_(addressmap_entry_t *ent)
{
if (!ent)
return;
tor_free(ent->new_address);
tor_free(ent);
}
static void
addressmap_ent_free_void(void *ent)
{
addressmap_ent_free_(ent);
}
#define addressmap_virtaddress_ent_free(ent) \
FREE_AND_NULL(virtaddress_entry_t, addressmap_virtaddress_ent_free_, (ent))
static void
addressmap_virtaddress_ent_free_(virtaddress_entry_t *ent)
{
if (!ent)
return;
tor_free(ent->ipv4_address);
tor_free(ent->ipv6_address);
tor_free(ent->hostname_address);
tor_free(ent);
}
static void
addressmap_virtaddress_ent_free_void(void *ent)
{
addressmap_virtaddress_ent_free_(ent);
}
static void
addressmap_virtaddress_remove(const char *address, addressmap_entry_t *ent)
{
if (ent && ent->new_address &&
address_is_in_virtual_range(ent->new_address)) {
virtaddress_entry_t *ve =
strmap_get(virtaddress_reversemap, ent->new_address);
if (ve) {
if (!strcmp(address, ve->ipv4_address))
tor_free(ve->ipv4_address);
if (!strcmp(address, ve->ipv6_address))
tor_free(ve->ipv6_address);
if (!strcmp(address, ve->hostname_address))
tor_free(ve->hostname_address);
if (!ve->ipv4_address && !ve->ipv6_address && !ve->hostname_address) {
tor_free(ve);
strmap_remove(virtaddress_reversemap, ent->new_address);
}
}
}
}
static void
addressmap_ent_remove(const char *address, addressmap_entry_t *ent)
{
addressmap_virtaddress_remove(address, ent);
addressmap_ent_free(ent);
}
void
clear_trackexithost_mappings(const char *exitname)
{
char *suffix = NULL;
if (!addressmap || !exitname)
return;
tor_asprintf(&suffix, ".%s.exit", exitname);
tor_strlower(suffix);
STRMAP_FOREACH_MODIFY(addressmap, address, addressmap_entry_t *, ent) {
if (ent->source == ADDRMAPSRC_TRACKEXIT &&
!strcmpend(ent->new_address, suffix)) {
addressmap_ent_remove(address, ent);
MAP_DEL_CURRENT(address);
}
} STRMAP_FOREACH_END;
tor_free(suffix);
}
void
addressmap_clear_excluded_trackexithosts(const or_options_t *options)
{
const routerset_t *allow_nodes = options->ExitNodes;
const routerset_t *exclude_nodes = options->ExcludeExitNodesUnion_;
if (!addressmap)
return;
if (routerset_is_empty(allow_nodes))
allow_nodes = NULL;
if (allow_nodes == NULL && routerset_is_empty(exclude_nodes))
return;
STRMAP_FOREACH_MODIFY(addressmap, address, addressmap_entry_t *, ent) {
size_t len;
const char *target = ent->new_address, *dot;
char *nodename;
const node_t *node;
if (!target) {
continue;
} else if (strcmpend(target, ".exit")) {
continue;
} else if (ent->source != ADDRMAPSRC_TRACKEXIT) {
continue;
}
len = strlen(target);
if (len < 6)
continue;
dot = target + len - 6;
while (dot > target && *dot != '.')
dot--;
if (*dot == '.') dot++;
nodename = tor_strndup(dot, len-5-(dot-target));
node = node_get_by_nickname(nodename, NNF_NO_WARN_UNNAMED);
tor_free(nodename);
if (!node ||
(allow_nodes && !routerset_contains_node(allow_nodes, node)) ||
routerset_contains_node(exclude_nodes, node) ||
!hostname_in_track_host_exits(options, address)) {
addressmap_ent_remove(address, ent);
MAP_DEL_CURRENT(address);
}
} STRMAP_FOREACH_END;
}
int
addressmap_address_should_automap(const char *address,
const or_options_t *options)
{
const smartlist_t *suffix_list = options->AutomapHostsSuffixes;
if (!suffix_list)
return 0;
SMARTLIST_FOREACH_BEGIN(suffix_list, const char *, suffix) {
if (!strcmp(suffix, "."))
return 1;
if (!strcasecmpend(address, suffix))
return 1;
} SMARTLIST_FOREACH_END(suffix);
return 0;
}
void
addressmap_clear_invalid_automaps(const or_options_t *options)
{
int clear_all = !options->AutomapHostsOnResolve;
const smartlist_t *suffixes = options->AutomapHostsSuffixes;
if (!addressmap)
return;
if (!suffixes)
clear_all = 1;
STRMAP_FOREACH_MODIFY(addressmap, src_address, addressmap_entry_t *, ent) {
int remove_this = clear_all;
if (ent->source != ADDRMAPSRC_AUTOMAP)
continue;
if (!remove_this) {
remove_this = ! addressmap_address_should_automap(src_address, options);
}
if (!remove_this && ! address_is_in_virtual_range(ent->new_address))
remove_this = 1;
if (remove_this) {
addressmap_ent_remove(src_address, ent);
MAP_DEL_CURRENT(src_address);
}
} STRMAP_FOREACH_END;
}
void
addressmap_clear_configured(void)
{
addressmap_get_mappings(NULL, 0, 0, 0);
}
void
addressmap_clear_transient(void)
{
addressmap_get_mappings(NULL, 2, TIME_MAX, 0);
}
void
addressmap_clean(time_t now)
{
addressmap_get_mappings(NULL, 2, now, 0);
}
void
addressmap_free_all(void)
{
strmap_free(addressmap, addressmap_ent_free_void);
addressmap = NULL;
strmap_free(virtaddress_reversemap, addressmap_virtaddress_ent_free_void);
virtaddress_reversemap = NULL;
}
static addressmap_entry_t *
addressmap_match_superdomains(char *address)
{
addressmap_entry_t *val;
char *cp;
cp = address;
while ((cp = strchr(cp, '.'))) {
val = strmap_get_lc(addressmap, cp+1);
if (val && val->src_wildcard) {
if (val->dst_wildcard)
*cp = '\0';
return val;
}
++cp;
}
return NULL;
}
int
addressmap_rewrite(char *address, size_t maxlen,
unsigned flags,
time_t *expires_out,
addressmap_entry_source_t *exit_source_out)
{
addressmap_entry_t *ent;
int rewrites;
time_t expires = TIME_MAX;
addressmap_entry_source_t exit_source = ADDRMAPSRC_NONE;
char *addr_orig = tor_strdup(address);
char *log_addr_orig = NULL;
for (rewrites = 0; rewrites < 16; rewrites++) {
int exact_match = 0;
log_addr_orig = tor_strdup(escaped_safe_str_client(address));
ent = strmap_get(addressmap, address);
if (!ent || !ent->new_address) {
ent = addressmap_match_superdomains(address);
} else {
if (ent->src_wildcard && !ent->dst_wildcard &&
!strcasecmp(address, ent->new_address)) {
goto done;
}
exact_match = 1;
}
if (!ent || !ent->new_address) {
goto done;
}
switch (ent->source) {
case ADDRMAPSRC_DNS:
{
sa_family_t f;
tor_addr_t tmp;
f = tor_addr_parse(&tmp, ent->new_address);
if (f == AF_INET && !(flags & AMR_FLAG_USE_IPV4_DNS))
goto done;
else if (f == AF_INET6 && !(flags & AMR_FLAG_USE_IPV6_DNS))
goto done;
}
break;
case ADDRMAPSRC_CONTROLLER:
case ADDRMAPSRC_TORRC:
if (!(flags & AMR_FLAG_USE_MAPADDRESS))
goto done;
break;
case ADDRMAPSRC_AUTOMAP:
if (!(flags & AMR_FLAG_USE_AUTOMAP))
goto done;
break;
case ADDRMAPSRC_TRACKEXIT:
if (!(flags & AMR_FLAG_USE_TRACKEXIT))
goto done;
break;
case ADDRMAPSRC_NONE:
default:
log_warn(LD_BUG, "Unknown addrmap source value %d. Ignoring it.",
(int) ent->source);
goto done;
}
if (ent->dst_wildcard && !exact_match) {
strlcat(address, ".", maxlen);
strlcat(address, ent->new_address, maxlen);
} else {
strlcpy(address, ent->new_address, maxlen);
}
if (!strcmpend(address, ".exit") &&
strcmpend(addr_orig, ".exit") &&
exit_source == ADDRMAPSRC_NONE) {
exit_source = ent->source;
}
log_info(LD_APP, "Addressmap: rewriting %s to %s",
log_addr_orig, escaped_safe_str_client(address));
if (ent->expires > 1 && ent->expires < expires)
expires = ent->expires;
tor_free(log_addr_orig);
}
log_warn(LD_CONFIG,
"Loop detected: we've rewritten %s 16 times! Using it as-is.",
escaped_safe_str_client(address));
done:
tor_free(addr_orig);
tor_free(log_addr_orig);
if (exit_source_out)
*exit_source_out = exit_source;
if (expires_out)
*expires_out = expires;
return (rewrites > 0);
}
int
addressmap_rewrite_reverse(char *address, size_t maxlen, unsigned flags,
time_t *expires_out)
{
char *s, *cp;
addressmap_entry_t *ent;
int r = 0;
{
sa_family_t f;
tor_addr_t tmp;
f = tor_addr_parse(&tmp, address);
if (f == AF_INET && !(flags & AMR_FLAG_USE_IPV4_DNS))
return 0;
else if (f == AF_INET6 && !(flags & AMR_FLAG_USE_IPV6_DNS))
return 0;
}
tor_asprintf(&s, "REVERSE[%s]", address);
ent = strmap_get(addressmap, s);
if (ent) {
cp = tor_strdup(escaped_safe_str_client(ent->new_address));
log_info(LD_APP, "Rewrote reverse lookup %s -> %s",
escaped_safe_str_client(s), cp);
tor_free(cp);
strlcpy(address, ent->new_address, maxlen);
r = 1;
}
if (expires_out)
*expires_out = (ent && ent->expires > 1) ? ent->expires : TIME_MAX;
tor_free(s);
return r;
}
int
addressmap_have_mapping(const char *address, int update_expiry)
{
addressmap_entry_t *ent;
if (!(ent=strmap_get_lc(addressmap, address)))
return 0;
if (update_expiry && ent->source==ADDRMAPSRC_TRACKEXIT)
ent->expires=time(NULL) + update_expiry;
return 1;
}
void
addressmap_register(const char *address, char *new_address, time_t expires,
addressmap_entry_source_t source,
const int wildcard_addr,
const int wildcard_new_addr, uint64_t stream_id)
{
addressmap_entry_t *ent;
if (wildcard_new_addr)
tor_assert(wildcard_addr);
ent = strmap_get(addressmap, address);
if (!new_address || (!strcasecmp(address,new_address) &&
wildcard_addr == wildcard_new_addr)) {
tor_free(new_address);
if (ent) {
addressmap_ent_remove(address,ent);
strmap_remove(addressmap, address);
}
return;
}
if (!ent) {
ent = tor_malloc_zero(sizeof(addressmap_entry_t));
strmap_set(addressmap, address, ent);
} else if (ent->new_address) {
if (expires > 1) {
log_info(LD_APP,"Temporary addressmap ('%s' to '%s') not performed, "
"since it's already mapped to '%s'",
safe_str_client(address),
safe_str_client(new_address),
safe_str_client(ent->new_address));
tor_free(new_address);
return;
}
if (address_is_in_virtual_range(ent->new_address) &&
expires != 2) {
addressmap_virtaddress_remove(address, ent);
}
tor_free(ent->new_address);
}
ent->new_address = new_address;
ent->expires = expires==2 ? 1 : expires;
ent->num_resolve_failures = 0;
ent->source = source;
ent->src_wildcard = wildcard_addr ? 1 : 0;
ent->dst_wildcard = wildcard_new_addr ? 1 : 0;
log_info(LD_CONFIG, "Addressmap: (re)mapped '%s' to '%s'",
safe_str_client(address),
safe_str_client(ent->new_address));
control_event_address_mapped(address, ent->new_address,
expires, NULL, 1, stream_id);
}
int
client_dns_incr_failures(const char *address)
{
addressmap_entry_t *ent = strmap_get(addressmap, address);
if (!ent) {
ent = tor_malloc_zero(sizeof(addressmap_entry_t));
ent->expires = time(NULL) + MAX_DNS_ENTRY_AGE;
strmap_set(addressmap,address,ent);
}
if (ent->num_resolve_failures < SHRT_MAX)
++ent->num_resolve_failures;
log_info(LD_APP, "Address %s now has %d resolve failures.",
safe_str_client(address),
ent->num_resolve_failures);
return ent->num_resolve_failures;
}
void
client_dns_clear_failures(const char *address)
{
addressmap_entry_t *ent = strmap_get(addressmap, address);
if (ent)
ent->num_resolve_failures = 0;
}
static void
client_dns_set_addressmap_impl(entry_connection_t *for_conn,
const char *address, const char *name,
const char *exitname,
int ttl)
{
char *extendedaddress=NULL, *extendedval=NULL;
uint64_t stream_id = 0;
tor_assert(address);
tor_assert(name);
if (for_conn) {
stream_id = ENTRY_TO_CONN(for_conn)->global_identifier;
}
if (ttl<0)
ttl = DEFAULT_DNS_TTL;
else
ttl = clip_dns_ttl(ttl);
if (exitname) {
tor_asprintf(&extendedaddress,
"%s.%s.exit", address, exitname);
tor_asprintf(&extendedval,
"%s.%s.exit", name, exitname);
} else {
tor_asprintf(&extendedaddress,
"%s", address);
tor_asprintf(&extendedval,
"%s", name);
}
addressmap_register(extendedaddress, extendedval,
time(NULL) + ttl, ADDRMAPSRC_DNS, 0, 0, stream_id);
tor_free(extendedaddress);
}
void
client_dns_set_addressmap(entry_connection_t *for_conn,
const char *address,
const tor_addr_t *val,
const char *exitname,
int ttl)
{
tor_addr_t addr_tmp;
char valbuf[TOR_ADDR_BUF_LEN];
tor_assert(address);
tor_assert(val);
if (tor_addr_parse(&addr_tmp, address) >= 0)
return;
if (tor_addr_family(val) == AF_INET) {
if (! for_conn->entry_cfg.cache_ipv4_answers)
return;
} else if (tor_addr_family(val) == AF_INET6) {
if (! for_conn->entry_cfg.cache_ipv6_answers)
return;
}
if (! tor_addr_to_str(valbuf, val, sizeof(valbuf), 1))
return;
client_dns_set_addressmap_impl(for_conn, address, valbuf, exitname, ttl);
}
void
client_dns_set_reverse_addressmap(entry_connection_t *for_conn,
const char *address, const char *v,
const char *exitname,
int ttl)
{
char *s = NULL;
{
tor_addr_t tmp_addr;
sa_family_t f = tor_addr_parse(&tmp_addr, address);
if ((f == AF_INET && ! for_conn->entry_cfg.cache_ipv4_answers) ||
(f == AF_INET6 && ! for_conn->entry_cfg.cache_ipv6_answers))
return;
}
tor_asprintf(&s, "REVERSE[%s]", address);
client_dns_set_addressmap_impl(for_conn, s, v, exitname, ttl);
tor_free(s);
}
static virtual_addr_conf_t virtaddr_conf_ipv4;
static virtual_addr_conf_t virtaddr_conf_ipv6;
int
parse_virtual_addr_network(const char *val, sa_family_t family,
int validate_only,
char **msg)
{
const int ipv6 = (family == AF_INET6);
tor_addr_t addr;
maskbits_t bits;
const int max_prefix_bits = ipv6 ? 104 : 16;
virtual_addr_conf_t *conf = ipv6 ? &virtaddr_conf_ipv6 : &virtaddr_conf_ipv4;
if (!val || val[0] == '\0') {
if (msg)
tor_asprintf(msg, "Value not present (%s) after VirtualAddressNetwork%s",
val?"Empty":"NULL", ipv6?"IPv6":"");
return -1;
}
if (tor_addr_parse_mask_ports(val, 0, &addr, &bits, NULL, NULL) < 0) {
if (msg)
tor_asprintf(msg, "Error parsing VirtualAddressNetwork%s %s",
ipv6?"IPv6":"", val);
return -1;
}
if (tor_addr_family(&addr) != family) {
if (msg)
tor_asprintf(msg, "Incorrect address type for VirtualAddressNetwork%s",
ipv6?"IPv6":"");
return -1;
}
#if 0#endif
if (bits > max_prefix_bits) {
if (msg)
tor_asprintf(msg, "VirtualAddressNetwork%s expects a /%d "
"network or larger",ipv6?"IPv6":"", max_prefix_bits);
return -1;
}
if (validate_only)
return 0;
tor_addr_copy(&conf->addr, &addr);
conf->bits = bits;
return 0;
}
int
address_is_in_virtual_range(const char *address)
{
tor_addr_t addr;
tor_assert(address);
if (!strcasecmpend(address, ".virtual")) {
return 1;
} else if (tor_addr_parse(&addr, address) >= 0) {
const virtual_addr_conf_t *conf = (tor_addr_family(&addr) == AF_INET6) ?
&virtaddr_conf_ipv6 : &virtaddr_conf_ipv4;
if (tor_addr_compare_masked(&addr, &conf->addr, conf->bits, CMP_EXACT)==0)
return 1;
}
return 0;
}
STATIC void
get_random_virtual_addr(const virtual_addr_conf_t *conf, tor_addr_t *addr_out)
{
uint8_t tmp[4];
const uint8_t *addr_bytes;
uint8_t bytes[16];
const int ipv6 = tor_addr_family(&conf->addr) == AF_INET6;
const int total_bytes = ipv6 ? 16 : 4;
tor_assert(conf->bits <= total_bytes * 8);
if (ipv6) {
addr_bytes = tor_addr_to_in6_addr8(&conf->addr);
} else {
set_uint32(tmp, tor_addr_to_ipv4n(&conf->addr));
addr_bytes = tmp;
}
crypto_rand((char*)bytes, total_bytes);
if (conf->bits >= 8)
memcpy(bytes, addr_bytes, conf->bits / 8);
if (conf->bits & 7) {
uint8_t mask = 0xff >> (conf->bits & 7);
bytes[conf->bits/8] &= mask;
bytes[conf->bits/8] |= addr_bytes[conf->bits/8] & ~mask;
}
if (ipv6)
tor_addr_from_ipv6_bytes(addr_out, bytes);
else
tor_addr_from_ipv4n(addr_out, get_uint32(bytes));
tor_assert(tor_addr_compare_masked(addr_out, &conf->addr,
conf->bits, CMP_EXACT)==0);
}
static char *
addressmap_get_virtual_address(int type)
{
char buf[64];
tor_assert(addressmap);
if (type == RESOLVED_TYPE_HOSTNAME) {
char rand_bytes[10];
do {
crypto_rand(rand_bytes, sizeof(rand_bytes));
base32_encode(buf,sizeof(buf),rand_bytes,sizeof(rand_bytes));
strlcat(buf, ".virtual", sizeof(buf));
} while (strmap_get(addressmap, buf));
return tor_strdup(buf);
} else if (type == RESOLVED_TYPE_IPV4 || type == RESOLVED_TYPE_IPV6) {
const int ipv6 = (type == RESOLVED_TYPE_IPV6);
const virtual_addr_conf_t *conf = ipv6 ?
&virtaddr_conf_ipv6 : &virtaddr_conf_ipv4;
uint32_t attempts = 1000;
tor_addr_t addr;
while (attempts--) {
get_random_virtual_addr(conf, &addr);
if (!ipv6) {
const uint32_t a = tor_addr_to_ipv4h(&addr);
if ((a & 0xff) == 0 || (a & 0xff) == 0xff)
continue;
}
tor_addr_to_str(buf, &addr, sizeof(buf), 1);
if (!strmap_get(addressmap, buf)) {
char tmp[TOR_ADDR_BUF_LEN];
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);
continue;
}
return tor_strdup(buf);
}
}
log_warn(LD_CONFIG, "Ran out of virtual addresses!");
return NULL;
} else {
log_warn(LD_BUG, "Called with unsupported address type (%d)", type);
return NULL;
}
}
const char *
addressmap_register_virtual_address(int type, char *new_address)
{
char **addrp;
virtaddress_entry_t *vent;
int vent_needs_to_be_added = 0;
tor_assert(new_address);
tor_assert(addressmap);
tor_assert(virtaddress_reversemap);
vent = strmap_get(virtaddress_reversemap, new_address);
if (!vent) {
vent = tor_malloc_zero(sizeof(virtaddress_entry_t));
vent_needs_to_be_added = 1;
}
if (type == RESOLVED_TYPE_IPV4)
addrp = &vent->ipv4_address;
else if (type == RESOLVED_TYPE_IPV6)
addrp = &vent->ipv6_address;
else
addrp = &vent->hostname_address;
if (*addrp) {
addressmap_entry_t *ent = strmap_get(addressmap, *addrp);
if (ent && ent->new_address &&
!strcasecmp(new_address, ent->new_address)) {
tor_free(new_address);
tor_assert(!vent_needs_to_be_added);
return *addrp;
} else {
log_warn(LD_BUG,
"Internal confusion: I thought that '%s' was mapped to by "
"'%s', but '%s' really maps to '%s'. This is a harmless bug.",
safe_str_client(new_address),
safe_str_client(*addrp),
safe_str_client(*addrp),
ent?safe_str_client(ent->new_address):"(nothing)");
}
}
tor_free(*addrp);
*addrp = addressmap_get_virtual_address(type);
if (!*addrp) {
tor_free(vent);
tor_free(new_address);
return NULL;
}
log_info(LD_APP, "Registering map from %s to %s", *addrp, new_address);
if (vent_needs_to_be_added)
strmap_set(virtaddress_reversemap, new_address, vent);
addressmap_register(*addrp, new_address, 2, ADDRMAPSRC_AUTOMAP, 0, 0, 0);
#if 0#endif
return *addrp;
}
int
address_is_invalid_destination(const char *address, int client)
{
if (client) {
if (get_options()->AllowNonRFC953Hostnames)
return 0;
} else {
if (get_options()->ServerDNSAllowNonRFC953Hostnames)
return 0;
}
{
tor_addr_t a;
if (tor_addr_parse(&a, address) >= 0)
return 0;
}
while (*address) {
if (TOR_ISALNUM(*address) ||
*address == '-' ||
*address == '.' ||
*address == '_')
++address;
else
return 1;
}
return 0;
}
void
addressmap_get_mappings(smartlist_t *sl, time_t min_expires,
time_t max_expires, int want_expiry)
{
strmap_iter_t *iter;
const char *key;
void *val_;
addressmap_entry_t *val;
if (!addressmap)
addressmap_init();
for (iter = strmap_iter_init(addressmap); !strmap_iter_done(iter); ) {
strmap_iter_get(iter, &key, &val_);
val = val_;
if (val->expires >= min_expires && val->expires <= max_expires) {
if (!sl) {
iter = strmap_iter_next_rmv(addressmap,iter);
addressmap_ent_remove(key, val);
continue;
} else if (val->new_address) {
const char *src_wc = val->src_wildcard ? "*." : "";
const char *dst_wc = val->dst_wildcard ? "*." : "";
if (want_expiry) {
if (val->expires < 3 || val->expires == TIME_MAX)
smartlist_add_asprintf(sl, "%s%s %s%s NEVER",
src_wc, key, dst_wc, val->new_address);
else {
char isotime[ISO_TIME_LEN+1];
format_iso_time(isotime, val->expires);
smartlist_add_asprintf(sl, "%s%s %s%s \"%s\"",
src_wc, key, dst_wc, val->new_address,
isotime);
}
} else {
smartlist_add_asprintf(sl, "%s%s %s%s",
src_wc, key, dst_wc, val->new_address);
}
}
}
iter = strmap_iter_next(addressmap,iter);
}
}