d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-10 13:54:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10741 from Chocobo1/limit

Browse Source 
Fix speed limit not applying to IPv6 peers
This commit is contained in:
Mike Tzou 2019-06-04 11:09:16 +08:00 committed by GitHub
commit b8e205c048
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/base/bittorrent/session.cpp
View File

@ -1042,7 +1042,7 @@ void Session::adjustLimits(lt::settings_pack &settingsPack)
, maxActive > -1 ? maxActive + m_extraLimit : maxActive); , maxActive > -1 ? maxActive + m_extraLimit : maxActive);
} }
void Session::applyBandwidthLimits(lt::settings_pack &settingsPack) void Session::applyBandwidthLimits(lt::settings_pack &settingsPack) const
{ {
const bool altSpeedLimitEnabled = isAltGlobalSpeedLimitEnabled(); const bool altSpeedLimitEnabled = isAltGlobalSpeedLimitEnabled();
settingsPack.set_int(lt::settings_pack::download_rate_limit, altSpeedLimitEnabled ? altGlobalDownloadSpeedLimit() : globalDownloadSpeedLimit()); settingsPack.set_int(lt::settings_pack::download_rate_limit, altSpeedLimitEnabled ? altGlobalDownloadSpeedLimit() : globalDownloadSpeedLimit());
@ -1390,17 +1390,19 @@ void Session::configurePeerClasses()
f.add_rule(lt::address_v4::any() f.add_rule(lt::address_v4::any()
, lt::address_v4::broadcast() , lt::address_v4::broadcast()
, 1 << lt::session::global_peer_class_id); , 1 << lt::session::global_peer_class_id);
#if TORRENT_USE_IPV6
#if (LIBTORRENT_VERSION_NUM >= 10200) || TORRENT_USE_IPV6
// IPv6 may not be available on OS and the parsing // IPv6 may not be available on OS and the parsing
// would result in an exception -> abnormal program termination // would result in an exception -> abnormal program termination
// Affects Windows XP // Affects Windows XP
try { try {
f.add_rule(lt::address_v6::from_string("::0") f.add_rule(lt::address_v6::any()
, lt::address_v6::from_string("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff") , lt::address_v6::from_string("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
, 1 << lt::session::global_peer_class_id); , 1 << lt::session::global_peer_class_id);
} }
catch (const std::exception &) {} catch (const std::exception &) {}
#endif // TORRENT_USE_IPV6 #endif
if (ignoreLimitsOnLAN()) { if (ignoreLimitsOnLAN()) {
// local networks // local networks
f.add_rule(lt::address_v4::from_string("10.0.0.0") f.add_rule(lt::address_v4::from_string("10.0.0.0")
@ -1420,7 +1422,8 @@ void Session::configurePeerClasses()
f.add_rule(lt::address_v4::from_string("127.0.0.0") f.add_rule(lt::address_v4::from_string("127.0.0.0")
, lt::address_v4::from_string("127.255.255.255") , lt::address_v4::from_string("127.255.255.255")
, 1 << lt::session::local_peer_class_id); , 1 << lt::session::local_peer_class_id);
#if TORRENT_USE_IPV6
#if (LIBTORRENT_VERSION_NUM >= 10200) || TORRENT_USE_IPV6
// IPv6 may not be available on OS and the parsing // IPv6 may not be available on OS and the parsing
// would result in an exception -> abnormal program termination // would result in an exception -> abnormal program termination
// Affects Windows XP // Affects Windows XP
@ -1434,12 +1437,12 @@ void Session::configurePeerClasses()
, lt::address_v6::from_string("fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff") , lt::address_v6::from_string("fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
, 1 << lt::session::local_peer_class_id); , 1 << lt::session::local_peer_class_id);
// loopback // loopback
f.add_rule(lt::address_v6::from_string("::1") f.add_rule(lt::address_v6::loopback()
, lt::address_v6::from_string("::1") , lt::address_v6::loopback()
, 1 << lt::session::local_peer_class_id); , 1 << lt::session::local_peer_class_id);
} }
catch (const std::exception &) {} catch (const std::exception &) {}
#endif // TORRENT_USE_IPV6 #endif
} }
m_nativeSession->set_peer_class_filter(f); m_nativeSession->set_peer_class_filter(f);

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

@ -520,7 +520,7 @@ namespace BitTorrent
void configure(lt::settings_pack &settingsPack); void configure(lt::settings_pack &settingsPack);
void configurePeerClasses(); void configurePeerClasses();
void adjustLimits(lt::settings_pack &settingsPack); void adjustLimits(lt::settings_pack &settingsPack);
void applyBandwidthLimits(lt::settings_pack &settingsPack); void applyBandwidthLimits(lt::settings_pack &settingsPack) const;
void initMetrics(); void initMetrics();
void adjustLimits(); void adjustLimits();
void applyBandwidthLimits(); void applyBandwidthLimits();