From: martin <yang.ruoqi@outlook.com>
Date: Tue, 14 Dec 2021 15:57:19 +0000 (+0800)
Subject: * set proxy of websocket tracker to the proxy used by client config
X-Git-Tag: v1.40.0~16
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=b6cc93c0bef01665484ddc3a49fd56d6c484424f;p=btrtrc.git

* set proxy of websocket tracker to the proxy used by client config
---

diff --git a/client.go b/client.go
index 9d0777e4..a3f55c6f 100644
--- a/client.go
+++ b/client.go
@@ -298,6 +298,7 @@ func NewClient(cfg *ClientConfig) (cl *Client, err error) {
 			}
 			return t.announceRequest(event), nil
 		},
+		Proxy: cl.config.HTTPProxy,
 		OnConn: func(dc datachannel.ReadWriteCloser, dcc webtorrent.DataChannelContext) {
 			cl.lock()
 			defer cl.unlock()
diff --git a/webtorrent/tracker_client.go b/webtorrent/tracker_client.go
index f4136c60..9f02c7e7 100644
--- a/webtorrent/tracker_client.go
+++ b/webtorrent/tracker_client.go
@@ -28,6 +28,7 @@ type TrackerClient struct {
 	PeerId             [20]byte
 	OnConn             onDataChannelOpen
 	Logger             log.Logger
+	Dialer             *websocket.Dialer
 
 	mu             sync.Mutex
 	cond           sync.Cond
@@ -70,7 +71,7 @@ func (tc *TrackerClient) doWebsocket() error {
 	tc.mu.Lock()
 	tc.stats.Dials++
 	tc.mu.Unlock()
-	c, _, err := websocket.DefaultDialer.Dial(tc.Url, nil)
+	c, _, err := tc.Dialer.Dial(tc.Url, nil)
 	if err != nil {
 		return fmt.Errorf("dialing tracker: %w", err)
 	}
diff --git a/wstracker.go b/wstracker.go
index f93f784a..396b5aa5 100644
--- a/wstracker.go
+++ b/wstracker.go
@@ -2,11 +2,12 @@ package torrent
 
 import (
 	"fmt"
+	"github.com/anacrolix/log"
+	"github.com/anacrolix/torrent/tracker/http"
+	"github.com/gorilla/websocket"
 	"net/url"
 	"sync"
 
-	"github.com/anacrolix/log"
-
 	"github.com/anacrolix/torrent/tracker"
 	"github.com/anacrolix/torrent/webtorrent"
 	"github.com/pion/datachannel"
@@ -37,6 +38,7 @@ type websocketTrackers struct {
 	OnConn             func(datachannel.ReadWriteCloser, webtorrent.DataChannelContext)
 	mu                 sync.Mutex
 	clients            map[string]*refCountedWebtorrentTrackerClient
+	Proxy              http.ProxyFunc
 }
 
 func (me *websocketTrackers) Get(url string) (*webtorrent.TrackerClient, func()) {
@@ -44,8 +46,10 @@ func (me *websocketTrackers) Get(url string) (*webtorrent.TrackerClient, func())
 	defer me.mu.Unlock()
 	value, ok := me.clients[url]
 	if !ok {
+		dialer := &websocket.Dialer{Proxy: me.Proxy, HandshakeTimeout: websocket.DefaultDialer.HandshakeTimeout}
 		value = &refCountedWebtorrentTrackerClient{
 			TrackerClient: webtorrent.TrackerClient{
+				Dialer:             dialer,
 				Url:                url,
 				GetAnnounceRequest: me.GetAnnounceRequest,
 				PeerId:             me.PeerId,