Skip to content

fix: Fixed incorrect datatypes for DataNumbers. #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 7, 2025
Merged

fix: Fixed incorrect datatypes for DataNumbers. #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion RELEASES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# 0.6.2
* IPFix supports multiple V9 Options templates.
* Found casting issues that could result in dataloss in the DataNumbets module.
* Found casting issues that could result in dataloss in the DataNumbers module.
* Fixed incorrect datatypes for DataNumbers.
* Added Reverse Information Element PEN fields.

# 0.6.1
Expand Down
12 changes: 9 additions & 3 deletions src/variable_versions/data_number.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ macro_rules! impl_try_from {
#[serde(untagged)]
pub enum DataNumber {
U8(u8),
I8(i8),
U16(u16),
I16(i16),
U24(u32),
I24(i32),
U32(u32),
Expand Down Expand Up @@ -128,9 +130,9 @@ impl DataNumber {
pub fn parse(i: &[u8], field_length: u16, signed: bool) -> IResult<&[u8], DataNumber> {
match (field_length, signed) {
(1, false) => Ok(u8::parse(i)?).map(|(i, j)| (i, Self::U8(j))),
(1, true) => Ok(i8::parse(i)?).map(|(i, j)| (i, Self::I32(i32::from(j)))),
(1, true) => Ok(i8::parse(i)?).map(|(i, j)| (i, Self::I8(j))),
(2, false) => Ok(u16::parse(i)?).map(|(i, j)| (i, Self::U16(j))),
(2, true) => Ok(i16::parse(i)?).map(|(i, j)| (i, Self::I32(i32::from(j)))),
(2, true) => Ok(i16::parse(i)?).map(|(i, j)| (i, Self::I16(j))),
(3, false) => Ok(be_u24(i).map(|(i, j)| (i, Self::U24(j)))?),
(3, true) => Ok(be_i24(i).map(|(i, j)| (i, Self::I24(j)))?),
(4, true) => Ok(i32::parse(i)?).map(|(i, j)| (i, Self::I32(j))),
Expand All @@ -146,7 +148,9 @@ impl DataNumber {
fn to_be_bytes(&self) -> Result<Vec<u8>, std::io::Error> {
match self {
DataNumber::U8(n) => Ok(n.to_be_bytes().to_vec()),
DataNumber::I8(n) => Ok(n.to_be_bytes().to_vec()),
DataNumber::U16(n) => Ok(n.to_be_bytes().to_vec()),
DataNumber::I16(n) => Ok(n.to_be_bytes().to_vec()),
DataNumber::U24(n) => {
let mut wtr = Vec::new();
wtr.write_u24::<BigEndian>(*n)?;
Expand All @@ -172,11 +176,13 @@ impl From<DataNumber> for usize {
fn from(val: DataNumber) -> Self {
match val {
DataNumber::U8(i) => usize::from(i),
DataNumber::I8(i) => i as usize,
DataNumber::U16(i) => i as usize,
DataNumber::I16(i) => i as usize,
DataNumber::I24(i) => i as usize,
DataNumber::U24(i) => i as usize,
DataNumber::U32(i) => i as usize,
DataNumber::I32(i) => i as usize,
DataNumber::U16(i) => i as usize,
DataNumber::U64(i) => i as usize,
DataNumber::I64(i) => i as usize,
DataNumber::U128(i) => i as usize,
Expand Down