|
@@ -87,7 +87,6 @@ static int add_fingerprint_to_dir(const char *nickname, const char *fp,
|
|
|
struct authdir_config_t *list);
|
|
|
static uint32_t
|
|
|
dirserv_get_status_impl(const char *fp, const char *nickname,
|
|
|
- const char *address,
|
|
|
uint32_t addr, uint16_t or_port,
|
|
|
const char *platform, const char *contact,
|
|
|
const char **msg, int should_log);
|
|
@@ -336,7 +335,6 @@ dirserv_router_get_status(const routerinfo_t *router, const char **msg)
|
|
|
}
|
|
|
|
|
|
return dirserv_get_status_impl(d, router->nickname,
|
|
|
- router->address,
|
|
|
router->addr, router->or_port,
|
|
|
router->platform, router->contact_info,
|
|
|
msg, 1);
|
|
@@ -350,7 +348,6 @@ dirserv_would_reject_router(const routerstatus_t *rs)
|
|
|
uint32_t res;
|
|
|
|
|
|
res = dirserv_get_status_impl(rs->identity_digest, rs->nickname,
|
|
|
- "", /* address is only used in logs */
|
|
|
rs->addr, rs->or_port,
|
|
|
NULL, NULL,
|
|
|
NULL, 0);
|
|
@@ -389,7 +386,6 @@ dirserv_get_name_status(const char *id_digest, const char *nickname)
|
|
|
*/
|
|
|
static uint32_t
|
|
|
dirserv_get_status_impl(const char *id_digest, const char *nickname,
|
|
|
- const char *address,
|
|
|
uint32_t addr, uint16_t or_port,
|
|
|
const char *platform, const char *contact,
|
|
|
const char **msg, int should_log)
|
|
@@ -461,14 +457,14 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname,
|
|
|
if (should_log)
|
|
|
log_info(LD_DIRSERV,
|
|
|
"Marking '%s' as bad directory because of address '%s'",
|
|
|
- nickname, address);
|
|
|
+ nickname, fmt_addr32(addr));
|
|
|
result |= FP_BADDIR;
|
|
|
}
|
|
|
|
|
|
if (authdir_policy_badexit_address(addr, or_port)) {
|
|
|
if (should_log)
|
|
|
log_info(LD_DIRSERV, "Marking '%s' as bad exit because of address '%s'",
|
|
|
- nickname, address);
|
|
|
+ nickname, fmt_addr32(addr));
|
|
|
result |= FP_BADEXIT;
|
|
|
}
|
|
|
|
|
@@ -476,7 +472,7 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname,
|
|
|
if (!authdir_policy_permits_address(addr, or_port)) {
|
|
|
if (should_log)
|
|
|
log_info(LD_DIRSERV, "Rejecting '%s' because of address '%s'",
|
|
|
- nickname, address);
|
|
|
+ nickname, fmt_addr32(addr));
|
|
|
if (msg)
|
|
|
*msg = "Authdir is rejecting routers in this range.";
|
|
|
return FP_REJECT;
|
|
@@ -484,7 +480,7 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname,
|
|
|
if (!authdir_policy_valid_address(addr, or_port)) {
|
|
|
if (should_log)
|
|
|
log_info(LD_DIRSERV, "Not marking '%s' valid because of address '%s'",
|
|
|
- nickname, address);
|
|
|
+ nickname, fmt_addr32(addr));
|
|
|
result |= FP_INVALID;
|
|
|
}
|
|
|
if (reject_unlisted) {
|
|
@@ -3447,7 +3443,7 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router)
|
|
|
|
|
|
/* IPv4. */
|
|
|
log_debug(LD_OR,"Testing reachability of %s at %s:%u.",
|
|
|
- router->nickname, router->address, router->or_port);
|
|
|
+ router->nickname, fmt_addr32(router->addr), router->or_port);
|
|
|
tor_addr_from_ipv4h(&router_addr, router->addr);
|
|
|
chan = channel_tls_connect(&router_addr, router->or_port,
|
|
|
router->cache_info.identity_digest);
|