General & Crypto

codec/Cargo.toml

@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-type-map = { path = "../type-map" }
-common = { path = "../common" }
+mtp-type-map = { path = "../type-map" }
+mtp-common = { path = "../common" }
 mtp-crypto = { path = "../crypto", optional = true }
 base64 = "*"
 byteorder = "*"

codec/src/communication_value.rs

@@ -4,7 +4,7 @@ use std::io::{Cursor, Read};
 
 use crate::data_value::DataValue;
 use crate::rand_u32;
-use type_map::{CommTypeId, DataTypeId};
+use mtp_type_map::{CommTypeId, DataTypeId};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct CommunicationValue {
@@ -201,7 +201,7 @@ impl CommunicationValue {
 mod tests {
     use super::*;
     use crate::data_value::DataValue;
-    use type_map::{CommTypeId, DataTypeId};
+    use mtp_type_map::{CommTypeId, DataTypeId};
 
     fn roundtrip(cv: CommunicationValue) -> CommunicationValue {
         let bytes = cv.to_bytes();

codec/src/data_value.rs

@@ -5,7 +5,7 @@ use std::collections::BTreeMap;
 use std::hash::{Hash, Hasher};
 use std::io::Cursor;
 
-use type_map::DataTypeId;
+use mtp_type_map::DataTypeId;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum DataKind {
@@ -52,7 +52,7 @@ pub enum DataValue {
 impl DataValue {
     /*
      * Container format:
-     * [2 bytes u16 entry_count]       // number of key-value pairs
+     * [2 bytes u16 entry_count]       // length of the container
      * [1 byte kind]                   // DataValue kind marker
      * [if kind == BOOL_TRUE or BOOL_FALSE:]
      *     [1 byte key]                // DataTypes discriminant
@@ -64,11 +64,15 @@ impl DataValue {
      * Kind markers:
      * 0x01 => BoolTrue
      * 0x02 => BoolFalse
-     * 0x03 => Number (i64, 8 bytes big-endian)
-     * 0x04 => Str (UTF-8 bytes)
-     * 0x05 => Array (nested container format)
-     * 0x06 => Container (nested container format)
-     * 0x07 => Null
+     * 0x03 => Signed Number (i64, 8 bytes big-endian)
+     * 0x04 => Unsigned Number (u64, 8 bytes big-endian)
+     * 0x05 => Float (1 byte exponent, 3 bytes mantissa)
+     * 0x06 => Str (UTF-8 bytes)
+     * 0x07 => Bytes
+     * 0x08 => Array (nested container format)
+     * 0x09 => Container (nested container format)
+     * 0x0A => EncryptedContainer (nested container format)
+     * 0x0B => Null
      */
     const KIND_BOOL_TRUE: u8 = 0x01;
     const KIND_BOOL_FALSE: u8 = 0x02;

codec/src/lib.rs

@@ -8,9 +8,9 @@ pub use data_value::{DataKind, DataValue};
 
 pub use util::rand_u32;
 
-pub use type_map::{CommTypeId, DataTypeId, TypeMap, Version};
+pub use mtp_type_map::{CommTypeId, DataTypeId, TypeMap, Version};
 
-use common::CodecError;
+use mtp_common::CodecError;
 
 pub fn encode(_value: &DataValue, _typemap: &TypeMap) -> Result<Vec<u8>, CodecError> {
     // write header using typemap.data_id(), serialize value