config.go | 2 +- torrent.go | 6 +++--- tracker_scraper.go | 12 ++++++------ diff --git a/config.go b/config.go index 50c46afa06f43da62124152224cc6c5f17692753..564149d31545cb2f2499d57690ed9f94f2769d85 100644 --- a/config.go +++ b/config.go @@ -92,7 +92,7 @@ // "net/http".ProxyURL(HTTPProxy). HTTPProxy func(*http.Request) (*url.URL, error) // Takes a tracker's hostname and requests DNS A and AAAA records. // Used in case DNS lookups require a special setup (i.e., dns-over-https) - TrackerIpFetcher func(*url.URL) ([]net.IP, error) + LookupTrackerIp func(*url.URL) ([]net.IP, error) // HTTPUserAgent changes default UserAgent for HTTP requests HTTPUserAgent string // Updated occasionally to when there's been some changes to client diff --git a/torrent.go b/torrent.go index 8fa4c7deee61052f35cbff494c681d5318cdd637..93d7d5f4a5795155adf548a71cc7dea7d634fd05 100644 --- a/torrent.go +++ b/torrent.go @@ -1577,9 +1577,9 @@ return nil } } newAnnouncer := &trackerScraper{ - u: *u, - t: t, - ipFetcher: t.cl.config.TrackerIpFetcher, + u: *u, + t: t, + lookupTrackerIp: t.cl.config.LookupTrackerIp, } go newAnnouncer.Run() return newAnnouncer diff --git a/tracker_scraper.go b/tracker_scraper.go index f9d37d86586eb5425601208b50aa39dcf851fd89..d4bce60a8552ff3d4ff5ef5ebd8bfca7fe2a3ff6 100644 --- a/tracker_scraper.go +++ b/tracker_scraper.go @@ -18,10 +18,10 @@ // 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 @@ } 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())