diff options
author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-02-20 05:46:07 +0800 |
---|---|---|
committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-02-20 05:46:07 +0800 |
commit | 639ac5c3daa253f36d41672165a5727d8eba207e (patch) | |
tree | 996c510244cbde21b21a9c05ebc4f696963b5c1f /cmd | |
parent | 765740b829072f9a1bbeff356377a91defd9fdd8 (diff) | |
parent | 3719db352a3de1c7daece71895abdd871616a2aa (diff) | |
download | dexon-639ac5c3daa253f36d41672165a5727d8eba207e.tar dexon-639ac5c3daa253f36d41672165a5727d8eba207e.tar.gz dexon-639ac5c3daa253f36d41672165a5727d8eba207e.tar.bz2 dexon-639ac5c3daa253f36d41672165a5727d8eba207e.tar.lz dexon-639ac5c3daa253f36d41672165a5727d8eba207e.tar.xz dexon-639ac5c3daa253f36d41672165a5727d8eba207e.tar.zst dexon-639ac5c3daa253f36d41672165a5727d8eba207e.zip |
Merge pull request #352 from fjl/no-enc-handshake
p2p: disable encryption handshake, enable log events
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/mist/assets/qml/main.qml | 3 | ||||
-rw-r--r-- | cmd/mist/gui.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml index 65f38f8bd..86d0ea911 100644 --- a/cmd/mist/assets/qml/main.qml +++ b/cmd/mist/assets/qml/main.qml @@ -931,7 +931,8 @@ ApplicationWindow { model: peerModel TableViewColumn{width: 180; role: "addr" ; title: "Remote Address" } TableViewColumn{width: 280; role: "nodeID" ; title: "Node ID" } - TableViewColumn{width: 180; role: "caps" ; title: "Capabilities" } + TableViewColumn{width: 100; role: "name" ; title: "Name" } + TableViewColumn{width: 40; role: "caps" ; title: "Capabilities" } } } } diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index c9419473c..efab18064 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -466,7 +466,7 @@ NumGC: %d )) } -type qmlpeer struct{ Addr, NodeID, Caps string } +type qmlpeer struct{ Addr, NodeID, Name, Caps string } type peersByID []*qmlpeer @@ -481,6 +481,7 @@ func (gui *Gui) setPeerInfo() { qpeers[i] = &qmlpeer{ NodeID: p.ID().String(), Addr: p.RemoteAddr().String(), + Name: p.Name(), Caps: fmt.Sprint(p.Caps()), } } |