Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement correct interested behaviour #1061

Merged
merged 2 commits into from Jul 25, 2018
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Next

Start peers as uninterested and only move to interested if/once they …

…have a piece that we need
  • Loading branch information
bradleyjkemp committed Feb 25, 2017
commit 2f1491ade7b57fc86eeacf1ef7d48098c9ec5266
@@ -1095,7 +1095,7 @@ Torrent.prototype._onWireWithMetadata = function (wire) {
})

wire.bitfield(self.bitfield) // always send bitfield (required)
wire.interested() // always start out interested
wire.uninterested() // always start out uninterested (as per protocol)

// Send PORT message to peers that support DHT
if (wire.peerExtensions.dht && self.client.dht && self.client.dht.listening) {
@@ -1174,8 +1174,15 @@ Torrent.prototype._updateInterest = function () {
self._amInterested = !!self._selections.length

self.wires.forEach(function (wire) {
// TODO: only call wire.interested if the wire has at least one piece we need
if (self._amInterested) wire.interested()
var interested = false
for (var index = 0; index < self.pieces.length; ++index) {
if (self.pieces[index] && wire.peerPieces.get(index)) {

This comment has been minimized.

Copy link
@DiegoRBaquero

DiegoRBaquero May 24, 2017

Member

Shouldn't this !self.pieces[index]? Indicating that we don't yet have that piece?

This comment has been minimized.

Copy link
@KayleePop

KayleePop May 16, 2018

Contributor

self.pieces[index] is deleted when that piece is downloaded and verified, so self.pieces[index] would be truthy when the piece still needs to be downloaded. The actual piece data is in the store. self.pieces[] is used to facilitate downloading.

!self.bitfield.get(index) is clearer.

interested = true
break
}
}

if (interested) wire.interested()
else wire.uninterested()
})

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.