Implement IPv4 checksum and use inverse maps for ethernet sculpting #74
Conversation
- Implement checksum calculation for IPv4 header. - Replace TOS header field with the new DSCP and ECN fields as directed in RFC 2474 and RFC 3168. Signed-off-by: Mohammad Aadil Shabier <[email protected]>
This will be used when sculpting to select an EtherType based on the upcoming layer. Signed-off-by: Mohammad Aadil Shabier <[email protected]>
aadilshabier
changed the title
|
@aadilshabier: Sorry - This somehow got missed! Will take a look at it sometime soon (this week). |
| @@ -14,7 +14,9 @@ pub const ARP_HEADER_LENGTH: usize = 28_usize; | |||
|
|
|||
| // Register outselves with Ethernet layer | |||
| pub(crate) fn register_defaults() -> Result<(), Error> { | |||
| ethernet::register_ethertype(ETHERTYPE_ARP, ARP::creator) | |||
| let name = Some(ARP::default().name()); | |||
There was a problem hiding this comment.
Use short_name (short_name is convenient and usually all lowercase)
| ETHERTYPES_MAP.get_or_init(|| RwLock::new(HashMap::new())) | ||
| } | ||
|
|
||
| /// A Map maintaining String -> EtherType of L3 Layers. |
There was a problem hiding this comment.
Add more description for the map as a documentation. If we simply read this documentation it is not clear why this map exists and how it is to be used. For example something like this.
/// This map will be used during sculpting a packet. For example for IPv4 you the entry
/// in the map will look like `ip -> 0x0800`
| ETHERTYPES_MAP.get_or_init(|| RwLock::new(HashMap::new())) | ||
| } | ||
|
|
||
| /// A Map maintaining String -> EtherType of L3 Layers. | ||
| pub fn get_inv_ethertypes_map() -> &'static RwLock<HashMap<String, EtherType>> { |
There was a problem hiding this comment.
May be this function is gated by cfg(packet_sculpting) ? Because this map and API is not used outside sculpting.
|
|
||
| if let Some(name) = name { | ||
| let mut inv_map = get_inv_ethertypes_map().write().unwrap(); | ||
| if inv_map.contains_key(name) { |
There was a problem hiding this comment.
if inv_map.contains_key(&name.to_lowercase())
| let mut inv_map = get_inv_ethertypes_map().write().unwrap(); | ||
| if inv_map.contains_key(name) { | ||
| return Err(Error::RegisterError(format!( | ||
| "Cannot find EtherType for : {}", |
There was a problem hiding this comment.
Error should be Already Exists and not cannot find. Also Better to let the user know what value exists in the inv_ map. So may be get and check for Some value?
|
|
||
| register_ethertype(crate::types::ETHERTYPE_IP, IPv4::creator)?; | ||
|
|
||
| let name = Some(IPv4::default().name()); |
There was a problem hiding this comment.
short_name as above in ARP.
| @@ -26,8 +25,8 @@ fn get_next_headers_map() -> &'static RwLock<HashMap<u8, LayerCreatorFn>> { | |||
| pub(crate) fn register_defaults() -> Result<(), Error> { | |||
| use crate::layers::ethernet::register_ethertype; | |||
|
|
|||
| get_next_headers_map(); | |||
| register_ethertype(crate::types::ETHERTYPE_IP6, IPv6::creator)?; | |||
| let name = Some(IPv6::default().name()); | |||
| @@ -16,8 +16,10 @@ pub const MPLS_HEADER_LENGTH: usize = 4_usize; | |||
|
|
|||
| // Register Ourselves to the Ethernet layer, as this is a 2.5 layer protocol | |||
| pub(crate) fn register_defaults() -> Result<(), Error> { | |||
| ethernet::register_ethertype(ETHERTYPE_MPLS_UNICAST, MPLS::creator)?; | |||
| ethernet::register_ethertype(ETHERTYPE_MPLS_MULTICAST, MPLS::creator) | |||
| let name = Some(MPLS::default().name()); | |||
No description provided.