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: announce and scrape handlers: send back error on invalid conn

Browse source
This commit is contained in:
Joakim Frostegård 2020-04-11 14:17:03 +02:00
parent b32046e768
commit 688372bdf2
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -50,14 +50,17 @@ pub fn handle_announce_requests(
responses: &mut Vec<(Response, SocketAddr)>, responses: &mut Vec<(Response, SocketAddr)>,
requests: Drain<(AnnounceRequest, SocketAddr)>, requests: Drain<(AnnounceRequest, SocketAddr)>,
){ ){
responses.extend(requests.filter_map(|(request, src)| { responses.extend(requests.map(|(request, src)| {
let connection_key = ConnectionKey { let connection_key = ConnectionKey {
connection_id: request.connection_id, connection_id: request.connection_id,
socket_addr: src, socket_addr: src,
}; };
if !state.connections.contains_key(&connection_key){ if !state.connections.contains_key(&connection_key){
return None; return ((ErrorResponse {
transaction_id: request.transaction_id,
message: "Connection invalid or expired".to_string()
}).into(), src);
} }
let peer_key = PeerMapKey { let peer_key = PeerMapKey {
@ -115,13 +118,13 @@ pub fn handle_announce_requests(
let response = Response::Announce(AnnounceResponse { let response = Response::Announce(AnnounceResponse {
transaction_id: request.transaction_id, transaction_id: request.transaction_id,
announce_interval: AnnounceInterval(config.network.peer_announce_interval), // FIXME announce_interval: AnnounceInterval(config.network.peer_announce_interval),
leechers: NumberOfPeers(torrent_data.num_leechers.load(Ordering::SeqCst) as i32), leechers: NumberOfPeers(torrent_data.num_leechers.load(Ordering::SeqCst) as i32),
seeders: NumberOfPeers(torrent_data.num_seeders.load(Ordering::SeqCst) as i32), seeders: NumberOfPeers(torrent_data.num_seeders.load(Ordering::SeqCst) as i32),
peers: response_peers peers: response_peers
}); });
Some((response, src)) (response, src)
})); }));
} }
@ -134,14 +137,17 @@ pub fn handle_scrape_requests(
){ ){
let empty_stats = create_torrent_scrape_statistics(0, 0); let empty_stats = create_torrent_scrape_statistics(0, 0);
responses.extend(requests.filter_map(|(request, src)| { responses.extend(requests.map(|(request, src)| {
let connection_key = ConnectionKey { let connection_key = ConnectionKey {
connection_id: request.connection_id, connection_id: request.connection_id,
socket_addr: src, socket_addr: src,
}; };
if !state.connections.contains_key(&connection_key){ if !state.connections.contains_key(&connection_key){
return None; return ((ErrorResponse {
transaction_id: request.transaction_id,
message: "Connection invalid or expired".to_string()
}).into(), src);
} }
let mut stats: Vec<TorrentScrapeStatistics> = Vec::with_capacity( let mut stats: Vec<TorrentScrapeStatistics> = Vec::with_capacity(
@ -164,7 +170,7 @@ pub fn handle_scrape_requests(
torrent_stats: stats, torrent_stats: stats,
}); });
Some((response, src)) (response, src)
})); }));
} }