gsadmin/noq
1
0
Fork 0
mirror of https://github.com/n0-computer/noq.git synced 2026-09-18 17:26:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetic cleanup

Browse Source
This commit is contained in:
Benjamin Saunders
2018-12-14 17:59:06 -08:00
parent 80a462eaa8
commit e9df8859ec
2 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quinn-proto/src/connection.rs
+11 -14
View File
@@ -323,16 +323,13 @@ impl Connection {
let delay = ack.delay << self.params.ack_delay_exponent;
self.update_rtt(delay, info.ack_only());
}
for range in &ack {
// Avoid DoS from unreasonably huge ack ranges
let packets = self
.sent_packets
.range(range)
.map(|(&n, _)| n)
.collect::<Vec<_>>();
for packet in packets {
self.on_packet_acked(packet);
}
// Avoid DoS from unreasonably huge ack ranges
let newly_acked = ack
.iter()
.flat_map(|range| self.sent_packets.range(range).map(|(&n, _)| n))
.collect::<Vec<_>>();
for &packet in &newly_acked {
self.on_packet_acked(packet);
}
self.detect_lost_packets(now, ack.largest);
self.set_loss_detection_alarm(mux);
@@ -600,7 +597,7 @@ impl Connection {
} else {
return;
};
trace!(self.log, "packet authenticated"; "pn" => packet);
trace!(self.log, "packet {packet} authenticated", packet = packet);
self.pending_acks.insert_one(packet);
if self.pending_acks.len() > MAX_ACK_BLOCKS {
self.pending_acks.pop_min();
@@ -1751,9 +1748,9 @@ impl Connection {
}
};
let partial_encode = header.encode(&mut buf);
let header_len = buf.len() as u16;
let header_len = buf.len();
let max_len = self.mtu - header_len - AEAD_TAG_SIZE as u16;
let max_len = self.mtu as usize - header_len - AEAD_TAG_SIZE;
match *reason {
state::CloseReason::Application(ref x) => x.encode(&mut buf, max_len),
state::CloseReason::Connection(ref x) => x.encode(&mut buf, max_len),
@@ -2192,7 +2189,7 @@ where
let mut buf = Vec::<u8>::new();
let partial_encode = header.encode(&mut buf);
let header_len = buf.len();
let max_len = MIN_MTU - header_len as u16 - AEAD_TAG_SIZE as u16;
let max_len = MIN_MTU as usize - header_len - AEAD_TAG_SIZE;
match reason.into() {
state::CloseReason::Application(ref x) => x.encode(&mut buf, max_len),
state::CloseReason::Connection(ref x) => x.encode(&mut buf, max_len),
quinn-proto/src/frame.rs
+35 -32
View File
@@ -237,15 +237,18 @@ impl<T> ConnectionClose<T>
where
T: AsRef<[u8]>,
{
pub fn encode<W: BufMut>(&self, out: &mut W, max_len: u16) {
out.write(Type::CONNECTION_CLOSE);
out.write(self.error_code);
out.write_var(self.frame_type.map_or(0, |x| x.0));
let max_len =
max_len as usize - 3 - varint::size(self.reason.as_ref().len() as u64).unwrap();
pub fn encode<W: BufMut>(&self, out: &mut W, max_len: usize) {
out.write(Type::CONNECTION_CLOSE); // 1 byte
out.write(self.error_code); // 2 bytes
let ty = self.frame_type.map_or(0, |x| x.0);
out.write_var(ty); // <= 8 bytes
let max_len = max_len
- 3
- varint::size(ty).unwrap()
- varint::size(self.reason.as_ref().len() as u64).unwrap();
let actual_len = self.reason.as_ref().len().min(max_len);
varint::write(actual_len as u64, out).unwrap();
out.put_slice(&self.reason.as_ref()[0..actual_len]);
out.write_var(actual_len as u64); // <= 8 bytes
out.put_slice(&self.reason.as_ref()[0..actual_len]); // whatever's left
}
}
@@ -280,14 +283,14 @@ impl<T> ApplicationClose<T>
where
T: AsRef<[u8]>,
{
pub fn encode<W: BufMut>(&self, out: &mut W, max_len: u16) {
out.write(Type::APPLICATION_CLOSE);
out.write(self.error_code);
pub fn encode<W: BufMut>(&self, out: &mut W, max_len: usize) {
out.write(Type::APPLICATION_CLOSE); // 1 byte
out.write(self.error_code); // 2 bytes
let max_len =
max_len as usize - 3 - varint::size(self.reason.as_ref().len() as u64).unwrap();
let actual_len = self.reason.as_ref().len().min(max_len);
varint::write(actual_len as u64, out).unwrap();
out.put_slice(&self.reason.as_ref()[0..actual_len]);
out.write_var(actual_len as u64); // <= 8 bytes
out.put_slice(&self.reason.as_ref()[0..actual_len]); // whatever's left
}
}
@@ -319,15 +322,15 @@ impl Ack {
} else {
Type::ACK
});
varint::write(largest, buf).unwrap();
varint::write(delay, buf).unwrap();
varint::write(ranges.len() as u64 - 1, buf).unwrap();
varint::write(first_size - 1, buf).unwrap();
buf.write_var(largest);
buf.write_var(delay);
buf.write_var(ranges.len() as u64 - 1);
buf.write_var(first_size - 1);
let mut prev = first.start;
for block in rest {
let size = block.end - block.start;
varint::write(prev - block.end - 1, buf).unwrap();
varint::write(size - 1, buf).unwrap();
buf.write_var(prev - block.end - 1);
buf.write_var(size - 1);
prev = block.start;
}
ecn.map(|x| x.encode(buf));
@@ -380,13 +383,13 @@ where
if self.fin {
ty |= 0x01;
}
out.put_u8(ty);
varint::write(self.id.0, out).unwrap();
out.put_u8(ty); // 1 byte
out.write_var(self.id.0); // <=8 bytes
if self.offset != 0 {
varint::write(self.offset, out).unwrap();
out.write_var(self.offset); // <=8 bytes
}
if length {
varint::write(self.data.as_ref().len() as u64, out).unwrap();
out.write_var(self.data.as_ref().len() as u64); // <=8 bytes
}
out.put_slice(self.data.as_ref());
}
@@ -600,12 +603,12 @@ impl Iterator for Iter {
fn scan_ack_blocks(packet: &[u8], largest: u64, n: usize) -> Option<usize> {
let mut buf = io::Cursor::new(packet);
let first_block = varint::read(&mut buf)?;
let first_block = buf.get_var().ok()?;
let mut smallest = largest.checked_sub(first_block)?;
for _ in 0..n {
let gap = varint::read(&mut buf)?;
let gap = buf.get_var().ok()?;
smallest = smallest.checked_sub(gap + 2)?;
let block = varint::read(&mut buf)?;
let block = buf.get_var().ok()?;
smallest = smallest.checked_sub(block)?;
}
Some(buf.position() as usize)
@@ -630,9 +633,9 @@ impl<'a> Iterator for AckIter<'a> {
if !self.data.has_remaining() {
return None;
}
let block = varint::read(&mut self.data).unwrap();
let block = self.data.get_var().unwrap();
let largest = self.largest;
if let Some(gap) = varint::read(&mut self.data) {
if let Ok(gap) = self.data.get_var() {
self.largest -= block + gap + 2;
}
Some(largest - block..largest + 1)
@@ -652,10 +655,10 @@ impl FrameStruct for RstStream {
impl RstStream {
pub fn encode<W: BufMut>(&self, out: &mut W) {
out.write(Type::RST_STREAM);
varint::write(self.id.0, out).unwrap();
out.write(self.error_code);
varint::write(self.final_offset, out).unwrap();
out.write(Type::RST_STREAM); // 1 byte
out.write_var(self.id.0); // <= 8 bytes
out.write(self.error_code); // 2 bytes
out.write_var(self.final_offset); // <= 8 bytes
}
}