diff --git a/prog/weaver/http.go b/prog/weaver/http.go index 05bc0fe5fd..a45a559307 100644 --- a/prog/weaver/http.go +++ b/prog/weaver/http.go @@ -211,7 +211,7 @@ var targetsTemplate = defTemplate("targetsTemplate", `\ var connectionsTemplate = defTemplate("connectionsTemplate", `\ {{range .Router.Connections}}\ -{{if .Outbound}}->{{else}}<-{{end}} {{printf "%-21v" .Address}} {{printf "%-11v" .State}} {{.Info}} +{{if .Outbound}}->{{else}}<-{{end}} {{printf "%-21v" .Address}} {{printf "%-11v" .State}} {{.Info}} {{range $key,$element := .Attrs}}{{$key}}={{$element}}{{end}} {{end}}\ `) diff --git a/router/awsvpc.go b/router/awsvpc.go index 59c64c979d..d3c53e4991 100644 --- a/router/awsvpc.go +++ b/router/awsvpc.go @@ -32,8 +32,8 @@ func (conn *AWSVPCConnection) Stop() {} func (conn *AWSVPCConnection) ControlMessage(tag byte, msg []byte) { } -func (conn *AWSVPCConnection) DisplayName() string { - return "awsvpc" +func (conn *AWSVPCConnection) GetDisplayNameAndAttrs() (string, map[string]interface{}) { + return "awsvpc", nil } // OverlayForwarder diff --git a/router/fastdp.go b/router/fastdp.go index 6627cd4e99..9ccd0ef2c1 100644 --- a/router/fastdp.go +++ b/router/fastdp.go @@ -771,8 +771,8 @@ func (fwd *fastDatapathForwarder) ControlMessage(tag byte, msg []byte) { } } -func (fwd *fastDatapathForwarder) DisplayName() string { - return "fastdp" +func (fwd *fastDatapathForwarder) GetDisplayNameAndAttrs() (string, map[string]interface{}) { + return "fastdp", map[string]interface{}{"mtu": fwd.fastdp.iface.MTU} } func (fwd *fastDatapathForwarder) handleHeartbeatAck() { diff --git a/router/overlay_switch.go b/router/overlay_switch.go index 553b9fdc6f..e132fdd2b0 100644 --- a/router/overlay_switch.go +++ b/router/overlay_switch.go @@ -424,7 +424,7 @@ func (fwd *overlaySwitchForwarder) ControlMessage(tag byte, msg []byte) { } } -func (fwd *overlaySwitchForwarder) DisplayName() string { +func (fwd *overlaySwitchForwarder) GetDisplayNameAndAttrs() (string, map[string]interface{}) { var best OverlayForwarder fwd.lock.Lock() @@ -434,8 +434,8 @@ func (fwd *overlaySwitchForwarder) DisplayName() string { fwd.lock.Unlock() if best != nil { - return best.DisplayName() + return best.GetDisplayNameAndAttrs() } - return "none" + return "none", nil } diff --git a/router/sleeve.go b/router/sleeve.go index 29bbc91040..6355105970 100644 --- a/router/sleeve.go +++ b/router/sleeve.go @@ -606,8 +606,8 @@ func (fwd *sleeveForwarder) ControlMessage(tag byte, msg []byte) { } } -func (fwd *sleeveForwarder) DisplayName() string { - return "sleeve" +func (fwd *sleeveForwarder) GetDisplayNameAndAttrs() (string, map[string]interface{}) { + return "sleeve", map[string]interface{}{"mtu": fwd.mtu} } func (fwd *sleeveForwarder) Stop() { diff --git a/vendor/github.com/weaveworks/mesh b/vendor/github.com/weaveworks/mesh index 3dd75b104a..67064ee4b1 160000 --- a/vendor/github.com/weaveworks/mesh +++ b/vendor/github.com/weaveworks/mesh @@ -1 +1 @@ -Subproject commit 3dd75b104a40feb6f8ef7f6eef3bbfb0e3500403 +Subproject commit 67064ee4b1fdbb50613dbb2fa65b6443ef312fe4