rewrite IpPacket

Author: thvdveld

Cargo.toml

@@ -50,7 +50,10 @@ defmt = [ "dep:defmt", "heapless/defmt", "heapless/defmt-impl" ]
 "proto-igmp" = ["proto-ipv4"]
 "proto-dhcpv4" = ["proto-ipv4"]
 "proto-ipv6" = []
-"proto-rpl" = []
+"proto-ipv6-hbh" = ["proto-ipv6"]
+"proto-ipv6-fragmentation" = ["proto-ipv6", "_proto-fragmentation"]
+"proto-ipv6-routing" = ["proto-ipv6"]
+"proto-rpl" = ["proto-ipv6-hbh", "proto-ipv6-routing"]
 "proto-sixlowpan" = ["proto-ipv6"]
 "proto-sixlowpan-fragmentation" = ["proto-sixlowpan", "_proto-fragmentation"]
 "proto-dns" = []

src/iface/interface/mod.rs

@@ -1674,6 +1674,7 @@ impl InterfaceInner {
 
                         // Emit the IP header to the buffer.
                         emit_ip(&ip_repr, &mut frag.buffer);
+
                         let mut ipv4_packet = Ipv4PacketWire::new_unchecked(&mut frag.buffer[..]);
                         frag.ipv4.ident = ipv4_id;
                         ipv4_packet.set_ident(ipv4_id);

src/iface/ip_packet.rs

@@ -24,15 +24,9 @@ impl<'p> IpPacket<'p> {
     pub(crate) fn new(ip_repr: IpRepr, payload: IpPayload<'p>) -> Self {
         match ip_repr {
             #[cfg(feature = "proto-ipv4")]
-            IpRepr::Ipv4(header) => Self::Ipv4(Ipv4Packet { header, payload }),
+            IpRepr::Ipv4(header) => Self::new_ipv4(header, payload),
             #[cfg(feature = "proto-ipv6")]
-            IpRepr::Ipv6(header) => Self::Ipv6(Ipv6Packet {
-                header,
-                hop_by_hop: None,
-                fragment: None,
-                routing: None,
-                payload,
-            }),
+            IpRepr::Ipv6(header) => Self::new_ipv6(header, payload),
         }
     }
 
@@ -48,8 +42,11 @@ impl<'p> IpPacket<'p> {
     pub(crate) fn new_ipv6(ip_repr: Ipv6Repr, payload: IpPayload<'p>) -> Self {
         Self::Ipv6(Ipv6Packet {
             header: ip_repr,
+            #[cfg(feature = "proto-ipv6-hbh")]
             hop_by_hop: None,
+            #[cfg(feature = "proto-ipv6-fragmentation")]
             fragment: None,
+            #[cfg(feature = "proto-ipv6-routing")]
             routing: None,
             payload,
         })
@@ -157,8 +154,11 @@ pub(crate) struct Ipv4Packet<'p> {
 #[cfg(feature = "proto-ipv6")]
 pub(crate) struct Ipv6Packet<'p> {
     header: Ipv6Repr,
+    #[cfg(feature = "proto-ipv6-hbh")]
     hop_by_hop: Option<Ipv6HopByHopRepr<'p>>,
+    #[cfg(feature = "proto-ipv6-fragmentation")]
     fragment: Option<Ipv6FragmentRepr>,
+    #[cfg(feature = "proto-ipv6-routing")]
     routing: Option<Ipv6RoutingRepr<'p>>,
     payload: IpPayload<'p>,
 }