intra: global console

Author: ignoramous

intra/tun2socks.go

@@ -60,11 +60,52 @@ const maxMemLimit = 4 * 1024 * 1024 * 1024 // 4GiB
 
 func init() {
 	// increase garbage collection frequency: archive.is/WQBf7
-	debug.SetGCPercent(25)
+	debug.SetGCPercent(50)
 	debug.SetMemoryLimit(maxMemLimit)
 	debug.SetPanicOnFault(true)
 }
 
+// SetupConsole wires up firestack's logger to bdg.
+func SetupConsole(console Console) {
+	ctx := context.Background()
+
+	logch := make(chan bool, 1)
+	crashch := make(chan bool, 1)
+	go func() {
+		logfd := false
+		if r, c, err := log.NewFilebased(); err == nil {
+			closeall := func() {
+				core.Close(c)
+				core.Close(r)
+			}
+			if logfd = console.LogFD(int(r.Fd())); logfd {
+				log.SetConsole(ctx, c)
+				context.AfterFunc(ctx, closeall)
+			} else {
+				closeall()
+			}
+		}
+		if !logfd {
+			log.SetConsole(ctx, &clogAdapter{console})
+		}
+		log.D("tun: <<< console >>>; log out ok; fd? %t", logfd)
+		logch <- logfd
+	}()
+
+	go func() {
+		crashfd := pipeCrashOutput(console)
+		crashch <- crashfd
+		log.D("tun: <<< console >>>; crash out ok; fd? %t", crashfd)
+	}()
+
+	logfd := <-logch
+	crashfd := <-crashch
+
+	log.ConsoleReady(ctx)
+
+	log.I("tun: <<< console >>>; logger: ok; fds (log? %t / crash? %t)", logfd, crashfd)
+}
+
 // Connect creates firestack-administered tunnel.
 // `fd` is the TUN device. The tunnel acquires an additional reference to it, which is
 // released by Disconnect(), so the caller must close `fd` and Disconnect() to close the TUN device.
@@ -259,15 +300,15 @@ func PanicAtRandom(y bool) {
 	log.I("tun: panic at random? %t", y)
 }
 
-func pipeCrashOutput(bdg Bridge) (ok bool) {
+func pipeCrashOutput(c Console) (ok bool) {
 	r, w, err := os.Pipe()
 	if err != nil {
 		log.E("tun: err crash output pipe: %v", err)
 		return false
 	}
 	// core.Close(r) // do not close as r isn't dup'd by client code
 	defer core.Close(w) // always close as w is dup'd by the runtime
-	if setCrashFd(w) && bdg.CrashFD(int(r.Fd())) {
+	if setCrashFd(w) && c.CrashFD(int(r.Fd())) {
 		return true
 	}
 	return false

intra/tunnel.go

@@ -139,7 +139,7 @@ type rtunnel struct {
 var _ Tunnel = (*rtunnel)(nil)
 
 type clogAdapter struct {
-	b Bridge
+	b Console
 }
 
 var _ log.Console = (*clogAdapter)(nil)
@@ -189,35 +189,6 @@ func NewTunnel2(fd, linkmtu, tunmtu int, ifaddrs, fakedns string, dtr DefaultDNS
 
 	const dualstack = settings.IP46
 
-	logch := make(chan bool, 1)
-	crashch := make(chan bool, 1)
-	go func() {
-		logfd := false
-		if r, c, err := log.NewFilebased(); err == nil {
-			closeall := func() {
-				core.Close(c)
-				core.Close(r)
-			}
-			if logfd = bdg.LogFD(int(r.Fd())); logfd {
-				log.SetConsole(ctx, c)
-				context.AfterFunc(ctx, closeall)
-			} else {
-				closeall()
-			}
-		}
-		if !logfd {
-			log.SetConsole(ctx, &clogAdapter{bdg})
-		}
-		log.D("tun: <<< new >>>; log out ok; fd? %t", logfd)
-		logch <- logfd
-	}()
-
-	go func() {
-		crashfd := pipeCrashOutput(bdg)
-		crashch <- crashfd
-		log.D("tun: <<< new >>>; crash out ok; fd? %t", crashfd)
-	}()
-
 	natpt := x64.NewNatPt2(ctx)
 	proxies := ipn.NewProxifier(ctx, dualstack, linkmtu, bdg, bdg)
 	services := rnet.NewServices(ctx, proxies, bdg, bdg)
@@ -234,14 +205,7 @@ func NewTunnel2(fd, linkmtu, tunmtu int, ifaddrs, fakedns string, dtr DefaultDNS
 		return nil, err
 	}
 
-	log.D("tun: <<< new >>>; default dns: ok")
-
-	logfd := <-logch
-	crashfd := <-crashch
-
-	log.ConsoleReady(ctx)
-
-	log.D("tun: <<< new >>>; logger, proxies, svcs, bootstrap: ok; fds (log? %t / crash? %t)", logfd, crashfd)
+	log.D("tun: <<< new >>>; proxies, svcs, bootstrap: ok")
 
 	resolver := dnsx.NewResolver(ctx, fakedns, dtr, bdg, natpt)
 	resolver.Add(newGoosTransport(ctx, proxies))            // os-resolver; fixed