rust/rustls
rust
/
rustls
mirror of https://github.com/ctz/rustls
1
0
Fork 0
Code Issues Releases Wiki Activity

deframer: avoid unnecessary copies when deframing multiple messages

This commit is contained in:
Dirkjan Ochtman 2021-12-13 14:10:38 +01:00
parent 0289e1a9bd
commit 0f49db467c
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
rustls/src/msgs/deframer.rs
View File

@ -65,12 +65,12 @@ impl MessageDeframer {
let new_bytes = rd.read(&mut self.buf[self.used..])?;
self.used += new_bytes;
let mut taken = 0;
loop {
// Does our `buf` contain a full message? It does if it is big enough to
// contain a header, and that header has a length which falls within `buf`.
// If so, deframe it and place the message onto the frames output queue.
let mut rd = codec::Reader::init(&self.buf[..self.used]);
let mut rd = codec::Reader::init(&self.buf[taken..self.used]);
let m = match OpaqueMessage::read(&mut rd) {
Ok(m) => m,
Err(e) => {
@ -82,27 +82,29 @@ impl MessageDeframer {
}
};
let taken = rd.used();
taken += rd.used();
self.frames.push_back(m);
if taken < self.used {
/* Before:
* +----------+----------+----------+
* | taken | pending |xxxxxxxxxx|
* +----------+----------+----------+
* 0 ^ taken ^ self.used
*
* After:
* +----------+----------+----------+
* | pending |xxxxxxxxxxxxxxxxxxxxx|
* +----------+----------+----------+
* 0 ^ self.used
*/
}
self.buf.copy_within(taken..self.used, 0);
self.used -= taken;
} else if taken == self.used {
self.used = 0;
}
if taken < self.used {
/* Before:
* +----------+----------+----------+
* | taken | pending |xxxxxxxxxx|
* +----------+----------+----------+
* 0 ^ taken ^ self.used
*
* After:
* +----------+----------+----------+
* | pending |xxxxxxxxxxxxxxxxxxxxx|
* +----------+----------+----------+
* 0 ^ self.used
*/
self.buf
.copy_within(taken..self.used, 0);
self.used -= taken;
} else if taken == self.used {
self.used = 0;
}
Ok(new_bytes)