From: Bora M. Alper Date: Sat, 16 Sep 2017 10:48:16 +0000 (+0100) Subject: added support for half-open peers in KnownSwarm() function X-Git-Tag: v1.0.0~391^2 X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=a66b0e83f3ec40cc42fae906390ea6d808af03c6;p=btrtrc.git added support for half-open peers in KnownSwarm() function --- diff --git a/torrent.go b/torrent.go index aba33139..d476e170 100644 --- a/torrent.go +++ b/torrent.go @@ -131,6 +131,11 @@ func (t *Torrent) KnownSwarm() (ks []Peer) { ks = append(ks, peer) } + // Add half-open peers to the list + for _, peer := range t.halfOpen { + ks = append(ks, peer) + } + // Add active peers to the list for conn := range t.conns { host, portString, err := net.SplitHostPort(conn.remoteAddr().String()) @@ -149,15 +154,16 @@ func (t *Torrent) KnownSwarm() (ks []Peer) { IP: ip, Port: port, Source: conn.Discovery, - // TODO: the connection can be unencrypted due to our (or the peer's) preference, - // but the remote peer might support the encryption. Find a better way to query - // that information, if possible. + // > If the connection is encrypted, that's certainly enough to set SupportsEncryption. + // > But if we're not connected to them with an encrypted connection, I couldn't say + // > what's appropriate. We can carry forward the SupportsEncryption value as we + // > received it from trackers/DHT/PEX, or just use the encryption state for the + // > connection. It's probably easiest to do the latter for now. + // https://github.com/anacrolix/torrent/pull/188 SupportsEncryption: conn.encrypted, }) } - // TODO: how can we add half-open peers? - return }