diff options
| author | j-berman <justinberman@protonmail.com> | 2025-12-11 21:32:23 -0800 |
|---|---|---|
| committer | j-berman <justinberman@protonmail.com> | 2025-12-11 21:37:20 -0800 |
| commit | d8d3cf97300480b9d3942c667978dd4860b76feb (patch) | |
| tree | b9a58cca4fb8e9fd5576d1ef7b62415a119c803f /src/cryptonote_core/blockchain.cpp | |
| parent | ae08557f713a41f3f7267fcb08bbbe87f18d7932 (diff) | |
| download | monzero-core-d8d3cf97300480b9d3942c667978dd4860b76feb.tar.gz monzero-core-d8d3cf97300480b9d3942c667978dd4860b76feb.tar.xz monzero-core-d8d3cf97300480b9d3942c667978dd4860b76feb.zip | |
p2p: fix race causing dropped connections during sync
Without this commit:
1) read height from DB
2) add block to chain in separate thread
3) read chain for block id's and request them from peer
4) ERR in handle_response_chain_entry, peer's first block is the
one that was added to the chain, which has block idx=height from
step 1.
This commit reads the chain for height and highest block id's
in one go while holding the m_blockchain_lock to avoid the race.
Diffstat (limited to 'src/cryptonote_core/blockchain.cpp')
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index a6c2e3faf..3a34089f5 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -728,13 +728,13 @@ crypto::hash Blockchain::get_tail_id() const * powers of 2 less recent from there, so 13, 17, 25, etc... * */ -bool Blockchain::get_short_chain_history(std::list<crypto::hash>& ids) const +bool Blockchain::get_short_chain_history(std::list<crypto::hash>& ids, uint64_t& current_height) const { LOG_PRINT_L3("Blockchain::" << __func__); CRITICAL_REGION_LOCAL(m_blockchain_lock); uint64_t i = 0; uint64_t current_multiplier = 1; - uint64_t sz = m_db->height(); + uint64_t sz = current_height = m_db->height(); if(!sz) return true; |