github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-19 21:03:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #12043 from FranciscoPombal/fix-embedded-tracker

Browse source 
Fix embedded tracker
This commit is contained in:
Mike Tzou 2020-02-27 21:06:58 +08:00 • committed by GitHub
commit 9649c2a163
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

72
src/base/bittorrent/tracker.cpp
View file

@ -107,8 +107,8 @@ namespace
case QAbstractSocket::IPv6Protocol: { case QAbstractSocket::IPv6Protocol: {
const Q_IPV6ADDR ipv6 = addr.toIPv6Address(); const Q_IPV6ADDR ipv6 = addr.toIPv6Address();
QByteArray ret; QByteArray ret;
for (int i = (sizeof(ipv6.c) - 1); i >= 0; --i) for (const quint8 i : ipv6.c)
ret.append(static_cast<char>(ipv6.c[i])); ret.append(i);
return ret; return ret;
} }
@ -272,6 +272,12 @@ void Tracker::processAnnounceRequest()
announceReq.socketAddress = m_env.clientAddress; announceReq.socketAddress = m_env.clientAddress;
announceReq.claimedAddress = queryParams.value(ANNOUNCE_REQUEST_IP); announceReq.claimedAddress = queryParams.value(ANNOUNCE_REQUEST_IP);
// Enforce using IPv4 if address is indeed IPv4 or if it is an IPv4-mapped IPv6 address
bool ok = false;
const qint32 decimalIPv4 = announceReq.socketAddress.toIPv4Address(&ok);
if (ok)
announceReq.socketAddress = QHostAddress(decimalIPv4);
// 1. info_hash // 1. info_hash
const auto infoHashIter = queryParams.find(ANNOUNCE_REQUEST_INFO_HASH); const auto infoHashIter = queryParams.find(ANNOUNCE_REQUEST_INFO_HASH);
if (infoHashIter == queryParams.end()) if (infoHashIter == queryParams.end())
@ -343,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);
@ -353,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)
@ -387,49 +395,53 @@ void Tracker::prepareAnnounceResponse(const TrackerAnnounceRequest &announceReq)
{ANNOUNCE_RESPONSE_COMPLETE, torrentStats.seeders}, {ANNOUNCE_RESPONSE_COMPLETE, torrentStats.seeders},
{ANNOUNCE_RESPONSE_INCOMPLETE, (torrentStats.peers.size() - torrentStats.seeders)}, {ANNOUNCE_RESPONSE_INCOMPLETE, (torrentStats.peers.size() - torrentStats.seeders)},
// [BEP-24] Tracker Returns External IP // [BEP-24] Tracker Returns External IP (partial support - might not work properly for all IPv6 cases)
{ANNOUNCE_RESPONSE_EXTERNAL_IP, toBigEndianByteArray(announceReq.socketAddress).toStdString()} {ANNOUNCE_RESPONSE_EXTERNAL_IP, toBigEndianByteArray(announceReq.socketAddress).toStdString()}
}; };
// peer list // peer list
// [BEP-7] IPv6 Tracker Extension (partial support) // [BEP-7] IPv6 Tracker Extension (partial support - only the part that concerns BEP-23)
// [BEP-23] Tracker Returns Compact Peer Lists // [BEP-23] Tracker Returns Compact Peer Lists
if (announceReq.compact) { if (announceReq.compact) {
lt::entry::list_type peerList; lt::entry::string_type peers;
lt::entry::list_type peer6List; 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 if (peer.endpoint.size() == 6) // IPv4 + port
peerList.emplace_back(peer.endpoint); peers.append(peer.endpoint);
else if (peer.endpoint.size() == 18) // IPv6 else if (peer.endpoint.size() == 18) // IPv6 + port
peer6List.emplace_back(peer.endpoint); peers6.append(peer.endpoint);
}
} }
replyDict[ANNOUNCE_RESPONSE_PEERS] = peerList; // required, even it's empty replyDict[ANNOUNCE_RESPONSE_PEERS] = peers; // required, even it's empty
if (!peer6List.empty()) if (!peers6.empty())
replyDict[ANNOUNCE_RESPONSE_PEERS6] = peer6List; replyDict[ANNOUNCE_RESPONSE_PEERS6] = peers6;
} }
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;