datum parsing
This commit is contained in:
@@ -11,9 +11,9 @@ pub fn parse_received_datum(
|
||||
datum_length: usize,
|
||||
) -> Option<([u8; 32], MerkleNode)> {
|
||||
let hash_name: [u8; 32] = recevied_datum[..32].try_into().expect("error");
|
||||
let sigstart = datum_length - 64;
|
||||
let value = &recevied_datum[32..sigstart];
|
||||
let value = &recevied_datum[32..datum_length];
|
||||
let value_slice = value.to_vec();
|
||||
println!("valueslice: {:?}, {}", value_slice, value_slice.len());
|
||||
let datum_type = value_slice[0];
|
||||
match datum_type {
|
||||
CHUNK => Some((
|
||||
@@ -21,14 +21,17 @@ pub fn parse_received_datum(
|
||||
MerkleNode::Chunk(crate::ChunkNode { data: value_slice }),
|
||||
)),
|
||||
DIRECTORY => {
|
||||
let nb_entries = value_slice[1];
|
||||
let mut dir_entries = Vec::new();
|
||||
let mut offset = 1 as usize;
|
||||
for i in 0..nb_entries {
|
||||
offset = (offset as u8 + 64 * i) as usize;
|
||||
let name = &recevied_datum[offset..offset + 32];
|
||||
for i in 0..((value_slice.len() - 1) / 64) as u8 {
|
||||
offset = (1 + 64 * i as usize) as usize;
|
||||
println!("offset:{}, i:{}", offset, i);
|
||||
let name = &value_slice[offset..offset + 32];
|
||||
let mut hash = [0u8; 32];
|
||||
hash.copy_from_slice(&recevied_datum[offset + 32..offset + 64]);
|
||||
hash.copy_from_slice(&value_slice[offset + 32..offset + 64]);
|
||||
let dp_name = String::from_utf8(name.to_vec()).expect("err");
|
||||
println!("name:{}", dp_name);
|
||||
|
||||
// envoyer un datum request
|
||||
dir_entries.push(DirectoryEntry {
|
||||
filename: name.try_into().expect("incorrect size"),
|
||||
@@ -62,19 +65,18 @@ pub fn parse_received_datum(
|
||||
);*/
|
||||
}
|
||||
BIGDIRECTORY => {
|
||||
let nb_entries = value_slice[1];
|
||||
let mut dir_entries = Vec::new();
|
||||
let mut bigdir_entries: Vec<NodeHash> = Vec::new();
|
||||
let mut offset = 1 as usize;
|
||||
for i in 0..nb_entries {
|
||||
offset = (offset as u8 + 64 * i) as usize;
|
||||
let name = &recevied_datum[offset..offset + 32];
|
||||
let mut hash = [0u8; 32];
|
||||
hash.copy_from_slice(&recevied_datum[offset + 32..offset + 64]);
|
||||
for i in 0..((value_slice.len() - 1) / 32) as u8 {
|
||||
offset = (1 + 32 * i as usize) as usize;
|
||||
println!("offset:{}, i:{}", offset, i);
|
||||
let hash = &value_slice[offset..offset + 32];
|
||||
|
||||
// envoyer un datum request
|
||||
dir_entries.push(hash);
|
||||
bigdir_entries.push(hash.try_into().expect("incorrect size"));
|
||||
}
|
||||
|
||||
let current = BigDirectoryNode::new(dir_entries);
|
||||
let current = BigDirectoryNode::new(bigdir_entries);
|
||||
match current {
|
||||
Ok(current_node) => Some((hash_name, MerkleNode::BigDirectory(current_node))),
|
||||
Err(e) => {
|
||||
|
||||
Reference in New Issue
Block a user