Skip to content

* use BigEndian for length representation #3

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
cashtang merged 1 commit into from
Dec 4, 2025
Merged

* use BigEndian for length representation #3

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
2 changes: 1 addition & 1 deletion ndef/src/message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ mod tests {
.unwrap();
let message = NdefMessage::from(record);
let buffer = message.to_buffer().unwrap();
let expect = "c4022c0100005370abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab";
let expect = "c4020000012c5370abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab";
assert_eq!(expect, hex::encode(buffer));
}

Expand Down
20 changes: 7 additions & 13 deletions ndef/src/record.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::{payload::*, error::NdefError};
use crate::*;
use crate::{error::NdefError, payload::*};
use anyhow::anyhow;
use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
use std::io::{prelude::*, Cursor};

#[derive(Debug, Clone)]
Expand Down Expand Up @@ -88,7 +88,7 @@ impl NdefRecord {
.map_err(|_| anyhow!("Failed to write ID length"))?;
} else {
output
.write_u32::<LittleEndian>(self.payload.len() as u32)
.write_u32::<BigEndian>(self.payload.len() as u32)
.map_err(|_| anyhow!("Failed to write payload length"))?;
}
if let Some(id) = self.id.as_ref() {
Expand All @@ -115,23 +115,17 @@ impl NdefRecord {
let tnf = TNF::from_repr(flags & 0x07).ok_or_else(|| NdefError::InvalidTnf)?;
let flags = RecordFlags::from_bits_retain(flags);

let type_len = reader
.read_u8()
.map_err(|_| NdefError::InvalidTagLength)?;
let type_len = reader.read_u8().map_err(|_| NdefError::InvalidTagLength)?;
let payload_len = if flags & RecordFlags::SR == RecordFlags::SR {
reader
.read_u8()
.map_err(|_| NdefError::InvalidPayload)? as u32
reader.read_u8().map_err(|_| NdefError::InvalidPayload)? as u32
} else {
reader
.read_u32::<LittleEndian>()
.read_u32::<BigEndian>()
.map_err(|_| NdefError::InvalidPayload)?
};

let id_len = if flags & RecordFlags::IL == RecordFlags::IL {
reader
.read_u8()
.map_err(|_| NdefError::InvalidId)?
reader.read_u8().map_err(|_| NdefError::InvalidId)?
} else {
0
};
Expand Down
15 changes: 8 additions & 7 deletions ndef/src/tag.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use byteorder::{LittleEndian, WriteBytesExt};
use std::io::{Cursor, Write};
use anyhow::Result;
use byteorder::{BigEndian, WriteBytesExt};
use std::io::{Cursor, Write};

use crate::message::NdefMessage;

Expand Down Expand Up @@ -82,9 +82,7 @@ impl TlvValue {
writer.write_all(value).unwrap();
} else {
writer.write_u8(0xff).unwrap();
writer
.write_u16::<LittleEndian>(value.len() as u16)
.unwrap();
writer.write_u16::<BigEndian>(value.len() as u16).unwrap();
writer.write_all(value).unwrap();
}
}
Expand Down Expand Up @@ -232,9 +230,9 @@ mod tests {
#[test]
fn test_ndef_message() {
use super::*;
use crate::payload::*;
use crate::record::NdefRecord;
use crate::*;
use crate::payload::*;

let record1 = NdefRecord::builder()
.tnf(TNF::WellKnown)
Expand All @@ -244,7 +242,10 @@ mod tests {

let record2 = NdefRecord::builder()
.tnf(TNF::External)
.payload(&ExternalPayload::from_static(b"android.com:pkg", b"com.tencent.mm"))
.payload(&ExternalPayload::from_static(
b"android.com:pkg",
b"com.tencent.mm",
))
.build()
.unwrap();

Expand Down