zishuo/NetHive
1
0
Fork 0
mirror of https://github.com/wlynxg/NetHive.git synced 2025-09-26 19:11:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 尝试修复 peer.ID 转换问题

Browse Source
This commit is contained in:
lynx
2023-08-01 14:49:29 +08:00
parent 80e3b5fbfe
commit 2d0963859b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/engine/engine.go
View File

@@ -21,6 +21,7 @@ import (
"github.com/libp2p/go-libp2p/p2p/discovery/mdns"
"github.com/libp2p/go-libp2p/p2p/discovery/routing"
"github.com/libp2p/go-libp2p/p2p/discovery/util"
"github.com/mr-tron/base58"
)
const (
@@ -302,6 +303,11 @@ func (e *Engine) addConn(dst netip.Addr) (PacketChan, error) {
}()
go func() {
e.log.Infof(ctx, "start find peer %s by mDNS", string(id))
idr, err := base58.Decode(string(id))
if err != nil {
e.log.Warningf(ctx, "base58 decode failed")
return
}
ticker := time.NewTimer(10 * time.Second)
for {
select {
@@ -309,7 +315,7 @@ func (e *Engine) addConn(dst netip.Addr) (PacketChan, error) {
ticker.Stop()
return
case <-ticker.C:
info := e.host.Peerstore().PeerInfo(id)
info := e.host.Peerstore().PeerInfo(peer.ID(idr))
if len(info.Addrs) > 0 {
peerInfo <- info
}
@@ -318,7 +324,7 @@ func (e *Engine) addConn(dst netip.Addr) (PacketChan, error) {
}()
go func() {
for info := range peerInfo {
e.log.Infof(e.ctx, "find peer: %s", info.String())
e.log.Infof(e.ctx, "find peer: %s", info)
stream, err := e.host.NewStream(e.ctx, info.ID, VPNStreamProtocol)
if err != nil {
e.log.Warningf(e.ctx, "Connection establishment with node %s failed due to %s", info, err)

2
core/engine/mdns.go
View File

@@ -8,5 +8,5 @@ import (
func (e *Engine) HandlePeerFound(pi peer.AddrInfo) {
e.log.Infof(e.ctx, "find %s by mDNS", pi)
e.host.Peerstore().AddAddrs(peer.ID(pi.ID.String()), pi.Addrs, 5*time.Minute)
e.host.Peerstore().AddAddrs(pi.ID, pi.Addrs, 5*time.Minute)
}