|
@@ -432,20 +432,22 @@ STATIC int
|
|
|
dirserv_router_has_valid_address(routerinfo_t *ri)
|
|
|
{
|
|
|
tor_addr_t addr;
|
|
|
+
|
|
|
if (get_options()->DirAllowPrivateAddresses)
|
|
|
return 0; /* whatever it is, we're fine with it */
|
|
|
- tor_addr_from_ipv4h(&addr, ri->addr);
|
|
|
|
|
|
- if (tor_addr_is_internal(&addr, 0) || tor_addr_is_null(&addr)) {
|
|
|
+ tor_addr_from_ipv4h(&addr, ri->addr);
|
|
|
+ if (tor_addr_is_null(&addr) || tor_addr_is_internal(&addr, 0)) {
|
|
|
log_info(LD_DIRSERV,
|
|
|
"Router %s published internal IPv4 address. Refusing.",
|
|
|
router_describe(ri));
|
|
|
return -1; /* it's a private IP, we should reject it */
|
|
|
}
|
|
|
+
|
|
|
/* We only check internal v6 on non-null addresses because we do not require
|
|
|
* IPv6 and null IPv6 is normal. */
|
|
|
- if (tor_addr_is_internal(&ri->ipv6_addr, 0) &&
|
|
|
- !tor_addr_is_null(&ri->ipv6_addr)) {
|
|
|
+ if (!tor_addr_is_null(&ri->ipv6_addr) &&
|
|
|
+ tor_addr_is_internal(&ri->ipv6_addr, 0)) {
|
|
|
log_info(LD_DIRSERV,
|
|
|
"Router %s published internal IPv6 address. Refusing.",
|
|
|
router_describe(ri));
|