diff options
Diffstat (limited to 'src/protocol/grev1.rs')
| -rw-r--r-- | src/protocol/grev1.rs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/protocol/grev1.rs b/src/protocol/grev1.rs index 4bf551f..a16bab6 100644 --- a/src/protocol/grev1.rs +++ b/src/protocol/grev1.rs @@ -1,5 +1,5 @@ use crate::protocol::codec::Decode; -use crate::protocol::ethernet::EtherType; +use crate::protocol::ethernet::EthType; use nom::bits; use nom::error::Error; use nom::number; @@ -29,7 +29,7 @@ use nom::IResult; */ #[derive(Clone, Debug, PartialEq, Eq)] -pub struct Grev1Header { +pub struct GREv1Header { pub flag_checksum: bool, pub flag_routing: bool, pub flag_key: bool, @@ -39,7 +39,7 @@ pub struct Grev1Header { pub flag_acknowledgment: bool, pub flags: u8, pub version: u8, - pub protocol_type: EtherType, + pub protocol_type: EthType, pub key_payload_length: u16, pub key_call_id: u16, pub sequence_number: Option<u32>, @@ -50,9 +50,9 @@ pub struct Grev1Header { * API ******************************************************************************/ -impl Decode for Grev1Header { - type Iterm = Grev1Header; - fn decode(input: &[u8]) -> IResult<&[u8], Grev1Header> { +impl Decode for GREv1Header { + type Iterm = GREv1Header; + fn decode(input: &[u8]) -> IResult<&[u8], GREv1Header> { let ( input, ( @@ -85,7 +85,7 @@ impl Decode for Grev1Header { ))); } - let (input, protocol_type) = EtherType::decode(input)?; + let (input, protocol_type) = EthType::decode(input)?; let (input, key_payload_length) = number::streaming::be_u16(input)?; let (input, key_call_id) = number::streaming::be_u16(input)?; let (input, sequence_number) = match flag_sequence { @@ -99,7 +99,7 @@ impl Decode for Grev1Header { Ok(( input, - Grev1Header { + GREv1Header { flag_checksum: flag_checksum == 1, flag_routing: flag_routing == 1, flag_key: flag_key == 1, @@ -125,9 +125,9 @@ impl Decode for Grev1Header { #[cfg(test)] mod tests { - use super::Grev1Header; + use super::GREv1Header; use crate::protocol::codec::Decode; - use crate::protocol::ethernet::EtherType; + use crate::protocol::ethernet::EthType; const LAST_SLICE: &'static [u8] = &[0xff]; #[test] @@ -156,7 +156,7 @@ mod tests { 0x3a, 0x76, 0xff, /* Payload */ ]; - let expectation = Grev1Header { + let expectation = GREv1Header { flag_checksum: false, flag_routing: false, flag_key: true, @@ -166,17 +166,17 @@ mod tests { flag_acknowledgment: true, flags: 0, version: 1, - protocol_type: EtherType::PPP, + protocol_type: EthType::PPP, key_payload_length: 103, key_call_id: 6016, sequence_number: Some(430001), acknowledgment_number: Some(539254), }; - assert_eq!(Grev1Header::decode(&bytes), Ok((LAST_SLICE, expectation))); + assert_eq!(GREv1Header::decode(&bytes), Ok((LAST_SLICE, expectation))); // example - let result = Grev1Header::decode(&bytes); + let result = GREv1Header::decode(&bytes); if let Ok((payload, header)) = result { println!("return: {:?}, payload: {}", header, payload.len()); } else { |