Dec 18, 2024
diff --git a/tailnet/derp.go b/tailnet/derp.go

 "nhooyr.io/websocket"
 "tailscale.com/derp"
 "tailscale.com/net/wsconn"
 )

 // WithWebsocketSupport returns an http.Handler that upgrades
 c.Close(websocket.StatusPolicyViolation, "client must speak the derp subprotocol")
 return
 }
 wc :=wsconn.NetConn(ctx, c, websocket.MessageBinary)
 wc :=websocket.NetConn(ctx, c, websocket.MessageBinary)
 brw := bufio.NewReadWriter(bufio.NewReader(wc), bufio.NewWriter(wc))
 s.Accept(ctx, wc, brw, r.RemoteAddr)
 }), func() {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,7 +10,6 @@ import (

		"nhooyr.io/websocket"
		"tailscale.com/derp"
		"tailscale.com/net/wsconn"
		)

		// WithWebsocketSupport returns an http.Handler that upgrades
Expand DownExpand Up		@@ -60,7 +59,7 @@ func WithWebsocketSupport(s *derp.Server, base http.Handler) (http.Handler, func
		c.Close(websocket.StatusPolicyViolation, "client must speak the derp subprotocol")
		return
		}
		wc :=wsconn.NetConn(ctx, c, websocket.MessageBinary)
		wc :=websocket.NetConn(ctx, c, websocket.MessageBinary)
		brw := bufio.NewReadWriter(bufio.NewReader(wc), bufio.NewWriter(wc))
		s.Accept(ctx, wc, brw, r.RemoteAddr)
		}), func() {
Expand Down