YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

http_protocol: allow announce/scrape url suffix; use in load test

Browse source
This commit is contained in:
Joakim Frostegård 2022-04-03 19:17:57 +02:00
parent 05faa10f4b
commit b2a3c034b0
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
aquatic_http_load_test/src/config.rs
View file

@ -18,6 +18,8 @@ pub struct Config {
/// opened as quickly as possible, which is useful when the tracker /// opened as quickly as possible, which is useful when the tracker
/// does not keep connections alive. /// does not keep connections alive.
pub connection_creation_interval_ms: u64, pub connection_creation_interval_ms: u64,
/// Announce/scrape url suffix. Use `/my_token/` to get `/announce/my_token/`
pub url_suffix: String,
pub duration: usize, pub duration: usize,
pub torrents: TorrentConfig, pub torrents: TorrentConfig,
#[cfg(feature = "cpu-pinning")] #[cfg(feature = "cpu-pinning")]
@ -56,6 +58,7 @@ impl Default for Config {
num_workers: 1, num_workers: 1,
num_connections: 128, num_connections: 128,
connection_creation_interval_ms: 10, connection_creation_interval_ms: 10,
url_suffix: "".into(),
duration: 0, duration: 0,
torrents: TorrentConfig::default(), torrents: TorrentConfig::default(),
#[cfg(feature = "cpu-pinning")] #[cfg(feature = "cpu-pinning")]

2
aquatic_http_load_test/src/network.rs
View file

@ -135,7 +135,7 @@ impl Connection {
let request = let request =
create_random_request(&self.config, &self.load_test_state, &mut self.rng); create_random_request(&self.config, &self.load_test_state, &mut self.rng);
request.write(&mut self.tls.writer())?; request.write(&mut self.tls.writer(), self.config.url_suffix.as_bytes())?;
self.queued_responses += 1; self.queued_responses += 1;
self.send_new_request = false; self.send_new_request = false;

18
aquatic_http_protocol/src/request.rs
View file

@ -22,8 +22,10 @@ pub struct AnnounceRequest {
} }
impl AnnounceRequest { impl AnnounceRequest {
fn write<W: Write>(&self, output: &mut W) -> ::std::io::Result<()> { fn write<W: Write>(&self, output: &mut W, url_suffix: &[u8]) -> ::std::io::Result<()> {
output.write_all(b"GET /announce?info_hash=")?; output.write_all(b"GET /announce")?;
output.write_all(url_suffix)?;
output.write_all(b"?info_hash=")?;
urlencode_20_bytes(self.info_hash.0, output)?; urlencode_20_bytes(self.info_hash.0, output)?;
output.write_all(b"&peer_id=")?; output.write_all(b"&peer_id=")?;
@ -167,8 +169,10 @@ pub struct ScrapeRequest {
} }
impl ScrapeRequest { impl ScrapeRequest {
fn write<W: Write>(&self, output: &mut W) -> ::std::io::Result<()> { fn write<W: Write>(&self, output: &mut W, url_suffix: &[u8]) -> ::std::io::Result<()> {
output.write_all(b"GET /scrape?")?; output.write_all(b"GET /scrape?")?;
output.write_all(url_suffix)?;
output.write_all(b"?")?;
let mut first = true; let mut first = true;
@ -307,10 +311,10 @@ impl Request {
} }
} }
pub fn write<W: Write>(&self, output: &mut W) -> ::std::io::Result<()> { pub fn write<W: Write>(&self, output: &mut W, url_suffix: &[u8]) -> ::std::io::Result<()> {
match self { match self {
Self::Announce(r) => r.write(output), Self::Announce(r) => r.write(output, url_suffix),
Self::Scrape(r) => r.write(output), Self::Scrape(r) => r.write(output, url_suffix),
} }
} }
} }
@ -436,7 +440,7 @@ mod tests {
let mut bytes = Vec::new(); let mut bytes = Vec::new();
request.write(&mut bytes).unwrap(); request.write(&mut bytes, &[]).unwrap();
let parsed_request = Request::from_bytes(&bytes[..]).unwrap(); let parsed_request = Request::from_bytes(&bytes[..]).unwrap();