net/wsconn: remove homegrown wrapper for turning a websocket.Conn into a net.Conn

The one from the nhooyr/websocket package seems to work equally well.

Signed-off-by: Mihai Parparita <mihai@tailscale.com>
This commit is contained in:
Mihai Parparita
2022-06-06 16:13:15 -07:00
committed by Mihai Parparita
parent cfb5bd0559
commit edc90ebc61
7 changed files with 7 additions and 115 deletions

View File

@@ -6,6 +6,7 @@ package main
import (
"bufio"
"context"
"expvar"
"log"
"net/http"
@@ -13,7 +14,6 @@ import (
"nhooyr.io/websocket"
"tailscale.com/derp"
"tailscale.com/net/wsconn"
)
var counterWebSocketAccepts = expvar.NewInt("derp_websocket_accepts")
@@ -45,7 +45,7 @@ func addWebSocketSupport(s *derp.Server, base http.Handler) http.Handler {
return
}
counterWebSocketAccepts.Add(1)
wc := wsconn.New(c)
wc := websocket.NetConn(context.Background(), c, websocket.MessageBinary)
brw := bufio.NewReadWriter(bufio.NewReader(wc), bufio.NewWriter(wc))
s.Accept(wc, brw, r.RemoteAddr)
})