aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-11-04 08:47:02 +0800
committerobscuren <geffobscura@gmail.com>2014-11-04 08:47:02 +0800
commit0c4adeceaeaff7a954fa7103a2200653ef217572 (patch)
tree8919f34b6fd356ca8d341d23d8cada83eb6d8a05
parentf76f953f0cad3b55d6817ce766def50a587f1d19 (diff)
downloadgo-tangerine-0c4adeceaeaff7a954fa7103a2200653ef217572.tar
go-tangerine-0c4adeceaeaff7a954fa7103a2200653ef217572.tar.gz
go-tangerine-0c4adeceaeaff7a954fa7103a2200653ef217572.tar.bz2
go-tangerine-0c4adeceaeaff7a954fa7103a2200653ef217572.tar.lz
go-tangerine-0c4adeceaeaff7a954fa7103a2200653ef217572.tar.xz
go-tangerine-0c4adeceaeaff7a954fa7103a2200653ef217572.tar.zst
go-tangerine-0c4adeceaeaff7a954fa7103a2200653ef217572.zip
Properly list caps
-rw-r--r--peer.go3
-rw-r--r--xeth/js_types.go6
2 files changed, 6 insertions, 3 deletions
diff --git a/peer.go b/peer.go
index 50daceb83..f5afb4595 100644
--- a/peer.go
+++ b/peer.go
@@ -673,6 +673,7 @@ func (p *Peer) pushPeers() {
}
func (self *Peer) pushStatus() {
+ fmt.Println("push status")
msg := wire.NewMessage(wire.MsgStatusTy, []interface{}{
uint32(ProtocolVersion),
uint32(NetVersion),
@@ -825,7 +826,7 @@ func (p *Peer) handleHandshake(msg *wire.Msg) {
p.pushStatus()
}
- capsStrs = append(capsStrs, cap)
+ capsStrs = append(capsStrs, fmt.Sprintf("%s/%d", cap, ver))
}
peerlogger.Infof("Added peer (%s) %d / %d (%v)\n", p.conn.RemoteAddr(), p.ethereum.Peers().Len(), p.ethereum.MaxPeers, capsStrs)
diff --git a/xeth/js_types.go b/xeth/js_types.go
index 9f8f12e7f..1a1938648 100644
--- a/xeth/js_types.go
+++ b/xeth/js_types.go
@@ -176,10 +176,12 @@ func NewJSPeer(peer chain.Peer) *JSPeer {
var caps []string
capsIt := peer.Caps().NewIterator()
for capsIt.Next() {
- caps = append(caps, capsIt.Value().Str())
+ cap := capsIt.Value().Get(0).Str()
+ ver := capsIt.Value().Get(1).Uint()
+ caps = append(caps, fmt.Sprintf("%s/%d", cap, ver))
}
- return &JSPeer{ref: &peer, Inbound: peer.Inbound(), LastSend: peer.LastSend().Unix(), LastPong: peer.LastPong(), Version: peer.Version(), Ip: ipAddress, Port: int(peer.Port()), Latency: peer.PingTime(), Caps: fmt.Sprintf("%v", caps)}
+ return &JSPeer{ref: &peer, Inbound: peer.Inbound(), LastSend: peer.LastSend().Unix(), LastPong: peer.LastPong(), Version: peer.Version(), Ip: ipAddress, Port: int(peer.Port()), Latency: peer.PingTime(), Caps: "[" + strings.Join(caps, ", ") + "]"}
}
type JSReceipt struct {