TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-12 05:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
derp/derphttp/websocket.go
View File

@@ -13,7 +13,6 @@ import (
"net"
"nhooyr.io/websocket"
"tailscale.com/net/wsconn"
)
func init() {
@@ -29,5 +28,6 @@ func dialWebsocket(ctx context.Context, urlStr string) (net.Conn, error) {
return nil, err
}
log.Printf("websocket: connected to %v", urlStr)
return wsconn.New(c), nil
netConn := websocket.NetConn(context.Background(), c, websocket.MessageBinary)
return netConn, nil
}