Don't limit the number of torrents that can be announced to the tracker/dht/lsd. Closes #3473.

This commit is contained in:
sledgehammer999 2015-09-16 22:02:13 +03:00
parent ddde91dbb9
commit bf3cbfc608

View file

@ -450,23 +450,17 @@ void QBtSession::configureSession() {
if (pref->isQueueingSystemEnabled()) { if (pref->isQueueingSystemEnabled()) {
int max_downloading = pref->getMaxActiveDownloads(); int max_downloading = pref->getMaxActiveDownloads();
int max_active = pref->getMaxActiveTorrents(); int max_active = pref->getMaxActiveTorrents();
if (max_downloading > -1) if (max_downloading > -1)
sessionSettings.active_downloads = max_downloading + HiddenData::getDownloadingSize(); sessionSettings.active_downloads = max_downloading + HiddenData::getDownloadingSize();
else else
sessionSettings.active_downloads = max_downloading; sessionSettings.active_downloads = max_downloading;
if (max_active > -1) {
int limit = max_active + HiddenData::getDownloadingSize(); if (max_active > -1)
sessionSettings.active_limit = limit; sessionSettings.active_limit = max_active + HiddenData::getDownloadingSize();
sessionSettings.active_tracker_limit = limit; else
sessionSettings.active_dht_limit = limit;
sessionSettings.active_lsd_limit = limit;
}
else {
sessionSettings.active_limit = max_active; sessionSettings.active_limit = max_active;
sessionSettings.active_tracker_limit = max_active;
sessionSettings.active_dht_limit = max_active;
sessionSettings.active_lsd_limit = max_active;
}
sessionSettings.active_seeds = pref->getMaxActiveUploads(); sessionSettings.active_seeds = pref->getMaxActiveUploads();
sessionSettings.dont_count_slow_torrents = pref->ignoreSlowTorrentsForQueueing(); sessionSettings.dont_count_slow_torrents = pref->ignoreSlowTorrentsForQueueing();
setQueueingEnabled(true); setQueueingEnabled(true);
@ -474,11 +468,11 @@ void QBtSession::configureSession() {
sessionSettings.active_downloads = -1; sessionSettings.active_downloads = -1;
sessionSettings.active_seeds = -1; sessionSettings.active_seeds = -1;
sessionSettings.active_limit = -1; sessionSettings.active_limit = -1;
sessionSettings.active_tracker_limit = -1;
sessionSettings.active_dht_limit = -1;
sessionSettings.active_lsd_limit = -1;
setQueueingEnabled(false); setQueueingEnabled(false);
} }
sessionSettings.active_tracker_limit = -1;
sessionSettings.active_dht_limit = -1;
sessionSettings.active_lsd_limit = -1;
// Outgoing ports // Outgoing ports
sessionSettings.outgoing_ports = std::make_pair(pref->outgoingPortsMin(), pref->outgoingPortsMax()); sessionSettings.outgoing_ports = std::make_pair(pref->outgoingPortsMin(), pref->outgoingPortsMax());
// Ignore limits on LAN // Ignore limits on LAN