|
|
|
@ -887,32 +887,6 @@ namespace nodetool
|
|
|
|
|
for(const auto& p: m_command_line_peers)
|
|
|
|
|
m_network_zones.at(p.adr.get_zone()).m_peerlist.append_with_peer_white(p);
|
|
|
|
|
|
|
|
|
|
// all peers are now setup
|
|
|
|
|
#ifdef CRYPTONOTE_PRUNING_DEBUG_SPOOF_SEED
|
|
|
|
|
for (auto& zone : m_network_zones)
|
|
|
|
|
{
|
|
|
|
|
std::list<peerlist_entry> plw;
|
|
|
|
|
while (zone.second.m_peerlist.get_white_peers_count())
|
|
|
|
|
{
|
|
|
|
|
plw.push_back(peerlist_entry());
|
|
|
|
|
zone.second.m_peerlist.get_white_peer_by_index(plw.back(), 0);
|
|
|
|
|
zone.second.m_peerlist.remove_from_peer_white(plw.back());
|
|
|
|
|
}
|
|
|
|
|
for (auto &e:plw)
|
|
|
|
|
zone.second.m_peerlist.append_with_peer_white(e);
|
|
|
|
|
|
|
|
|
|
std::list<peerlist_entry> plg;
|
|
|
|
|
while (zone.second.m_peerlist.get_gray_peers_count())
|
|
|
|
|
{
|
|
|
|
|
plg.push_back(peerlist_entry());
|
|
|
|
|
zone.second.m_peerlist.get_gray_peer_by_index(plg.back(), 0);
|
|
|
|
|
zone.second.m_peerlist.remove_from_peer_gray(plg.back());
|
|
|
|
|
}
|
|
|
|
|
for (auto &e:plg)
|
|
|
|
|
zone.second.m_peerlist.append_with_peer_gray(e);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
//only in case if we really sure that we have external visible ip
|
|
|
|
|
m_have_address = true;
|
|
|
|
|
|
|
|
|
@ -2118,10 +2092,6 @@ namespace nodetool
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
local_peerlist[i].last_seen = 0;
|
|
|
|
|
|
|
|
|
|
#ifdef CRYPTONOTE_PRUNING_DEBUG_SPOOF_SEED
|
|
|
|
|
be.pruning_seed = tools::make_pruning_seed(1 + (be.adr.as<epee::net_utils::ipv4_network_address>().ip()) % (1ul << CRYPTONOTE_PRUNING_LOG_STRIPES), CRYPTONOTE_PRUNING_LOG_STRIPES);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|