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

aquatic_http: AnnounceRequest: make numwant optional, remove trackerid

Browse source
This commit is contained in:
Joakim Frostegård 2020-07-04 11:20:58 +02:00
parent 6b7ce0e211
commit 2f2da8deb0
3 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
aquatic_http/src/lib/protocol/request.rs
View file

@ -13,8 +13,8 @@ pub struct AnnounceRequest {
pub bytes_left: usize,
pub event: AnnounceEvent,
pub compact: bool,
/// Requested number of peers to return
pub numwant: usize,
/// Number of response peers wanted
pub numwant: Option<usize>,
}
@ -68,6 +68,17 @@ impl Request {
}
if location == "/announce" {
let numwant = if let Some(s) = data.get("numwant"){
let numwant = s.parse::<usize>()
.map_err(|err|
anyhow::anyhow!("parse 'numwant': {}", err)
)?;
Some(numwant)
} else {
None
};
let request = AnnounceRequest {
info_hash: info_hashes.get(0)
.with_context(|| "no info_hash")
@ -91,12 +102,7 @@ impl Request {
compact: data.get("compact")
.map(|s| s == "1")
.unwrap_or(true),
numwant: data.get("numwant")
.with_context(|| "no numwant")
.and_then(|s| s.parse()
.map_err(|err|
anyhow::anyhow!("parse 'numwant': {}", err)
))?,
numwant,
};
Ok(Request::Announce(request))