void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 20:13:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
Adam Ierymenko 2022-01-07 11:37:37 -05:00
parent 86c366f1bd
commit b2796a5f9c
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
allthethings/src/link.rs
View file

@ -44,7 +44,7 @@ fn decode_msgpack<'de, T: Deserialize<'de>>(data: &'de [u8]) -> smol::io::Result
} }
#[inline(always)] #[inline(always)]
fn read_id_hash(bytes: &[u8]) -> smol::io::Result<&[u8; IDENTITY_HASH_SIZE]> { fn next_id_hash_in_slice(bytes: &[u8]) -> smol::io::Result<&[u8; IDENTITY_HASH_SIZE]> {
if bytes.len() >= IDENTITY_HASH_SIZE { if bytes.len() >= IDENTITY_HASH_SIZE {
Ok(unsafe { &*bytes.as_ptr().cast::<[u8; IDENTITY_HASH_SIZE]>() }) Ok(unsafe { &*bytes.as_ptr().cast::<[u8; IDENTITY_HASH_SIZE]>() })
} else { } else {
@ -286,11 +286,11 @@ impl<'a, 'b, 'c, S: Store> Link<'a, 'b, 'c, S> {
let empty_tmp_buf_size = tmp_buf.len(); let empty_tmp_buf_size = tmp_buf.len();
while !msg.is_empty() { while !msg.is_empty() {
let id_hash = read_id_hash(msg)?; let id_hash = next_id_hash_in_slice(msg)?;
msg = &msg[IDENTITY_HASH_SIZE..];
if !self.store.have(id_hash) { if !self.store.have(id_hash) {
let _ = tmp_buf.write_all(id_hash); let _ = tmp_buf.write_all(id_hash);
} }
msg = &msg[IDENTITY_HASH_SIZE..];
} }
if tmp_buf.len() != empty_tmp_buf_size { if tmp_buf.len() != empty_tmp_buf_size {
@ -307,12 +307,11 @@ impl<'a, 'b, 'c, S: Store> Link<'a, 'b, 'c, S> {
} }
let ref_time = ref_time.unwrap().0; let ref_time = ref_time.unwrap().0;
let cap = (msg.len() / IDENTITY_HASH_SIZE) + 1; let mut objects: Vec<S::Object> = Vec::with_capacity((msg.len() / IDENTITY_HASH_SIZE) + 1);
let mut objects: Vec<S::Object> = Vec::with_capacity(cap);
while !msg.is_empty() { while !msg.is_empty() {
let id_hash = read_id_hash(msg)?; let id_hash = next_id_hash_in_slice(msg)?;
let _ = self.store.get(ref_time, id_hash).map(|obj| objects.push(obj));
msg = &msg[IDENTITY_HASH_SIZE..]; msg = &msg[IDENTITY_HASH_SIZE..];
let _ = self.store.get(ref_time, id_hash).map(|obj| objects.push(obj));
} }
if !objects.is_empty() { if !objects.is_empty() {