logos-messaging/logos-messaging-go
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-go.git synced 2026-01-10 01:43:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix:

Browse Source
This commit is contained in:
Richard Ramos 2021-11-16 09:58:50 -04:00
parent bd86eb6a92
commit 424af62d6b
No known key found for this signature in database
GPG Key ID: 80D4B01265FDFE8F
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
waku/v2/discv5/discover.go
View File

@ -14,7 +14,6 @@ import (
logging "github.com/ipfs/go-log"
"github.com/libp2p/go-libp2p-core/discovery"
"github.com/libp2p/go-libp2p-core/host"
"github.com/libp2p/go-libp2p-core/network"
"github.com/libp2p/go-libp2p-core/peer"
"github.com/status-im/go-waku/waku/v2/utils"
)
@ -197,11 +196,7 @@ func isWakuNode(node *enode.Node) bool {
return false
}
func (d *DiscoveryV5) evaluateNode(node *enode.Node) bool {
if node == nil || node.IP() == nil {
return false
}
func hasTCPPort(node *enode.Node) bool {
enrTCP := new(enr.TCP)
if err := node.Record().Load(enr.WithEntry(enrTCP.ENRKey(), enrTCP)); err != nil {
if !enr.IsNotFound(err) {
@ -210,23 +205,21 @@ func (d *DiscoveryV5) evaluateNode(node *enode.Node) bool {
return false
}
if !isWakuNode(node) {
return true
}
func (d *DiscoveryV5) evaluateNode(node *enode.Node) bool {
if node == nil || node.IP() == nil {
return false
}
address, err := utils.EnodeToMultiAddr(node)
if !isWakuNode(node) || !hasTCPPort(node) {
return false
}
_, err := utils.EnodeToPeerInfo(node)
if err != nil {
log.Error("could not convert enode to multiaddress ", err)
return false
}
info, err := peer.AddrInfoFromP2pAddr(address)
if err != nil {
log.Error("could not obtain peer info from multiaddress ", err)
return false
}
if d.host.Network().Connectedness(info.ID) == network.Connected {
log.Error("could not obtain peer info from enode:", err)
return false
}

9
waku/v2/utils/peer.go
View File

@ -125,3 +125,12 @@ func EnodeToMultiAddr(node *enode.Node) (ma.Multiaddr, error) {
return ma.NewMultiaddr(fmt.Sprintf("/ip4/%s/tcp/%d/p2p/%s", node.IP(), node.TCP(), peerID))
}
func EnodeToPeerInfo(node *enode.Node) (*peer.AddrInfo, error) {
address, err := EnodeToMultiAddr(node)
if err != nil {
return nil, err
}
return peer.AddrInfoFromP2pAddr(address)
}