YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-02 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aquatic: take into account how many peers announcing peer wants back

Browse source
This commit is contained in:
Joakim Frostegård 2020-04-07 14:50:33 +02:00
parent 00513209ad
commit 3ca22c9f3f
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
aquatic/src/lib/handlers.rs
View file

@ -99,11 +99,14 @@ pub fn handle_announce_requests(
} }
} }
let max_num_peers_to_take = (request.peers_wanted.0.max(0) as usize)
.min(config.max_response_peers);
let response_peers = extract_response_peers( let response_peers = extract_response_peers(
&mut rng, &mut rng,
&torrent_data.peers, &torrent_data.peers,
config.max_response_peers, max_num_peers_to_take,
); // FIXME: check how many peers announcing peer wants );
let response = Response::Announce(AnnounceResponse { let response = Response::Announce(AnnounceResponse {
transaction_id: request.transaction_id, transaction_id: request.transaction_id,
@ -167,16 +170,16 @@ pub fn handle_scrape_requests(
pub fn extract_response_peers( pub fn extract_response_peers(
rng: &mut impl Rng, rng: &mut impl Rng,
peer_map: &PeerMap, peer_map: &PeerMap,
number_of_peers_to_take: usize, max_num_peers_to_take: usize,
) -> Vec<ResponsePeer> { ) -> Vec<ResponsePeer> {
let peer_map_len = peer_map.len(); let peer_map_len = peer_map.len();
if peer_map_len <= number_of_peers_to_take { if peer_map_len <= max_num_peers_to_take {
peer_map.values() peer_map.values()
.map(Peer::to_response_peer) .map(Peer::to_response_peer)
.collect() .collect()
} else { } else {
let half_num_to_take = number_of_peers_to_take / 2; let half_num_to_take = max_num_peers_to_take / 2;
let half_peer_map_len = peer_map_len / 2; let half_peer_map_len = peer_map_len / 2;
let offset_first_half = rng.gen_range( let offset_first_half = rng.gen_range(
@ -189,9 +192,9 @@ pub fn extract_response_peers(
); );
let end_first_half = offset_first_half + half_num_to_take; let end_first_half = offset_first_half + half_num_to_take;
let end_second_half = offset_second_half + half_num_to_take + (number_of_peers_to_take % 2); let end_second_half = offset_second_half + half_num_to_take + (max_num_peers_to_take % 2);
let mut peers: Vec<ResponsePeer> = Vec::with_capacity(number_of_peers_to_take); let mut peers: Vec<ResponsePeer> = Vec::with_capacity(max_num_peers_to_take);
for i in offset_first_half..end_first_half { for i in offset_first_half..end_first_half {
if let Some((_, peer)) = peer_map.get_index(i){ if let Some((_, peer)) = peer_map.get_index(i){
@ -204,7 +207,7 @@ pub fn extract_response_peers(
} }
} }
debug_assert_eq!(peers.len(), number_of_peers_to_take); debug_assert_eq!(peers.len(), max_num_peers_to_take);
peers peers
} }