diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-03-09 07:08:51 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-03-09 07:12:17 +0100 |
| commit | ff38148808619038e298f15aaead563efe93a995 (patch) | |
| tree | 3d3930d14472be3271df69dca164fb9f3ec91a20 /src/script/bitcoinconsensus.cpp | |
| parent | 12408d33c6ac85522a0751908230cb0f3b4078fc (diff) | |
| parent | 20e6ea259b222b10f066f22695a5f56c52071f63 (diff) | |
| download | bitcoin-ff38148808619038e298f15aaead563efe93a995.tar.xz | |
Merge #15486: [addrman, net] Ensure tried collisions resolve, and allow feeler connections to existing outbound netgroups
20e6ea259b222b10f066f22695a5f56c52071f63 [addrman] Improve collision logging and address nits (Suhas Daftuar)
f71fdda3bc2e7acd2a8b74e882364866b8b0f55b [addrman] Ensure collisions eventually get resolved (Suhas Daftuar)
4991e3c813c9848d3b3957ea3ad433f02fca9e81 [net] feeler connections can be made to outbound peers in same netgroup (Suhas Daftuar)
4d834018e368c3481a5421891395f64aa9002185 [addrman] Improve tried table collision logging (Suhas Daftuar)
Pull request description:
The restriction on outbound peers sharing the same network group is not intended to apply to feeler connections, so fix this.
This fixes an issue where a tried table collision with an entry to a netgroup we already have an outbound connection to could cause feelers to stop working, because the tried collision buffer (`m_tried_collisions`) would never be drained.
Also, ensure that all entries don't linger in `m_tried_collisions` by evicting an old entry if its collisions is unresolved after 40 minutes.
Tree-SHA512: 553fe2b01b82cd7f0f62f90c6781e373455a45b254e3bec085b5e6b16690aa9f3938e8c50e7136f19dafa250ed4578a26227d944b76daf9ce4ef0c75802389b6
Diffstat (limited to 'src/script/bitcoinconsensus.cpp')
0 files changed, 0 insertions, 0 deletions