@@ -130,9 +130,10 @@ type Server struct {
130130// a lock on mu but protected by closing.
131131wg sync.WaitGroup
132132
133- Execer agentexec.Execer
134- logger slog.Logger
135- srv * ssh.Server
133+ Execer agentexec.Execer
134+ logger slog.Logger
135+ srv * ssh.Server
136+ x11Forwarder * x11Forwarder
136137
137138config * Config
138139
@@ -188,6 +189,14 @@ func NewServer(ctx context.Context, logger slog.Logger, prometheusRegistry *prom
188189config :config ,
189190
190191metrics :metrics ,
192+ x11Forwarder :& x11Forwarder {
193+ logger :logger ,
194+ x11HandlerErrors :metrics .x11HandlerErrors ,
195+ fs :fs ,
196+ displayOffset :* config .X11DisplayOffset ,
197+ sessions :make (map [* x11Session ]struct {}),
198+ connections :make (map [net.Conn ]struct {}),
199+ },
191200}
192201
193202srv := & ssh.Server {
@@ -455,7 +464,7 @@ func (s *Server) sessionHandler(session ssh.Session) {
455464
456465x11 ,hasX11 := session .X11 ()
457466if hasX11 {
458- display ,handled := s .x11Handler (ctx ,x11 )
467+ display ,handled := s .x11Forwarder . x11Handler (ctx ,session )
459468if ! handled {
460469logger .Error (ctx ,"x11 handler failed" )
461470closeCause ("x11 handler failed" )
@@ -1114,6 +1123,9 @@ func (s *Server) Close() error {
11141123
11151124s .mu .Unlock ()
11161125
1126+ s .logger .Debug (ctx ,"closing X11 forwarding" )
1127+ _ = s .x11Forwarder .Close ()
1128+
11171129s .logger .Debug (ctx ,"waiting for all goroutines to exit" )
11181130s .wg .Wait ()// Wait for all goroutines to exit.
11191131