d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-06 03:44:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix response to event=stopped

Browse Source 
BEP-3 says all tracker responses to valid announce requests should be bencoded dictionaries with at least the "peers" and "interval" keys; the "peers" key can be empty.

Also clarify support for BEP-21.
This commit is contained in:
FranciscoPombal 2020-02-24 02:01:03 +00:00
parent af6f63f82c
commit 966f891d91
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/base/bittorrent/tracker.cpp
View File

@ -349,9 +349,9 @@ void Tracker::processAnnounceRequest()
|| (announceReq.event == ANNOUNCE_REQUEST_EVENT_COMPLETED) || (announceReq.event == ANNOUNCE_REQUEST_EVENT_COMPLETED)
|| (announceReq.event == ANNOUNCE_REQUEST_EVENT_STARTED) || (announceReq.event == ANNOUNCE_REQUEST_EVENT_STARTED)
|| (announceReq.event == ANNOUNCE_REQUEST_EVENT_PAUSED)) { || (announceReq.event == ANNOUNCE_REQUEST_EVENT_PAUSED)) {
// [BEP-21] Extension for partial seeds (partial support) // [BEP-21] Extension for partial seeds
// (partial support - we don't support BEP-48 so the part that concerns that is not supported)
registerPeer(announceReq); registerPeer(announceReq);
prepareAnnounceResponse(announceReq);
} }
else if (announceReq.event == ANNOUNCE_REQUEST_EVENT_STOPPED) { else if (announceReq.event == ANNOUNCE_REQUEST_EVENT_STOPPED) {
unregisterPeer(announceReq); unregisterPeer(announceReq);
@ -359,6 +359,8 @@ void Tracker::processAnnounceRequest()
else { else {
throw TrackerError("Invalid \"event\" parameter"); throw TrackerError("Invalid \"event\" parameter");
} }
prepareAnnounceResponse(announceReq);
} }
void Tracker::registerPeer(const TrackerAnnounceRequest &announceReq) void Tracker::registerPeer(const TrackerAnnounceRequest &announceReq)
@ -404,15 +406,17 @@ void Tracker::prepareAnnounceResponse(const TrackerAnnounceRequest &announceReq)
lt::entry::string_type peers; lt::entry::string_type peers;
lt::entry::string_type peers6; lt::entry::string_type peers6;
int counter = 0; if (announceReq.event != ANNOUNCE_REQUEST_EVENT_STOPPED) {
for (const Peer &peer : asConst(torrentStats.peers)) { int counter = 0;
if (counter++ >= announceReq.numwant) for (const Peer &peer : asConst(torrentStats.peers)) {
break; if (counter++ >= announceReq.numwant)
break;
if (peer.endpoint.size() == 6) // IPv4 + port if (peer.endpoint.size() == 6) // IPv4 + port
peers.append(peer.endpoint); peers.append(peer.endpoint);
else if (peer.endpoint.size() == 18) // IPv6 + port else if (peer.endpoint.size() == 18) // IPv6 + port
peers6.append(peer.endpoint); peers6.append(peer.endpoint);
}
} }
replyDict[ANNOUNCE_RESPONSE_PEERS] = peers; // required, even it's empty replyDict[ANNOUNCE_RESPONSE_PEERS] = peers; // required, even it's empty
@ -422,20 +426,22 @@ void Tracker::prepareAnnounceResponse(const TrackerAnnounceRequest &announceReq)
else { else {
lt::entry::list_type peerList; lt::entry::list_type peerList;
int counter = 0; if (announceReq.event != ANNOUNCE_REQUEST_EVENT_STOPPED) {
for (const Peer &peer : torrentStats.peers) { int counter = 0;
if (counter++ >= announceReq.numwant) for (const Peer &peer : torrentStats.peers) {
break; if (counter++ >= announceReq.numwant)
break;
lt::entry::dictionary_type peerDict = { lt::entry::dictionary_type peerDict = {
{ANNOUNCE_RESPONSE_PEERS_IP, peer.address}, {ANNOUNCE_RESPONSE_PEERS_IP, peer.address},
{ANNOUNCE_RESPONSE_PEERS_PORT, peer.port} {ANNOUNCE_RESPONSE_PEERS_PORT, peer.port}
}; };
if (!announceReq.noPeerId) if (!announceReq.noPeerId)
peerDict[ANNOUNCE_RESPONSE_PEERS_PEER_ID] = peer.peerId.constData(); peerDict[ANNOUNCE_RESPONSE_PEERS_PEER_ID] = peer.peerId.constData();
peerList.emplace_back(peerDict); peerList.emplace_back(peerDict);
}
} }
replyDict[ANNOUNCE_RESPONSE_PEERS] = peerList; replyDict[ANNOUNCE_RESPONSE_PEERS] = peerList;