Unverified 提交 cbc6e69e 作者: Steven Allen 提交者: GitHub

Merge pull request #5457 from overbool/feat/command/add-connection-direction

feat(command): add connection direction
...@@ -62,6 +62,7 @@ var swarmPeersCmd = &cmds.Command{ ...@@ -62,6 +62,7 @@ var swarmPeersCmd = &cmds.Command{
cmdkit.BoolOption("verbose", "v", "display all extra information"), cmdkit.BoolOption("verbose", "v", "display all extra information"),
cmdkit.BoolOption("streams", "Also list information about open streams for each peer"), cmdkit.BoolOption("streams", "Also list information about open streams for each peer"),
cmdkit.BoolOption("latency", "Also list information about latency to each peer"), cmdkit.BoolOption("latency", "Also list information about latency to each peer"),
cmdkit.BoolOption("direction", "Also list information about the direction of connection"),
}, },
Run: func(req cmds.Request, res cmds.Response) { Run: func(req cmds.Request, res cmds.Response) {
...@@ -79,14 +80,13 @@ var swarmPeersCmd = &cmds.Command{ ...@@ -79,14 +80,13 @@ var swarmPeersCmd = &cmds.Command{
verbose, _, _ := req.Option("verbose").Bool() verbose, _, _ := req.Option("verbose").Bool()
latency, _, _ := req.Option("latency").Bool() latency, _, _ := req.Option("latency").Bool()
streams, _, _ := req.Option("streams").Bool() streams, _, _ := req.Option("streams").Bool()
direction, _, _ := req.Option("direction").Bool()
conns := n.PeerHost.Network().Conns() conns := n.PeerHost.Network().Conns()
var out connInfos var out connInfos
for _, c := range conns { for _, c := range conns {
pid := c.RemotePeer() pid := c.RemotePeer()
addr := c.RemoteMultiaddr() addr := c.RemoteMultiaddr()
ci := connInfo{ ci := connInfo{
Addr: addr.String(), Addr: addr.String(),
Peer: pid.Pretty(), Peer: pid.Pretty(),
...@@ -100,6 +100,11 @@ var swarmPeersCmd = &cmds.Command{ ...@@ -100,6 +100,11 @@ var swarmPeersCmd = &cmds.Command{
} }
*/ */
if verbose || direction {
// set direction
ci.Direction = c.Stat().Direction
}
if verbose || latency { if verbose || latency {
lat := n.Peerstore.LatencyEWMA(pid) lat := n.Peerstore.LatencyEWMA(pid)
if lat == 0 { if lat == 0 {
...@@ -146,6 +151,11 @@ var swarmPeersCmd = &cmds.Command{ ...@@ -146,6 +151,11 @@ var swarmPeersCmd = &cmds.Command{
if info.Latency != "" { if info.Latency != "" {
fmt.Fprintf(buf, " %s", info.Latency) fmt.Fprintf(buf, " %s", info.Latency)
} }
if info.Direction != inet.DirUnknown {
fmt.Fprintf(buf, " %s", directionString(info.Direction))
}
fmt.Fprintln(buf) fmt.Fprintln(buf)
for _, s := range info.Streams { for _, s := range info.Streams {
...@@ -168,11 +178,12 @@ type streamInfo struct { ...@@ -168,11 +178,12 @@ type streamInfo struct {
} }
type connInfo struct { type connInfo struct {
Addr string Addr string
Peer string Peer string
Latency string Latency string
Muxer string Muxer string
Streams []streamInfo Direction inet.Direction
Streams []streamInfo
} }
func (ci *connInfo) Less(i, j int) bool { func (ci *connInfo) Less(i, j int) bool {
...@@ -203,6 +214,18 @@ func (ci connInfos) Swap(i, j int) { ...@@ -203,6 +214,18 @@ func (ci connInfos) Swap(i, j int) {
ci.Peers[i], ci.Peers[j] = ci.Peers[j], ci.Peers[i] ci.Peers[i], ci.Peers[j] = ci.Peers[j], ci.Peers[i]
} }
// directionString transfers to string
func directionString(d inet.Direction) string {
switch d {
case inet.DirInbound:
return "inbound"
case inet.DirOutbound:
return "outbound"
default:
return ""
}
}
var swarmAddrsCmd = &cmds.Command{ var swarmAddrsCmd = &cmds.Command{
Helptext: cmdkit.HelpText{ Helptext: cmdkit.HelpText{
Tagline: "List known addresses. Useful for debugging.", Tagline: "List known addresses. Useful for debugging.",
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论