d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 15:27:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8561 from glassez/tracker

Browse Source 
Properly reply to announce request
This commit is contained in:
Vladimir Golovnev 2018-03-10 17:08:29 +03:00 committed by GitHub
commit 4f206f987a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,7 +185,7 @@ void Tracker::respondToAnnounceRequest()
} }
bool ok = false; bool ok = false;
annonceReq.peer.port = queryParams.value("port").toInt(&ok); annonceReq.peer.port = queryParams.value("port").toInt(&ok);
if (!ok || annonceReq.peer.port < 1 || annonceReq.peer.port > 65535) { if (!ok || (annonceReq.peer.port < 0) || (annonceReq.peer.port > 65535)) {
qDebug("Tracker: Invalid port number (%d)", annonceReq.peer.port); qDebug("Tracker: Invalid port number (%d)", annonceReq.peer.port);
status(103, "Missing port"); status(103, "Missing port");
return; return;
@ -216,31 +216,45 @@ void Tracker::respondToAnnounceRequest()
// 7. TODO: support "compact" extension // 7. TODO: support "compact" extension
// Done parsing, now let's reply // Done parsing, now let's reply
if (m_torrents.contains(annonceReq.infoHash)) { if (annonceReq.event == "stopped") {
if (annonceReq.event == "stopped") { unregisterPeer(annonceReq);
qDebug("Tracker: Peer stopped downloading, deleting it from the list");
m_torrents[annonceReq.infoHash].remove(annonceReq.peer.uid());
return;
}
} }
else { else {
registerPeer(annonceReq);
replyWithPeerList(annonceReq);
}
}
void Tracker::registerPeer(const TrackerAnnounceRequest &annonceReq)
{
if (annonceReq.peer.port == 0) return;
if (!m_torrents.contains(annonceReq.infoHash)) {
// Unknown torrent // Unknown torrent
if (m_torrents.size() == MAX_TORRENTS) { if (m_torrents.size() == MAX_TORRENTS) {
// Reached max size, remove a random torrent // Reached max size, remove a random torrent
m_torrents.erase(m_torrents.begin()); m_torrents.erase(m_torrents.begin());
} }
} }
// Register the user // Register the user
PeerList peers = m_torrents.value(annonceReq.infoHash); PeerList &peers = m_torrents[annonceReq.infoHash];
if (peers.size() == MAX_PEERS_PER_TORRENT) { if (!peers.contains(annonceReq.peer.uid())) {
// Too many peers, remove a random one // Unknown peer
peers.erase(peers.begin()); if (peers.size() == MAX_PEERS_PER_TORRENT) {
// Too many peers, remove a random one
peers.erase(peers.begin());
}
} }
peers[annonceReq.peer.uid()] = annonceReq.peer; peers[annonceReq.peer.uid()] = annonceReq.peer;
m_torrents[annonceReq.infoHash] = peers; }
// Reply void Tracker::unregisterPeer(const TrackerAnnounceRequest &annonceReq)
replyWithPeerList(annonceReq); {
if (annonceReq.peer.port == 0) return;
if (m_torrents[annonceReq.infoHash].remove(annonceReq.peer.uid()) > 0)
qDebug("Tracker: Peer stopped downloading, deleting it from the list");
} }
void Tracker::replyWithPeerList(const TrackerAnnounceRequest &annonceReq) void Tracker::replyWithPeerList(const TrackerAnnounceRequest &annonceReq)
@ -248,18 +262,16 @@ void Tracker::replyWithPeerList(const TrackerAnnounceRequest &annonceReq)
// Prepare the entry for bencoding // Prepare the entry for bencoding
libtorrent::entry::dictionary_type replyDict; libtorrent::entry::dictionary_type replyDict;
replyDict["interval"] = libtorrent::entry(ANNOUNCE_INTERVAL); replyDict["interval"] = libtorrent::entry(ANNOUNCE_INTERVAL);
QList<Peer> peers = m_torrents.value(annonceReq.infoHash).values();
libtorrent::entry::list_type peerList; libtorrent::entry::list_type peerList;
foreach (const Peer &p, peers) { for (const Peer &p : m_torrents.value(annonceReq.infoHash))
//if (p != annonce_req.peer)
peerList.push_back(p.toEntry(annonceReq.noPeerId)); peerList.push_back(p.toEntry(annonceReq.noPeerId));
}
replyDict["peers"] = libtorrent::entry(peerList); replyDict["peers"] = libtorrent::entry(peerList);
libtorrent::entry replyEntry(replyDict);
const libtorrent::entry replyEntry(replyDict);
// bencode // bencode
std::vector<char> buf; QByteArray reply;
libtorrent::bencode(std::back_inserter(buf), replyEntry); libtorrent::bencode(std::back_inserter(reply), replyEntry);
QByteArray reply(&buf[0], static_cast<int>(buf.size()));
qDebug("Tracker: reply with the following bencoded data:\n %s", reply.constData()); qDebug("Tracker: reply with the following bencoded data:\n %s", reply.constData());
// HTTP reply // HTTP reply

2
src/base/bittorrent/tracker.h
View File

@ -90,6 +90,8 @@ namespace BitTorrent
private: private:
void respondToAnnounceRequest(); void respondToAnnounceRequest();
void registerPeer(const TrackerAnnounceRequest &annonceReq);
void unregisterPeer(const TrackerAnnounceRequest &annonceReq);
void replyWithPeerList(const TrackerAnnounceRequest &annonceReq); void replyWithPeerList(const TrackerAnnounceRequest &annonceReq);
Http::Server *m_server; Http::Server *m_server;