No Web*

[btrtrc.git] / client.go

diff --git a/client.go b/client.go
index cc328cc6567976b1635930467a5d295a529f530f..302cbc2b95be28b515c141d9e3ad79dc28feb6b7 100644 (file)
--- a/client.go
+++ b/client.go
@@ -23,8 +23,8 @@ import (
        "github.com/anacrolix/chansync/events"
        "github.com/anacrolix/dht/v2"
        "github.com/anacrolix/dht/v2/krpc"
-       g "github.com/anacrolix/generics"
        . "github.com/anacrolix/generics"
+       g "github.com/anacrolix/generics"
        "github.com/anacrolix/log"
        "github.com/anacrolix/missinggo/perf"
        "github.com/anacrolix/missinggo/v2"
@@ -34,7 +34,6 @@ import (
        "github.com/davecgh/go-spew/spew"
        "github.com/dustin/go-humanize"
        gbtree "github.com/google/btree"
-       "github.com/pion/datachannel"
        "golang.org/x/time/rate"
 
        "github.com/anacrolix/torrent/bencode"
@@ -45,9 +44,7 @@ import (
        pp "github.com/anacrolix/torrent/peer_protocol"
        request_strategy "github.com/anacrolix/torrent/request-strategy"
        "github.com/anacrolix/torrent/storage"
-       "github.com/anacrolix/torrent/tracker"
        "github.com/anacrolix/torrent/types/infohash"
-       "github.com/anacrolix/torrent/webtorrent"
 )
 
 // Clients contain zero or more Torrents. A Client manages a blocklist, the
@@ -84,8 +81,6 @@ type Client struct {
        dialRateLimiter *rate.Limiter
        numHalfOpen     int
 
-       websocketTrackers websocketTrackers
-
        activeAnnounceLimiter limiter.Instance
        httpClient            *http.Client
 }
@@ -286,37 +281,6 @@ func NewClient(cfg *ClientConfig) (cl *Client, err error) {
                }
        }
 
-       cl.websocketTrackers = websocketTrackers{
-               PeerId: cl.peerID,
-               Logger: cl.logger,
-               GetAnnounceRequest: func(event tracker.AnnounceEvent, infoHash [20]byte) (tracker.AnnounceRequest, error) {
-                       cl.lock()
-                       defer cl.unlock()
-                       t, ok := cl.torrents[infoHash]
-                       if !ok {
-                               return tracker.AnnounceRequest{}, errors.New("torrent not tracked by client")
-                       }
-                       return t.announceRequest(event), nil
-               },
-               Proxy:                      cl.config.HTTPProxy,
-               WebsocketTrackerHttpHeader: cl.config.WebsocketTrackerHttpHeader,
-               DialContext:                cl.config.TrackerDialContext,
-               OnConn: func(dc datachannel.ReadWriteCloser, dcc webtorrent.DataChannelContext) {
-                       cl.lock()
-                       defer cl.unlock()
-                       t, ok := cl.torrents[dcc.InfoHash]
-                       if !ok {
-                               cl.logger.WithDefaultLevel(log.Warning).Printf(
-                                       "got webrtc conn for unloaded torrent with infohash %x",
-                                       dcc.InfoHash,
-                               )
-                               dc.Close()
-                               return
-                       }
-                       go t.onWebRtcConn(dc, dcc)
-               },
-       }
-
        return
 }