coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-02-26 12:57:44 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge pull request #6872 from ipfs/fix/id-addr-format

Browse Source 
fix: fix id addr format
This commit is contained in:
Steven Allen 2020-02-05 09:30:54 -08:00 committed by GitHub
commit 8920ecee82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/commands/id.go
View File

@ -14,6 +14,7 @@ import (
cmds "github.com/ipfs/go-ipfs-cmds"
ic "github.com/libp2p/go-libp2p-core/crypto"
"github.com/libp2p/go-libp2p-core/host"
peer "github.com/libp2p/go-libp2p-core/peer"
pstore "github.com/libp2p/go-libp2p-core/peerstore"
kb "github.com/libp2p/go-libp2p-kbucket"
@ -184,9 +185,12 @@ func printSelf(node *core.IpfsNode) (interface{}, error) {
info.PublicKey = base64.StdEncoding.EncodeToString(pkb)
if node.PeerHost != nil {
for _, a := range node.PeerHost.Addrs() {
s := a.String() + "/ipfs/" + info.ID
info.Addresses = append(info.Addresses, s)
addrs, err := peer.AddrInfoToP2pAddrs(host.InfoFromHost(node.PeerHost))
if err != nil {
return nil, err
}
for _, a := range addrs {
info.Addresses = append(info.Addresses, a.String())
}
}
info.ProtocolVersion = identify.LibP2PVersion

3
core/commands/swarm.go
View File

@ -298,10 +298,11 @@ var swarmAddrsLocalCmd = &cmds.Command{
}
var addrs []string
p2pProtocolName := ma.ProtocolWithCode(ma.P_P2P).Name
for _, addr := range maddrs {
saddr := addr.String()
if showid {
saddr = path.Join(saddr, "ipfs", self.ID().Pretty())
saddr = path.Join(saddr, p2pProtocolName, self.ID().Pretty())
}
addrs = append(addrs, saddr)
}