Attribute accepted connection to holepunching when connect message is late

[btrtrc.git] / tracker_scraper.go

diff --git a/tracker_scraper.go b/tracker_scraper.go
index f9d37d86586eb5425601208b50aa39dcf851fd89..863838ace478b622721a89364380d92957e497db 100644 (file)
--- a/tracker_scraper.go
+++ b/tracker_scraper.go
@@ -18,10 +18,10 @@ import (
 // Announces a torrent to a tracker at regular intervals, when peers are
 // required.
 type trackerScraper struct {
-       u            url.URL
-       t            *Torrent
-       lastAnnounce trackerAnnounceResult
-       ipFetcher    func(*url.URL) ([]net.IP, error)
+       u               url.URL
+       t               *Torrent
+       lastAnnounce    trackerAnnounceResult
+       lookupTrackerIp func(*url.URL) ([]net.IP, error)
 }
 
 type torrentTrackerAnnouncer interface {
@@ -68,8 +68,8 @@ type trackerAnnounceResult struct {
 
 func (me *trackerScraper) getIp() (ip net.IP, err error) {
        var ips []net.IP
-       if me.ipFetcher != nil {
-               ips, err = me.ipFetcher(&me.u)
+       if me.lookupTrackerIp != nil {
+               ips, err = me.lookupTrackerIp(&me.u)
        } else {
                // Do a regular dns lookup
                ips, err = net.LookupIP(me.u.Hostname())
@@ -81,6 +81,12 @@ func (me *trackerScraper) getIp() (ip net.IP, err error) {
                err = errors.New("no ips")
                return
        }
+       me.t.cl.rLock()
+       defer me.t.cl.rUnlock()
+       if me.t.cl.closed.IsSet() {
+               err = errors.New("client is closed")
+               return
+       }
        for _, ip = range ips {
                if me.t.cl.ipIsBlocked(ip) {
                        continue
@@ -112,7 +118,6 @@ func (me *trackerScraper) trackerUrl(ip net.IP) string {
 // Return how long to wait before trying again. For most errors, we return 5
 // minutes, a relatively quick turn around for DNS changes.
 func (me *trackerScraper) announce(ctx context.Context, event tracker.AnnounceEvent) (ret trackerAnnounceResult) {
-
        defer func() {
                ret.Completed = time.Now()
        }()
@@ -151,16 +156,20 @@ func (me *trackerScraper) announce(ctx context.Context, event tracker.AnnounceEv
        defer cancel()
        me.t.logger.WithDefaultLevel(log.Debug).Printf("announcing to %q: %#v", me.u.String(), req)
        res, err := tracker.Announce{
-               Context:    ctx,
-               HTTPProxy:  me.t.cl.config.HTTPProxy,
-               UserAgent:  me.t.cl.config.HTTPUserAgent,
-               TrackerUrl: me.trackerUrl(ip),
-               Request:    req,
-               HostHeader: me.u.Host,
-               ServerName: me.u.Hostname(),
-               UdpNetwork: me.u.Scheme,
-               ClientIp4:  krpc.NodeAddr{IP: me.t.cl.config.PublicIp4},
-               ClientIp6:  krpc.NodeAddr{IP: me.t.cl.config.PublicIp6},
+               Context:             ctx,
+               HttpProxy:           me.t.cl.config.HTTPProxy,
+               HttpRequestDirector: me.t.cl.config.HttpRequestDirector,
+               DialContext:         me.t.cl.config.TrackerDialContext,
+               ListenPacket:        me.t.cl.config.TrackerListenPacket,
+               UserAgent:           me.t.cl.config.HTTPUserAgent,
+               TrackerUrl:          me.trackerUrl(ip),
+               Request:             req,
+               HostHeader:          me.u.Host,
+               ServerName:          me.u.Hostname(),
+               UdpNetwork:          me.u.Scheme,
+               ClientIp4:           krpc.NodeAddr{IP: me.t.cl.config.PublicIp4},
+               ClientIp6:           krpc.NodeAddr{IP: me.t.cl.config.PublicIp6},
+               Logger:              me.t.logger,
        }.Do()
        me.t.logger.WithDefaultLevel(log.Debug).Printf("announce to %q returned %#v: %v", me.u.String(), res, err)
        if err != nil {
@@ -190,7 +199,6 @@ func (me *trackerScraper) canIgnoreInterval(notify *<-chan struct{}) bool {
 }
 
 func (me *trackerScraper) Run() {
-
        defer me.announceStopped()
 
        ctx, cancel := context.WithCancel(context.Background())