Skip to content

fix(dht): fix from_bytes for DhtPacketPayload #11

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
Feb 9, 2018
Merged

fix(dht): fix from_bytes for DhtPacketPayload #11

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
38 changes: 22 additions & 16 deletions src/toxcore/dht_new/packet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,23 @@ impl ToBytes for DhtPacketPayload {
}
}

#[allow(unused_variables)]
impl DhtPacketPayload {
named_args!(from_bytes_inner(packet_type: PacketKind) <Self>, switch!(value!(packet_type),
PacketKind::PingRequest => map!(PingRequest::from_bytes, DhtPacketPayload::PingRequest) |
PacketKind::PingResponse => map!(PingResponse::from_bytes, DhtPacketPayload::PingResponse) |
PacketKind::GetNodes => map!(GetNodes::from_bytes, DhtPacketPayload::GetNodes) |
PacketKind::SendNodes => map!(SendNodes::from_bytes, DhtPacketPayload::SendNodes)
));
/** Deserialize `DhtPacketPayload` struct using `nom` from raw bytes.
Note that this function is not an implementation of `FromBytes` trait
since it takes additional parameter.
*/
pub fn from_bytes(i: &[u8], packet_type: PacketKind) -> IResult<&[u8], Self> {
DhtPacketPayload::from_bytes_inner(i, packet_type)
}
}

impl ToBytes for DhtRequestPayload {
fn to_bytes<'a>(&self, buf: (&'a mut [u8], usize)) -> Result<(&'a mut [u8], usize), GenError> {
match *self {
Expand All @@ -198,15 +215,6 @@ impl ToBytes for DhtRequestPayload {
}
}

impl FromBytes for DhtPacketPayload {
named!(from_bytes<DhtPacketPayload>, alt!(
map!(PingRequest::from_bytes, DhtPacketPayload::PingRequest) |
map!(PingResponse::from_bytes, DhtPacketPayload::PingResponse) |
map!(GetNodes::from_bytes, DhtPacketPayload::GetNodes) |
map!(SendNodes::from_bytes, DhtPacketPayload::SendNodes)
));
}

impl ToBytes for DhtRequest {
fn to_bytes<'a>(&self, buf: (&'a mut [u8], usize)) -> Result<(&'a mut [u8], usize), GenError> {
do_gen!(buf,
Expand Down Expand Up @@ -866,14 +874,12 @@ mod test {
if bytes.len() < GET_NODES_SIZE {
assert!(!GetNodes::from_bytes(&bytes).is_done());
} else {
let gn = DhtPacketPayload::from_bytes(&bytes).unwrap().1;
if let DhtPacketPayload::GetNodes(gp) = gn {
// ping_id as bytes should match "original" bytes
assert_eq!(BigEndian::read_u64(&bytes[PUBLICKEYBYTES..GET_NODES_SIZE]), gp.id);
let gp = GetNodes::from_bytes(&bytes).unwrap().1;
// ping_id as bytes should match "original" bytes
assert_eq!(BigEndian::read_u64(&bytes[PUBLICKEYBYTES..GET_NODES_SIZE]), gp.id);

let PublicKey(ref pk) = gp.pk;
assert_eq!(pk, &bytes[..PUBLICKEYBYTES]);
}
let PublicKey(ref pk) = gp.pk;
assert_eq!(pk, &bytes[..PUBLICKEYBYTES]);
}
}
quickcheck(with_bytes as fn(Vec<u8>));
Expand Down