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: fix some clippy errors, including possible network bug

Browse source
This commit is contained in:
Joakim Frostegård 2020-08-01 23:58:47 +02:00
parent c202d9ba41
commit 8fc09cb130
3 changed files with 24 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
aquatic_http_load_test/src/network.rs
View file

@ -58,16 +58,12 @@ impl Connection {
loop { loop {
match self.stream.read(&mut self.read_buffer[self.bytes_read..]){ match self.stream.read(&mut self.read_buffer[self.bytes_read..]){
Ok(bytes_read) => { Ok(bytes_read) => {
self.bytes_read = bytes_read; self.bytes_read += bytes_read;
break;
}, },
Err(err) if err.kind() == ErrorKind::WouldBlock => { Err(err) if err.kind() == ErrorKind::WouldBlock => {
self.can_send_initial = false; self.can_send_initial = false;
eprintln!("handle_read_event error would block: {}", err); break;
return;
}, },
Err(err) => { Err(err) => {
self.bytes_read = 0; self.bytes_read = 0;

42
aquatic_http_protocol/src/request.rs
View file

@ -23,39 +23,39 @@ 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) -> ::std::io::Result<()> {
output.write(b"GET /announce?info_hash=")?; output.write_all(b"GET /announce?info_hash=")?;
urlencode_20_bytes(self.info_hash.0, output)?; urlencode_20_bytes(self.info_hash.0, output)?;
output.write(b"&peer_id=")?; output.write_all(b"&peer_id=")?;
urlencode_20_bytes(self.info_hash.0, output)?; urlencode_20_bytes(self.info_hash.0, output)?;
output.write(b"&port=")?; output.write_all(b"&port=")?;
output.write(itoa::Buffer::new().format(self.port).as_bytes())?; output.write_all(itoa::Buffer::new().format(self.port).as_bytes())?;
output.write(b"&left=")?; output.write_all(b"&left=")?;
output.write(itoa::Buffer::new().format(self.bytes_left).as_bytes())?; output.write_all(itoa::Buffer::new().format(self.bytes_left).as_bytes())?;
match self.event { match self.event {
AnnounceEvent::Started => output.write(b"&event=started")?, AnnounceEvent::Started => output.write_all(b"&event=started")?,
AnnounceEvent::Stopped => output.write(b"&event=stopped")?, AnnounceEvent::Stopped => output.write_all(b"&event=stopped")?,
AnnounceEvent::Completed => output.write(b"&event=completed")?, AnnounceEvent::Completed => output.write_all(b"&event=completed")?,
AnnounceEvent::Empty => 0, AnnounceEvent::Empty => (),
}; };
output.write(b"&compact=")?; output.write_all(b"&compact=")?;
output.write(itoa::Buffer::new().format(self.compact as u8).as_bytes())?; output.write_all(itoa::Buffer::new().format(self.compact as u8).as_bytes())?;
if let Some(numwant) = self.numwant { if let Some(numwant) = self.numwant {
output.write(b"&numwant=")?; output.write_all(b"&numwant=")?;
output.write(itoa::Buffer::new().format(numwant).as_bytes())?; output.write_all(itoa::Buffer::new().format(numwant).as_bytes())?;
} }
if let Some(ref key) = self.key { if let Some(ref key) = self.key {
output.write(b"&key=")?; output.write_all(b"&key=")?;
output.write(key.as_str().as_bytes())?; output.write_all(key.as_str().as_bytes())?;
} }
output.write(b" HTTP/1.1\r\n\r\n")?; output.write_all(b" HTTP/1.1\r\n\r\n")?;
Ok(()) Ok(())
} }
@ -70,22 +70,22 @@ 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) -> ::std::io::Result<()> {
output.write(b"GET /scrape?")?; output.write_all(b"GET /scrape?")?;
let mut first = true; let mut first = true;
for info_hash in self.info_hashes.iter() { for info_hash in self.info_hashes.iter() {
if !first { if !first {
output.write(b"&")?; output.write_all(b"&")?;
} }
output.write(b"info_hash=")?; output.write_all(b"info_hash=")?;
urlencode_20_bytes(info_hash.0, output)?; urlencode_20_bytes(info_hash.0, output)?;
first = false; first = false;
} }
output.write(b" HTTP/1.1\r\n\r\n")?; output.write_all(b" HTTP/1.1\r\n\r\n")?;
Ok(()) Ok(())
} }

2
aquatic_http_protocol/src/utils.rs
View file

@ -21,7 +21,7 @@ pub fn urlencode_20_bytes(
).unwrap(); ).unwrap();
} }
output.write(&tmp)?; output.write_all(&tmp)?;
Ok(()) Ok(())
} }