forked from ethereum/go-ethereum
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cmd/devp2p, p2p: dial using node iterator, discovery crawler (ethereu…
…m#20132) * p2p/enode: add Iterator and associated utilities * p2p/discover: add RandomNodes iterator * p2p: dial using iterator * cmd/devp2p: add discv4 crawler * cmd/devp2p: WIP nodeset filter * cmd/devp2p: fixup lesFilter * core/forkid: add NewStaticFilter * cmd/devp2p: make -eth-network filter actually work * cmd/devp2p: improve crawl timestamp handling * cmd/devp2p: fix typo * p2p/enode: fix comment typos * p2p/discover: fix comment typos * p2p/discover: rename lookup.next to 'advance' * p2p: lower discovery mixer timeout * p2p/enode: implement dynamic FairMix timeouts * cmd/devp2p: add ropsten support in -eth-network filter * cmd/devp2p: tweak crawler log message
- Loading branch information
1 parent
a33ebd2
commit 96f81db
Showing
19 changed files
with
1,558 additions
and
413 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,152 @@ | ||
// Copyright 2019 The go-ethereum Authors | ||
// This file is part of go-ethereum. | ||
// | ||
// go-ethereum is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
// | ||
// go-ethereum is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
// | ||
// You should have received a copy of the GNU General Public License | ||
// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
package main | ||
|
||
import ( | ||
"time" | ||
|
||
"github.com/ethereum/go-ethereum/log" | ||
"github.com/ethereum/go-ethereum/p2p/discover" | ||
"github.com/ethereum/go-ethereum/p2p/enode" | ||
) | ||
|
||
type crawler struct { | ||
input nodeSet | ||
output nodeSet | ||
disc *discover.UDPv4 | ||
iters []enode.Iterator | ||
inputIter enode.Iterator | ||
ch chan *enode.Node | ||
closed chan struct{} | ||
|
||
// settings | ||
revalidateInterval time.Duration | ||
} | ||
|
||
func newCrawler(input nodeSet, disc *discover.UDPv4, iters ...enode.Iterator) *crawler { | ||
c := &crawler{ | ||
input: input, | ||
output: make(nodeSet, len(input)), | ||
disc: disc, | ||
iters: iters, | ||
inputIter: enode.IterNodes(input.nodes()), | ||
ch: make(chan *enode.Node), | ||
closed: make(chan struct{}), | ||
} | ||
c.iters = append(c.iters, c.inputIter) | ||
// Copy input to output initially. Any nodes that fail validation | ||
// will be dropped from output during the run. | ||
for id, n := range input { | ||
c.output[id] = n | ||
} | ||
return c | ||
} | ||
|
||
func (c *crawler) run(timeout time.Duration) nodeSet { | ||
var ( | ||
timeoutTimer = time.NewTimer(timeout) | ||
timeoutCh <-chan time.Time | ||
doneCh = make(chan enode.Iterator, len(c.iters)) | ||
liveIters = len(c.iters) | ||
) | ||
for _, it := range c.iters { | ||
go c.runIterator(doneCh, it) | ||
} | ||
|
||
loop: | ||
for { | ||
select { | ||
case n := <-c.ch: | ||
c.updateNode(n) | ||
case it := <-doneCh: | ||
if it == c.inputIter { | ||
// Enable timeout when we're done revalidating the input nodes. | ||
log.Info("Revalidation of input set is done", "len", len(c.input)) | ||
if timeout > 0 { | ||
timeoutCh = timeoutTimer.C | ||
} | ||
} | ||
if liveIters--; liveIters == 0 { | ||
break loop | ||
} | ||
case <-timeoutCh: | ||
break loop | ||
} | ||
} | ||
|
||
close(c.closed) | ||
for _, it := range c.iters { | ||
it.Close() | ||
} | ||
for ; liveIters > 0; liveIters-- { | ||
<-doneCh | ||
} | ||
return c.output | ||
} | ||
|
||
func (c *crawler) runIterator(done chan<- enode.Iterator, it enode.Iterator) { | ||
defer func() { done <- it }() | ||
for it.Next() { | ||
select { | ||
case c.ch <- it.Node(): | ||
case <-c.closed: | ||
return | ||
} | ||
} | ||
} | ||
|
||
func (c *crawler) updateNode(n *enode.Node) { | ||
node, ok := c.output[n.ID()] | ||
|
||
// Skip validation of recently-seen nodes. | ||
if ok && time.Since(node.LastCheck) < c.revalidateInterval { | ||
return | ||
} | ||
|
||
// Request the node record. | ||
nn, err := c.disc.RequestENR(n) | ||
node.LastCheck = truncNow() | ||
if err != nil { | ||
if node.Score == 0 { | ||
// Node doesn't implement EIP-868. | ||
log.Debug("Skipping node", "id", n.ID()) | ||
return | ||
} | ||
node.Score /= 2 | ||
} else { | ||
node.N = nn | ||
node.Seq = nn.Seq() | ||
node.Score++ | ||
if node.FirstResponse.IsZero() { | ||
node.FirstResponse = node.LastCheck | ||
} | ||
node.LastResponse = node.LastCheck | ||
} | ||
|
||
// Store/update node in output set. | ||
if node.Score <= 0 { | ||
log.Info("Removing node", "id", n.ID()) | ||
delete(c.output, n.ID()) | ||
} else { | ||
log.Info("Updating node", "id", n.ID(), "seq", n.Seq(), "score", node.Score) | ||
c.output[n.ID()] = node | ||
} | ||
} | ||
|
||
func truncNow() time.Time { | ||
return time.Now().UTC().Truncate(1 * time.Second) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,6 +60,7 @@ func init() { | |
enrdumpCommand, | ||
discv4Command, | ||
dnsCommand, | ||
nodesetCommand, | ||
} | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.