review

ethanndickson · ethanndickson · commit 1ac2baef6a75 · 2024-11-27T01:06:05.000Z
diff --git a/vpn/dylib/lib.go b/vpn/dylib/lib.go
@@ -49,6 +49,7 @@ func OpenTunnel(cReadFD, cWriteFD int32) int32 {
 	_, err = vpn.NewTunnel(ctx, slog.Make(), conn, vpn.NewClient(),
 		vpn.UseAsDNSConfig(),
 		vpn.UseAsRouter(),
+		vpn.UseAsLogger(),
 	)
 	if err != nil {
 		unix.Close(readFD)
diff --git a/vpn/tunnel.go b/vpn/tunnel.go
@@ -35,6 +35,9 @@ type Tunnel struct {
 	client Client
 	conn   Conn
 
+	// clientLogger is deliberately separate, to avoid the tunnel using itself
+	// as a sink for it's own logs, which could lead to deadlocks
+	clientLogger slog.Logger
 	// router and dnsConfigurator may be nil
 	router          router.Router
 	dnsConfigurator dns.OSConfigurator
@@ -60,6 +63,7 @@ func NewTunnel(
 		speaker:         *(s),
 		ctx:             ctx,
 		logger:          logger,
+		clientLogger:    slog.Make(),
 		requestLoopDone: make(chan struct{}),
 		client:          client,
 	}
@@ -161,7 +165,7 @@ func UseAsRouter() TunnelOption {
 
 func UseAsLogger() TunnelOption {
 	return func(t *Tunnel) {
-		t.logger = t.logger.AppendSinks(t)
+		t.clientLogger = t.clientLogger.AppendSinks(t)
 	}
 }
 
@@ -227,7 +231,7 @@ func (t *Tunnel) start(req *StartRequest) error {
 			apiToken,
 			&Options{
 				Headers:           header,
-				Logger:            t.logger,
+				Logger:            t.clientLogger,
 				DNSConfigurator:   t.dnsConfigurator,
 				Router:            t.router,
 				TUNFileDescriptor: ptr.Ref(int(req.GetTunnelFileDescriptor())),
@@ -305,7 +309,7 @@ func convertWorkspaceUpdate(update tailnet.WorkspaceUpdate) *PeerUpdate {
 	for i, agent := range update.UpsertedAgents {
 		fqdn := make([]string, 0, len(agent.Hosts))
 		for name := range agent.Hosts {
-			fqdn = append(fqdn, name.WithoutTrailingDot())
+			fqdn = append(fqdn, name.WithTrailingDot())
 		}
 		out.UpsertedAgents[i] = &Agent{
 			Id:          tailnet.UUIDToByteSlice(agent.ID),
@@ -327,7 +331,7 @@ func convertWorkspaceUpdate(update tailnet.WorkspaceUpdate) *PeerUpdate {
 	for i, agent := range update.DeletedAgents {
 		fqdn := make([]string, 0, len(agent.Hosts))
 		for name := range agent.Hosts {
-			fqdn = append(fqdn, name.WithoutTrailingDot())
+			fqdn = append(fqdn, name.WithTrailingDot())
 		}
 		out.DeletedAgents[i] = &Agent{
 			Id:          tailnet.UUIDToByteSlice(agent.ID),

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ func OpenTunnel(cReadFD, cWriteFD int32) int32 {`
`49`	`49`	`_, err = vpn.NewTunnel(ctx, slog.Make(), conn, vpn.NewClient(),`
`50`	`50`	`vpn.UseAsDNSConfig(),`
`51`	`51`	`vpn.UseAsRouter(),`
	`52`	`+ vpn.UseAsLogger(),`
`52`	`53`	`)`
`53`	`54`	`if err != nil {`
`54`	`55`	`unix.Close(readFD)`