log: adapt Console to backend.Gomsg instead of string

Author: ignoramous

intra/log/log.go

@@ -43,23 +43,12 @@ const (
 	callerat = 2
 )
 
-// String wrapped in struct Logmsg is a workaround for:
-// github.com/golang/go/issues/46893
-type Logmsg struct {
-	S string
-}
-
-func (m *Logmsg) String() string {
-	if m == nil {
-		return ""
-	}
-	return m.S
-}
+type Logmsg string
 
 // Console is an external logger.
 type Console interface {
 	// Log logs a multi-line msg.
-	Log(level int32, msg *Logmsg)
+	Log(level int32, msg Logmsg)
 }
 
 type conMsg struct {

intra/log/logger.go

@@ -283,7 +283,7 @@ func (l *simpleLogger) incrStCount(id string) (c uint32) {
 // Must be called once from a goroutine.
 func (l *simpleLogger) consoleDispatcher() {
 	for m := range l.cmsgC {
-		if m == nil || len(m.m.S) <= 0 { // no msg
+		if m == nil || len(m.m) <= 0 { // no msg
 			continue
 		}
 		load := (len(l.cmsgC) / cap(l.cmsgC) * 100) // load percentage
@@ -293,24 +293,24 @@ func (l *simpleLogger) consoleDispatcher() {
 				// drop
 			case VVERBOSE, VERBOSE, DEBUG, INFO:
 				if load < 50 {
-					c.Log(int32(m.t), &m.m)
+					c.Log(int32(m.t), m.m)
 					continue
 				} // drop
 			case WARN, ERROR:
 				if load < 5 {
 					if d := l.cskips.Swap(0); d > 0 {
-						c.Log(int32(WARN), &Logmsg{l.msgstr(WARN, "backpressure... dropped %d msgs", d)})
+						c.Log(int32(WARN), Logmsg(l.msgstr(WARN, "backpressure... dropped %d msgs", d)))
 					}
 				}
 				if load < 80 {
-					c.Log(int32(m.t), &m.m)
+					c.Log(int32(m.t), m.m)
 					continue
 				} // drop
 			case STACKTRACE:
-				c.Log(int32(m.t), &m.m)
+				c.Log(int32(m.t), m.m)
 				continue
 			case USR:
-				c.Log(int32(m.t), &m.m)
+				c.Log(int32(m.t), m.m)
 				continue
 			}
 		} // dropped
@@ -331,7 +331,7 @@ func (l *simpleLogger) Usr(msg string) {
 		if count := l.incrStCount(msg); count > similarUsrMsgThreshold {
 			return
 		}
-		l.consoleQueue(&conMsg{Logmsg{msg}, USR})
+		l.consoleQueue(&conMsg{Logmsg(msg), USR})
 	}
 }
 
@@ -392,7 +392,7 @@ func (l *simpleLogger) emitStack(at int, msgs ...string) {
 			// c.Stack() on the same go routine, since
 			// the caller (ex: core.Recover) may exit
 			// immediately once simpleLogger.Stack() returns
-			c.Log(int32(STACKTRACE), &Logmsg{msg})
+			c.Log(int32(STACKTRACE), Logmsg(msg))
 		} else {
 			// msg, which is unsafely type-coerced from []byte,
 			// is pooled; but the caller owns []byte and so it
@@ -551,7 +551,7 @@ func (l *simpleLogger) writelog(lvl LogLevel, at int, msg string, args ...any) {
 			}
 			// print spammsg only if spamming is not allowed
 			if cc && !spamConsole {
-				l.consoleQueue(&conMsg{Logmsg{spammsg}, lvl})
+				l.consoleQueue(&conMsg{Logmsg(spammsg), lvl})
 			}
 		}
 	}
@@ -576,7 +576,7 @@ func (l *simpleLogger) writelog(lvl LogLevel, at int, msg string, args ...any) {
 			l.out(msg)
 		}
 		if cc && (!isspam || spamConsole) {
-			l.consoleQueue(&conMsg{Logmsg{msg}, lvl})
+			l.consoleQueue(&conMsg{Logmsg(msg), lvl})
 		}
 	}
 }

intra/tun2socks.go

@@ -41,10 +41,11 @@ import (
 // pkg.go.dev/runtime#hdr-Environment_Variables
 type traceout string
 
-type Console = log.Console
-type Logmsg = log.Logmsg
-type Controller x.Controller
+type Console interface {
+	Log(int32, *x.Gomsg)
+}
 
+type Controller x.Controller
 type ProxyListener x.ProxyListener
 type DNSListener x.DNSListener
 type ServerListener rnet.ServerListener

intra/tunnel.go

@@ -143,7 +143,7 @@ func NewTunnel(fd, mtu int, fakedns string, dtr DefaultDNS, bdg Bridge) (t Tunne
 
 	const dualstack = settings.IP46
 
-	log.SetConsole(bdg)
+	log.SetConsole(&clogAdapter{bdg})
 	natpt := x64.NewNatPt()
 	proxies := ipn.NewProxifier(ctx, dualstack, mtu, bdg, bdg)
 	services := rnet.NewServices(ctx, proxies, bdg, bdg)
@@ -417,3 +417,13 @@ func fetchDNSInfo(r dnsx.Resolver, id string) string {
 		return rerr.Error()
 	}
 }
+
+type clogAdapter struct {
+	b Bridge
+}
+
+var _ log.Console = (*clogAdapter)(nil)
+
+func (l *clogAdapter) Log(lvl int32, msg log.Logmsg) {
+	l.b.Log(lvl, x.MsgOf(string(msg))) // adopt the log message
+}