forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-16 04:56:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

revert to using table parameter

Browse source 
using it.lookup.tab inside is unsafe

Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com>
This commit is contained in:
Csaba Kiraly 2025-09-17 09:02:38 +02:00
parent 3589c0d59b
commit de9fb9722b
No known key found for this signature in database
GPG key ID: 0FE274EE8C95166E
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
p2p/discover/lookup.go
View file

@ -189,7 +189,7 @@ func (it *lookupIterator) Next() bool {
if it.lookup.empty() { if it.lookup.empty() {
// If the lookup is empty right after creation, it means the local table // If the lookup is empty right after creation, it means the local table
// is in a degraded state, and we need to wait for it to fill again. // is in a degraded state, and we need to wait for it to fill again.
it.lookupFailed(1 * time.Minute) it.lookupFailed(it.lookup.tab, 1*time.Minute)
it.lookup = nil it.lookup = nil
continue continue
} }
@ -209,30 +209,30 @@ func (it *lookupIterator) Next() bool {
// lookupFailed handles failed lookup attempts. This can be called when the table has // lookupFailed handles failed lookup attempts. This can be called when the table has
// exited, or when it runs out of nodes. // exited, or when it runs out of nodes.
func (it *lookupIterator) lookupFailed(timeout time.Duration) { func (it *lookupIterator) lookupFailed(tab *Table, timeout time.Duration) {
ctx, cancel := context.WithTimeout(it.ctx, timeout) tout, cancel := context.WithTimeout(it.ctx, timeout)
defer cancel() defer cancel()
// Wait for Table initialization to complete, in case it is still in progress. // Wait for Table initialization to complete, in case it is still in progress.
select { select {
case <-it.lookup.tab.initDone: case <-tab.initDone:
case <-ctx.Done(): case <-tout.Done():
return return
} }
// Wait for ongoing refresh operation, or trigger one. // Wait for ongoing refresh operation, or trigger one.
if it.tabRefreshing == nil { if it.tabRefreshing == nil {
it.tabRefreshing = it.lookup.tab.refresh() it.tabRefreshing = tab.refresh()
} }
select { select {
case <-it.tabRefreshing: case <-it.tabRefreshing:
it.tabRefreshing = nil it.tabRefreshing = nil
case <-ctx.Done(): case <-tout.Done():
return return
} }
// Wait for the table to fill. // Wait for the table to fill.
it.lookup.tab.waitForNodes(ctx, 1) tab.waitForNodes(tout, 1)
} }
// Close ends the iterator. // Close ends the iterator.