torrent.go | 2 +- webtorrent/tracker_client.go | 3 +-- diff --git a/torrent.go b/torrent.go index 731d49565949ffb0cf05cbd241a7049a180d5292..a974db28d28fb813fe923643a877afa6d20f642f 100644 --- a/torrent.go +++ b/torrent.go @@ -1317,7 +1317,7 @@ } 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 311b8cfefbbb7af1ffca68f297f6d758947395c0..d66a54a28ecffbc678cd2fc21876706a323d67d1 100644 --- a/webtorrent/tracker_client.go +++ b/webtorrent/tracker_client.go @@ -39,7 +39,7 @@ } 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 @@ return nil } func (c *TrackerClient) trackerReadLoop() error { - c.lock.Lock() tracker := c.tracker c.lock.Unlock()