Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 10:28:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: incorrect pex flags merge logic (#5876)

Browse Source
This commit is contained in:
tearfur
2023-08-06 01:37:33 +08:00
committed by GitHub
parent a2849219f7
commit badeed374f
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libtransmission/peer-mgr.h
View File

@@ -291,16 +291,9 @@ public:
// --- // ---
constexpr void set_pex_flags(uint8_t pex_flags, bool merge_unsupported = false) noexcept constexpr void set_pex_flags(uint8_t pex_flags) noexcept
{
if (merge_unsupported)
{
pex_flags_ |= pex_flags;
}
else
{ {
pex_flags_ = pex_flags; pex_flags_ = pex_flags;
}
if ((pex_flags & ADDED_F_CONNECTABLE) != 0U) if ((pex_flags & ADDED_F_CONNECTABLE) != 0U)
{ {
@@ -434,7 +427,7 @@ public:
found_at(that.from_best()); found_at(that.from_best());
/* num_consecutive_fails_ is already the latest */ /* num_consecutive_fails_ is already the latest */
set_pex_flags(that.pex_flags(), true); pex_flags_ |= that.pex_flags_;
if (that.is_banned()) if (that.is_banned())
{ {