ipn/wg: peer & dns resolution stats

Author: ignoramous

intra/backend/ipn_proxies.go

@@ -258,6 +258,8 @@ type RouterStats struct {
 	Since int64
 	// Current proxy status
 	Status string
+	// Extra is extra info about this router
+	Extra string
 }
 
 type RpnServers interface {

intra/ipn/multihost/map.go

@@ -7,6 +7,7 @@
 package multihost
 
 import (
+	"fmt"
 	"net/netip"
 	"net/url"
 	"strings"
@@ -202,9 +203,12 @@ func (m *MHMap) String() string {
 
 	var sb strings.Builder
 	sb.WriteString(m.k + ": ")
+	i := 0
 	for h := range m.uniq {
+		sb.WriteString(fmt.Sprintf("#%d ", i))
 		sb.WriteString(h.String())
 		sb.WriteString("  /  ")
+		i++
 	}
 	return sb.String()
 }

intra/ipn/multihost/multihost.go

@@ -77,7 +77,18 @@ func (h *MH) String() string {
 	if h == nil {
 		return "<nil>"
 	}
-	return h.o + ":" + strings.Join(h.straddrs(), ",")
+	return h.o + "[" + strings.Join(h.Names(), ",") +
+		" | " + strings.Join(h.straddrs(), ",") + "]" +
+		" @ " + core.FmtTimeAsPeriod(h.Mtime())
+}
+
+func (h *MH) Mtime() time.Time {
+	if h == nil {
+		return time.Time{}
+	}
+	h.RLock()
+	defer h.RUnlock()
+	return h.mtime
 }
 
 func (h *MH) straddrs() []string {

intra/ipn/wgproxy.go

@@ -1125,20 +1125,10 @@ func (tun *wgtun) Close() error {
 func (w *wgproxy) Stat() (out *x.RouterStats) {
 	out = new(x.RouterStats)
 
-	if w.status.Load() == END {
-		log.W("proxy: wg: %s stats: stopped", w.tag())
-		return // zz
-	}
-
-	stat := wg.ReadStats(w.id, w.Handle(), w.Device.IpcGet)
-	if stat == nil { // unlikely
-		log.V("proxy: wg: %s stats: readstats: nil", w.tag())
-		return // zz
-	}
-	out.Rx = stat.TotalRx()
-	out.Tx = stat.TotalTx()
-	out.LastOK = stat.LatestRecentHandshake()
 	out.Addr = w.IfAddr() // may be empty
+	out.Rx = -1
+	out.Tx = -2
+	out.LastOK = -3
 	out.ErrRx = w.errRx.Load()
 	out.ErrTx = w.errTx.Load()
 	out.LastRx = w.latestRx.Load()
@@ -1149,7 +1139,21 @@ func (w *wgproxy) Stat() (out *x.RouterStats) {
 	out.Since = w.since
 	out.Status = pxstatus(w.status.Load()).String()
 
+	if w.status.Load() == END {
+		log.W("proxy: wg: %s stats: stopped", w.tag())
+		return // zz
+	}
+
+	stat := wg.ReadStats(w.id, w.Handle(), w.Device.IpcGet)
+	if stat != nil { // unlikely
+		out.Rx = stat.TotalRx()
+		out.Tx = stat.TotalTx()
+		out.LastOK = stat.LatestRecentHandshake()
+	}
+
 	if settings.Debug {
+		out.Extra = w.remote.Load().String() + "\n" + w.dns.Load().String()
+
 		log.VV("proxy: wg: %s stats: rx: %d, tx: %d, r: %s (rlastok: %s), w: %s (wlastok: %s), lastok: %s",
 			w.tag(), out.Rx, out.Tx,
 			core.FmtUnixMillisAsPeriod(out.LastRx), core.FmtUnixMillisAsPeriod(out.LastGoodRx),