Include selected overlay type in connection status

router/fastdp.go

@@ -662,6 +662,10 @@ func (fwd *fastDatapathForwarder) ControlMessage(tag byte, msg []byte) {
 	}
 }
 
+func (fwd *fastDatapathForwarder) OverlayType() string {
+	return "fastdp"
+}
+
 func (fwd *fastDatapathForwarder) handleHeartbeatAck() {
 	log.Debug(fwd.logPrefix(), "handleHeartbeatAck")
 

router/overlay.go

@@ -88,6 +88,9 @@ type OverlayForwarder interface {
 	// compatibility, and should always be
 	// ProtocolOverlayControlMessage for non-sleeve overlays.
 	ControlMessage(tag byte, msg []byte)
+
+	// Type of overlay this forwarder belongs to
+	OverlayType() string
 }
 
 type NullOverlay struct{}
@@ -129,3 +132,7 @@ func (NullOverlay) Stop() {
 
 func (NullOverlay) ControlMessage(byte, []byte) {
 }
+
+func (NullOverlay) OverlayType() string {
+	return "null"
+}

router/overlay_switch.go

@@ -393,3 +393,15 @@ func (fwd *overlaySwitchForwarder) ControlMessage(tag byte, msg []byte) {
 		subFwd.ControlMessage(msg[1], msg[2:])
 	}
 }
+
+func (fwd *overlaySwitchForwarder) OverlayType() string {
+	fwd.lock.Lock()
+	best := fwd.best
+	fwd.lock.Unlock()
+
+	if best == nil {
+		return "none"
+	}
+
+	return best.OverlayType()
+}

router/sleeve.go

@@ -593,6 +593,10 @@ func (fwd *sleeveForwarder) ControlMessage(tag byte, msg []byte) {
 	}
 }
 
+func (fwd *sleeveForwarder) OverlayType() string {
+	return "sleeve"
+}
+
 func (fwd *sleeveForwarder) Stop() {
 	fwd.sleeve.removeForwarder(fwd.remotePeer.Name, fwd)
 

router/status.go

@@ -1,6 +1,7 @@
 package router
 
 import (
+	"fmt"
 	"time"
 )
 
@@ -170,7 +171,9 @@ func NewLocalConnectionStatusSlice(cm *ConnectionMaker) []LocalConnectionStatus
 			if conn.Established() {
 				state = "established"
 			}
-			slice = append(slice, LocalConnectionStatus{conn.RemoteTCPAddr(), conn.Outbound(), state, conn.Remote().String()})
+			lc, _ := conn.(*LocalConnection)
+			info := fmt.Sprintf("%-6v %v", lc.forwarder.OverlayType(), conn.Remote())
+			slice = append(slice, LocalConnectionStatus{conn.RemoteTCPAddr(), conn.Outbound(), state, info})
 		}
 		for address, target := range cm.targets {
 			add := func(state, info string) {