ipn/proxies,ipn/wg: enums for proxy status & wg gw op

Author: ignoramous

intra/ipn/proxies.go

@@ -68,6 +68,27 @@ const (
 	AUTOMTU2 = "(auto)"
 )
 
+type pxstatus int
+
+func (s pxstatus) String() string {
+	switch s {
+	case TKO:
+		return "notok"
+	case TOK:
+		return "ok"
+	case TUP:
+		return "up"
+	case TZZ:
+		return "idle"
+	case TNT:
+		return "unresponsive"
+	case END:
+		return "ended"
+	default:
+		return "unknown"
+	}
+}
+
 var (
 	errProxyScheme        = errors.New("proxy: unsupported scheme")
 	errUnexpectedProxy    = errors.New("proxy: unexpected type")

intra/ipn/wg/wgconn.go

@@ -94,9 +94,16 @@ func (k floodkind) String() string {
 	}
 }
 
-type rwobserver func(op string, err error)
+type rwobserver func(op PktDir, err error)
 type connector func(network, to string) (net.PacketConn, error)
 
+type PktDir string
+
+const (
+	Rcv PktDir = "recv"
+	Snd PktDir = "send"
+)
+
 type StdNetBind struct {
 	id      string
 	connect connector
@@ -336,7 +343,7 @@ func (s *StdNetBind) makeReceiveFn(uc net.PacketConn) conn.ReceiveFunc {
 	return func(bufs [][]byte, sizes []int, eps []conn.Endpoint) (n int, err error) {
 		defer core.Recover(core.Exit11, "wgconn.recv."+s.id)
 		defer func() {
-			s.observer("r", err)
+			s.observer(Rcv, err)
 		}()
 
 		usingamz := s.amnezia.Load().Set()
@@ -379,7 +386,7 @@ func timedout(err error) bool {
 func (s *StdNetBind) Send(buf [][]byte, peer conn.Endpoint) (err error) {
 	defer core.Recover(core.Exit11, "wgconn.send."+s.id)
 	defer func() {
-		s.observer("w", err)
+		s.observer(Snd, err)
 	}()
 
 	// the peer endpoint

intra/ipn/wgproxy.go

@@ -1343,7 +1343,7 @@ func (h *wgtun) serve(network, local string) (pc net.PacketConn, err error) {
 	return
 }
 
-func (h *wgtun) listener(op string, err error) {
+func (h *wgtun) listener(op wg.PktDir, err error) {
 	if h.status.Load() == END {
 		return
 	}
@@ -1362,9 +1362,9 @@ func (h *wgtun) listener(op string, err error) {
 	}
 
 	if s == TOK {
-		if op == "r" {
+		if op == wg.Rcv { // read
 			h.latestRx.Store(now())
-		} else if op == "w" {
+		} else if op == wg.Snd { // write
 			h.latestTx.Store(now())
 		}
 		writeElapsedMs := h.latestTx.Load() - h.latestRx.Load() // may be negative
@@ -1373,17 +1373,17 @@ func (h *wgtun) listener(op string, err error) {
 			s = TNT
 		}
 	} else if s == TKO {
-		if op == "r" {
+		if op == wg.Rcv {
 			h.errRx.Add(1)
-		} else if op == "w" {
+		} else if op == wg.Snd {
 			h.errTx.Add(1)
 		}
 	}
 
 	if s != TOK && s != TUP {
 		if n := h.remote.Load().MaybeRefresh(); n > 0 {
-			log.I("wg: %s (%s) listener: %s; refreshed n domains: %d",
-				h.id, h.viaStatus(), op, n)
+			log.I("wg: %s (%s) listener: %s, state: %s; refreshed n domains: %d",
+				h.id, h.viaStatus(), op, pxstatus(s), n)
 		}
 	}