mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-20 13:16:53 +00:00
Code Issues Releases Wiki Activity

fix: FTBFS on FreeBSD with clang 14 (#6110)

Browse source
This commit is contained in:
Charles Kerr 2023-10-16 19:39:14 -05:00 committed by GitHub
parent 0259edbaf3
commit 0c3f65e1c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libtransmission/peer-mgr.cc
View file

@ -2388,15 +2388,17 @@ struct peer_candidate
return score;
}
[[nodiscard]] tr_peerMgr::OutboundCandidates get_peer_candidates(tr_session* session)
void get_peer_candidates(tr_session* session, tr_peerMgr::OutboundCandidates& setme)
{
setme.clear();
auto const now = tr_time();
auto const now_msec = tr_time_msec();
// leave 5% of connection slots for incoming connections -- ticket #2609
if (auto const max_candidates = static_cast<size_t>(session->peerLimit() * 0.95); max_candidates <= tr_peerMsgs::size())
{
return {};
return;
}
auto candidates = std::vector<peer_candidate>{};
@ -2454,12 +2456,10 @@ struct peer_candidate
}
// put the best candidates at the end of the list
auto ret = tr_peerMgr::OutboundCandidates{};
for (auto it = std::crbegin(candidates), end = std::crend(candidates); it != end; ++it)
{
ret.emplace_back(it->tor->id(), it->peer_info->listen_socket_address());
setme.emplace_back(it->tor->id(), it->peer_info->listen_socket_address());
}
return ret;
}
void initiate_connection(tr_peerMgr* mgr, tr_swarm* s, tr_peer_info& peer_info)
@ -2517,7 +2517,7 @@ void tr_peerMgr::make_new_peer_connections()
auto& candidates = outbound_candidates_;
if (std::empty(candidates))
{
candidates = get_peer_candidates(session);
get_peer_candidates(session, candidates);
}
// initiate connections to the last N candidates