Update dht to include interface change to OnAnnouncePeer

diff --git a/client.go b/client.go
index cdd3a29e7f38f1dbbd282d58de63b33ffcc5b814..f5b4adaea83d65b93d102b636424a93909d2f36e 100644 (file)
--- a/client.go
+++ b/client.go
@@ -1244,7 +1244,7 @@ func (cl *Client) newConnection(nc net.Conn, outgoing bool, remoteAddr IpPort, n
        return
 }
 
-func (cl *Client) onDHTAnnouncePeer(ih metainfo.Hash, p dht.Peer) {
+func (cl *Client) onDHTAnnouncePeer(ih metainfo.Hash, ip net.IP, port int, portOk bool) {
        cl.lock()
        defer cl.unlock()
        t := cl.torrent(ih)
@@ -1252,8 +1252,8 @@ func (cl *Client) onDHTAnnouncePeer(ih metainfo.Hash, p dht.Peer) {
                return
        }
        t.addPeers([]Peer{{
-               IP:     p.IP,
-               Port:   p.Port,
+               IP:     ip,
+               Port:   port,
                Source: peerSourceDHTAnnouncePeer,
        }})
 }

diff --git a/go.mod b/go.mod
index 658515d52ebcdf2f766eae0bfe792bc8a170c73a..09f7985b50c8bf719a6d16e0f1eb7bf4f287371f 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/anacrolix/torrent
 require (
        bazil.org/fuse v0.0.0-20180421153158-65cc252bf669
        github.com/alexflint/go-arg v1.1.0
-       github.com/anacrolix/dht/v2 v2.0.5-0.20190913023154-c5780a290ed6
+       github.com/anacrolix/dht/v2 v2.1.1-0.20191017060219-221f300f6ea8
        github.com/anacrolix/envpprof v1.0.1
        github.com/anacrolix/go-libutp v1.0.2
        github.com/anacrolix/log v0.3.1-0.20191001111012-13cede988bcd
@@ -25,6 +25,7 @@ require (
        github.com/mattn/go-sqlite3 v1.10.0
        github.com/pkg/errors v0.8.1
        github.com/stretchr/testify v1.4.0
+       go.etcd.io/bbolt v1.3.3 // indirect
        golang.org/x/net v0.0.0-20190628185345-da137c7871d7
        golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
        golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7

diff --git a/go.sum b/go.sum
index 9664fdd62536e431be1e70777b84ea6fdf116b19..49c50f0e4b35ad53498fd507c1313b91a8ad38c1 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -12,10 +12,8 @@ github.com/anacrolix/dht v0.0.0-20180412060941-24cbf25b72a4 h1:0yHJvFiGQhJ1gSHJO
 github.com/anacrolix/dht v0.0.0-20180412060941-24cbf25b72a4/go.mod h1:hQfX2BrtuQsLQMYQwsypFAab/GvHg8qxwVi4OJdR1WI=
 github.com/anacrolix/dht/v2 v2.0.1 h1:gOHJ+OKqJ4Eb48OYStZm4AlWr1/nSA2TWlzb/+t36SA=
 github.com/anacrolix/dht/v2 v2.0.1/go.mod h1:GbTT8BaEtfqab/LPd5tY41f3GvYeii3mmDUK300Ycyo=
-github.com/anacrolix/dht/v2 v2.0.5-0.20190912223956-bfe5b201d6f7 h1:X1EBtWrOZqgI/9DkgRgWl7fCqMMun26iNFw1OPaBGZM=
-github.com/anacrolix/dht/v2 v2.0.5-0.20190912223956-bfe5b201d6f7/go.mod h1:IGN/b4wWgoHJtpfInVDLLxvZfWRCdPtDFOdz2ftQ6wE=
-github.com/anacrolix/dht/v2 v2.0.5-0.20190913023154-c5780a290ed6 h1:1Wy9EDKBtekVd5BlyEF7J29kBg1TnJphTL8InZwuy58=
-github.com/anacrolix/dht/v2 v2.0.5-0.20190913023154-c5780a290ed6/go.mod h1:PEf0ghmOZEfCg4HOSNPdF0XUmGpFm/P4SHY6HYJrQIo=
+github.com/anacrolix/dht/v2 v2.1.1-0.20191017060219-221f300f6ea8 h1:MG0qPJ0mqzAZM12KZ6HH31x4HRP+e6voqu5LsIw5YJM=
+github.com/anacrolix/dht/v2 v2.1.1-0.20191017060219-221f300f6ea8/go.mod h1:PEf0ghmOZEfCg4HOSNPdF0XUmGpFm/P4SHY6HYJrQIo=
 github.com/anacrolix/envpprof v0.0.0-20180404065416-323002cec2fa h1:xCaATLKmn39QqLs3tUZYr6eKvezJV+FYvVOLTklxK6U=
 github.com/anacrolix/envpprof v0.0.0-20180404065416-323002cec2fa/go.mod h1:KgHhUaQMc8cC0+cEflSgCFNFbKwi5h54gqtVn8yhP7c=
 github.com/anacrolix/envpprof v1.0.0 h1:AwZ+mBP4rQ5f7JSsrsN3h7M2xDW/xSE66IPVOqlnuUc=
@@ -66,8 +64,6 @@ github.com/anacrolix/upnp v0.1.1 h1:v5C+wBiku2zmwFR5B+pUfdNBL5TfPtyO+sWuw+/VEDg=
 github.com/anacrolix/upnp v0.1.1/go.mod h1:LXsbsp5h+WGN7YR+0A7iVXm5BL1LYryDev1zuJMWYQo=
 github.com/anacrolix/utp v0.0.0-20180219060659-9e0e1d1d0572 h1:kpt6TQTVi6gognY+svubHfxxpq0DLU9AfTQyZVc3UOc=
 github.com/anacrolix/utp v0.0.0-20180219060659-9e0e1d1d0572/go.mod h1:MDwc+vsGEq7RMw6lr2GKOEqjWny5hO5OZXRVNaBJ2Dk=
-github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
-github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2 h1:1B/+1BcRhOMG1KH/YhNIU8OppSWk5d/NGyfRla88CuY=
 github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo=
 github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c h1:FUUopH4brHNO2kJoNN3pV+OBEYmgraLT/KHZrMM69r0=
@@ -185,6 +181,8 @@ github.com/willf/bloom v0.0.0-20170505221640-54e3b963ee16 h1:hDGatoumfYOxzIZGsSy
 github.com/willf/bloom v0.0.0-20170505221640-54e3b963ee16/go.mod h1:MmAltL9pDMNTrvUkxdg0k0q5I0suxmuwp3KbyrZLOZ8=
 github.com/willf/bloom v2.0.3+incompatible h1:QDacWdqcAUI1MPOwIQZRy9kOR7yxfyEmxX8Wdm2/JPA=
 github.com/willf/bloom v2.0.3+incompatible/go.mod h1:MmAltL9pDMNTrvUkxdg0k0q5I0suxmuwp3KbyrZLOZ8=
+go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
+go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20180524181706-dfa909b99c79/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=