From 93366bb63a0892b75bab1a0ba34232f2f8cc44f4 Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Mon, 13 Apr 2020 19:12:54 +1000 Subject: [PATCH] Rename webtorrent.NewClient->NewTrackerClient --- torrent.go | 2 +- webtorrent/tracker_client.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/torrent.go b/torrent.go index 731d4956..a974db28 100644 --- a/torrent.go +++ b/torrent.go @@ -1317,7 +1317,7 @@ func (t *Torrent) startScrapingTracker(_url string) { sl := func() torrentTrackerAnnouncer { switch u.Scheme { case "ws", "wss": - wst := websocketTracker{*u, webtorrent.NewClient(t.cl.peerID, t.infoHash, t.onWebRtcConn, + wst := websocketTracker{*u, webtorrent.NewTrackerClient(t.cl.peerID, t.infoHash, t.onWebRtcConn, t.logger.WithText(func(m log.Msg) string { return fmt.Sprintf("%q: %v", u.String(), m.Text()) }))} diff --git a/webtorrent/tracker_client.go b/webtorrent/tracker_client.go index 311b8cfe..d66a54a2 100644 --- a/webtorrent/tracker_client.go +++ b/webtorrent/tracker_client.go @@ -39,7 +39,7 @@ type DataChannelContext struct { type onDataChannelOpen func(_ datachannel.ReadWriteCloser, dcc DataChannelContext) -func NewClient(peerId, infoHash [20]byte, onConn onDataChannelOpen, logger log.Logger) *TrackerClient { +func NewTrackerClient(peerId, infoHash [20]byte, onConn onDataChannelOpen, logger log.Logger) *TrackerClient { return &TrackerClient{ outboundOffers: make(map[string]outboundOffer), peerIDBinary: binaryToJsonString(peerId[:]), @@ -118,7 +118,6 @@ func (c *TrackerClient) announce(request tracker.AnnounceRequest) error { } func (c *TrackerClient) trackerReadLoop() error { - c.lock.Lock() tracker := c.tracker c.lock.Unlock() -- 2.50.0