Merge pull request #5956

ec7f2ff p2p: reject invalid rpc_port in peer lists (xiphon)
This commit is contained in:
luigi1111 2019-10-16 13:44:25 -05:00
commit 017baeeab5
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 2 additions and 0 deletions

View File

@ -1864,6 +1864,8 @@ namespace nodetool
const epee::net_utils::ipv4_network_address &ipv4 = na.as<const epee::net_utils::ipv4_network_address>(); const epee::net_utils::ipv4_network_address &ipv4 = na.as<const epee::net_utils::ipv4_network_address>();
if (ipv4.ip() == 0) if (ipv4.ip() == 0)
ignore = true; ignore = true;
else if (ipv4.port() == be.rpc_port)
ignore = true;
} }
if (be.pruning_seed && (be.pruning_seed < tools::make_pruning_seed(1, CRYPTONOTE_PRUNING_LOG_STRIPES) || be.pruning_seed > tools::make_pruning_seed(1ul << CRYPTONOTE_PRUNING_LOG_STRIPES, CRYPTONOTE_PRUNING_LOG_STRIPES))) if (be.pruning_seed && (be.pruning_seed < tools::make_pruning_seed(1, CRYPTONOTE_PRUNING_LOG_STRIPES) || be.pruning_seed > tools::make_pruning_seed(1ul << CRYPTONOTE_PRUNING_LOG_STRIPES, CRYPTONOTE_PRUNING_LOG_STRIPES)))
ignore = true; ignore = true;