pass TrackerDialContext to webtorrent trackers (#785)

anacrolix · Nov 14, 2022 · 455913c · 455913c
1 parent 8e53dba
commit 455913c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/client.go b/client.go
@@ -298,7 +298,8 @@ func NewClient(cfg *ClientConfig) (cl *Client, err error) {
 			}
 			return t.announceRequest(event), nil
 		},
-		Proxy: cl.config.HTTPProxy,
+		Proxy:       cl.config.HTTPProxy,
+		DialContext: cl.config.TrackerDialContext,
 		OnConn: func(dc datachannel.ReadWriteCloser, dcc webtorrent.DataChannelContext) {
 			cl.lock()
 			defer cl.unlock()

diff --git a/wstracker.go b/wstracker.go
@@ -1,7 +1,9 @@
 package torrent
 
 import (
+	"context"
 	"fmt"
+	"net"
 	"net/url"
 	"sync"
 
@@ -40,14 +42,15 @@ type websocketTrackers struct {
 	mu                 sync.Mutex
 	clients            map[string]*refCountedWebtorrentTrackerClient
 	Proxy              http.ProxyFunc
+	DialContext        func(ctx context.Context, network, addr string) (net.Conn, error)
 }
 
 func (me *websocketTrackers) Get(url string, infoHash [20]byte) (*webtorrent.TrackerClient, func()) {
 	me.mu.Lock()
 	defer me.mu.Unlock()
 	value, ok := me.clients[url]
 	if !ok {
-		dialer := &websocket.Dialer{Proxy: me.Proxy, HandshakeTimeout: websocket.DefaultDialer.HandshakeTimeout}
+		dialer := &websocket.Dialer{Proxy: me.Proxy, NetDialContext: me.DialContext, HandshakeTimeout: websocket.DefaultDialer.HandshakeTimeout}
 		value = &refCountedWebtorrentTrackerClient{
 			TrackerClient: webtorrent.TrackerClient{
 				Dialer:             dialer,