roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

swarm: enable p2p/discovery and disable dynamic dialling (#19189)

Browse Source
This commit is contained in:
Anton Evangelatov 2019-03-01 12:20:37 +01:00 committed by GitHub
parent 94eca08ad8
commit 4e9230ea7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/swarm/main.go
View File

@ -287,8 +287,8 @@ func bzzd(ctx *cli.Context) error {
//setup the ethereum node //setup the ethereum node
utils.SetNodeConfig(ctx, &cfg) utils.SetNodeConfig(ctx, &cfg)
//always disable discovery from p2p package - swarm discovery is done with the `hive` protocol //disable dynamic dialing from p2p/discovery
cfg.P2P.NoDiscovery = true cfg.P2P.NoDial = true
stack, err := node.New(&cfg) stack, err := node.New(&cfg)
if err != nil { if err != nil {

9
swarm/api/inspector.go
View File

@ -18,6 +18,7 @@ package api
import ( import (
"context" "context"
"fmt"
"github.com/ethereum/go-ethereum/swarm/network" "github.com/ethereum/go-ethereum/swarm/network"
"github.com/ethereum/go-ethereum/swarm/storage" "github.com/ethereum/go-ethereum/swarm/storage"
@ -38,6 +39,14 @@ func (inspector *Inspector) Hive() string {
return inspector.hive.String() return inspector.hive.String()
} }
func (inspector *Inspector) ListKnown() []string {
res := []string{}
for _, v := range inspector.hive.Kademlia.ListKnown() {
res = append(res, fmt.Sprintf("%v", v))
}
return res
}
type HasInfo struct { type HasInfo struct {
Addr string `json:"address"` Addr string `json:"address"`
Has bool `json:"has"` Has bool `json:"has"`

27
swarm/network/kademlia.go
View File

@ -140,6 +140,7 @@ func (k *Kademlia) Register(peers ...*BzzAddr) error {
defer k.lock.Unlock() defer k.lock.Unlock()
var known, size int var known, size int
for _, p := range peers { for _, p := range peers {
log.Trace("kademlia trying to register", "addr", p)
// error if self received, peer should know better // error if self received, peer should know better
// and should be punished for this // and should be punished for this
if bytes.Equal(p.Address(), k.base) { if bytes.Equal(p.Address(), k.base) {
@ -149,10 +150,22 @@ func (k *Kademlia) Register(peers ...*BzzAddr) error {
k.addrs, _, found, _ = pot.Swap(k.addrs, p, Pof, func(v pot.Val) pot.Val { k.addrs, _, found, _ = pot.Swap(k.addrs, p, Pof, func(v pot.Val) pot.Val {
// if not found // if not found
if v == nil { if v == nil {
log.Trace("registering new peer", "addr", p)
// insert new offline peer into conns // insert new offline peer into conns
return newEntry(p) return newEntry(p)
} }
// found among known peers, do nothing
e := v.(*entry)
// if underlay address is different, still add
if !bytes.Equal(e.BzzAddr.UAddr, p.UAddr) {
log.Trace("underlay addr is different, so add again", "new", p, "old", e.BzzAddr)
// insert new offline peer into conns
return newEntry(p)
}
log.Trace("found among known peers, underlay addr is same, do nothing", "new", p, "old", e.BzzAddr)
return v return v
}) })
if found { if found {
@ -417,6 +430,18 @@ func (k *Kademlia) Off(p *Peer) {
} }
} }
func (k *Kademlia) ListKnown() []*BzzAddr {
res := []*BzzAddr{}
k.addrs.Each(func(val pot.Val) bool {
e := val.(*entry)
res = append(res, e.BzzAddr)
return true
})
return res
}
// EachConn is an iterator with args (base, po, f) applies f to each live peer // EachConn is an iterator with args (base, po, f) applies f to each live peer
// that has proximity order po or less as measured from the base // that has proximity order po or less as measured from the base
// if base is nil, kademlia base address is used // if base is nil, kademlia base address is used