tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dynamic index: make it hard to mess up endianess 

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2020-06-15 09:19:35 +02:00
parent 0196b9bf5b
commit 7a6b549270
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/backup/dynamic_index.rs
View File

@ -41,10 +41,17 @@ proxmox::static_assert_size!(DynamicIndexHeader, 4096);
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
#[repr(C)] #[repr(C)]
pub struct DynamicEntry { pub struct DynamicEntry {
end: u64, end_le: u64,
digest: [u8; 32], digest: [u8; 32],
} }
impl DynamicEntry {
#[inline]
pub fn end(&self) -> u64 {
u64::from_le(self.end_le)
}
}
pub struct DynamicIndexReader { pub struct DynamicIndexReader {
_file: File, _file: File,
pub size: usize, pub size: usize,
@ -122,10 +129,10 @@ impl DynamicIndexReader {
let start = if pos == 0 { let start = if pos == 0 {
0 0
} else { } else {
u64::from_le(self.index[pos - 1].end) self.index[pos - 1].end()
}; };
let end = u64::from_le(self.index[pos].end); let end = self.index[pos].end();
Ok(ChunkReadInfo { Ok(ChunkReadInfo {
range: start..end, range: start..end,
@ -139,7 +146,7 @@ impl DynamicIndexReader {
if pos >= self.index.len() { if pos >= self.index.len() {
panic!("chunk index out of range"); panic!("chunk index out of range");
} }
u64::from_le(self.index[pos].end) self.index[pos].end()
} }
#[inline] #[inline]
@ -154,7 +161,7 @@ impl DynamicIndexReader {
pub fn compute_csum(&self) -> ([u8; 32], u64) { pub fn compute_csum(&self) -> ([u8; 32], u64) {
let mut csum = openssl::sha::Sha256::new(); let mut csum = openssl::sha::Sha256::new();
for entry in &self.index { for entry in &self.index {
csum.update(&entry.end.to_ne_bytes()); csum.update(&entry.end_le.to_ne_bytes());
csum.update(&entry.digest); csum.update(&entry.digest);
} }
let csum = csum.finish(); let csum = csum.finish();
@ -163,8 +170,9 @@ impl DynamicIndexReader {
csum, csum,
self.index self.index
.last() .last()
.map(|entry| entry.end) .map(|entry| entry.end())
.unwrap_or(0)) .unwrap_or(0)
)
} }
// TODO: can we use std::slice::binary_search with Mmap now? // TODO: can we use std::slice::binary_search with Mmap now?