aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-05-08 20:09:42 -0400
committerNick Mathewson <nickm@torproject.org>2018-05-08 20:09:42 -0400
commita0f051137de293342d692df1d2cfa1386e5e7769 (patch)
tree7dd6e5f9560a9b5dabcbdf69a54d30eb233bbddc /src/or
parent26990f3adc06d6907029d4580abdf3488153737e (diff)
parent24ba5fd748a9a27a6069312961843d5f8f662f93 (diff)
downloadtor-a0f051137de293342d692df1d2cfa1386e5e7769.tar.gz
tor-a0f051137de293342d692df1d2cfa1386e5e7769.zip
Merge branch 'ticket25993_squashed'
Diffstat (limited to 'src/or')
-rw-r--r--src/or/addressmap.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/addressmap.c b/src/or/addressmap.c
index 3cd153307d..7f861e4d24 100644
--- a/src/or/addressmap.c
+++ b/src/or/addressmap.c
@@ -960,9 +960,11 @@ addressmap_get_virtual_address(int type)
char tmp[TOR_ADDR_BUF_LEN];
tor_addr_to_str(tmp, &addr, sizeof(tmp), 0);
if (strmap_get(addressmap, tmp)) {
+ // LCOV_EXCL_START
log_warn(LD_BUG, "%s wasn't in the addressmap, but %s was.",
buf, tmp);
continue;
+ // LCOV_EXCL_STOP
}
return tor_strdup(buf);
@@ -971,8 +973,10 @@ addressmap_get_virtual_address(int type)
log_warn(LD_CONFIG, "Ran out of virtual addresses!");
return NULL;
} else {
+ // LCOV_EXCL_START
log_warn(LD_BUG, "Called with unsupported address type (%d)", type);
return NULL;
+ // LCOV_EXCL_STOP
}
}