certusone
/
tendermint
mirror of https://github.com/certusone/tendermint.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add RemoteAddr and ListenAddr to NodeInfo

This commit is contained in:
Jae Kwon 2015-12-05 09:13:21 -08:00
parent 35abb4df92
commit f37f578b1d
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
node/node.go
View File

@ -6,7 +6,6 @@ import (
"math/rand" "math/rand"
"net" "net"
"net/http" "net/http"
"strconv"
"strings" "strings"
"time" "time"
@ -234,9 +233,9 @@ func makeNodeInfo(sw *p2p.Switch, privKey crypto.PrivKeyEd25519) *p2p.NodeInfo {
Network: config.GetString("chain_id"), Network: config.GetString("chain_id"),
Version: Version, Version: Version,
Other: []string{ Other: []string{
Fmt("p2p_version=%v" + p2p.Version), Fmt("p2p_version=%v", p2p.Version),
Fmt("rpc_version=%v" + rpc.Version), Fmt("rpc_version=%v", rpc.Version),
Fmt("wire_version=%v" + wire.Version), Fmt("wire_version=%v", wire.Version),
}, },
} }
@ -253,17 +252,12 @@ func makeNodeInfo(sw *p2p.Switch, privKey crypto.PrivKeyEd25519) *p2p.NodeInfo {
p2pHost := p2pListener.ExternalAddress().IP.String() p2pHost := p2pListener.ExternalAddress().IP.String()
p2pPort := p2pListener.ExternalAddress().Port p2pPort := p2pListener.ExternalAddress().Port
rpcListenAddr := config.GetString("rpc_laddr") rpcListenAddr := config.GetString("rpc_laddr")
_, rpcPortStr, _ := net.SplitHostPort(rpcListenAddr)
rpcPort, err := strconv.Atoi(rpcPortStr)
if err != nil {
PanicSanity(Fmt("Expected numeric RPC.ListenAddr port but got %v", rpcPortStr))
}
// We assume that the rpcListener has the same ExternalAddress. // We assume that the rpcListener has the same ExternalAddress.
// This is probably true because both P2P and RPC listeners use UPnP, // This is probably true because both P2P and RPC listeners use UPnP,
// except of course if the rpc is only bound to localhost // except of course if the rpc is only bound to localhost
nodeInfo.Address = Fmt("%v:%v", p2pHost, p2pPort) nodeInfo.ListenAddr = Fmt("%v:%v", p2pHost, p2pPort)
nodeInfo.Other = append(nodeInfo.Other, Fmt("rpc_port=%v", rpcPort)) nodeInfo.Other = append(nodeInfo.Other, Fmt("rpc_addr=%v", rpcListenAddr))
return nodeInfo return nodeInfo
} }