fixup! iptunnel: add support to ipip, ipip6 and ip6ip6 tunnels

Author: liangwen12year

src/link/link_info/info_data.rs

@@ -4,7 +4,7 @@ use anyhow::Context;
 
 use netlink_packet_utils::{
     nla::{Nla, NlaBuffer, NlasIterator},
-    DecodeError, Emitable, Parseable,
+    DecodeError, Emitable, Parseable, ParseableParametrized,
 };
 
 use super::super::{
@@ -362,7 +362,8 @@ impl InfoData {
                     let nla = &nla.context(format!(
                         "invalid IFLA_INFO_DATA for {kind} {payload:?}"
                     ))?;
-                    let parsed = InfoIpTunnel::parse(nla)?;
+                    let parsed =
+                        InfoIpTunnel::parse_with_param(nla, kind.clone())?;
                     v.push(parsed);
                 }
                 InfoData::IpTunnel(v)

src/link/link_info/iptunnel.rs

@@ -8,7 +8,7 @@ use byteorder::{ByteOrder, NativeEndian};
 use netlink_packet_utils::{
     nla::{DefaultNla, Nla, NlaBuffer},
     parsers::{parse_u16, parse_u32, parse_u8},
-    traits::Parseable,
+    traits::{Parseable, ParseableParametrized},
     DecodeError,
 };
 
@@ -146,8 +146,13 @@ impl Nla for InfoIpTunnel {
     }
 }
 
-impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for InfoIpTunnel {
-    fn parse(buf: &NlaBuffer<&'a T>) -> Result<Self, DecodeError> {
+impl<'a, T: AsRef<[u8]> + ?Sized>
+    ParseableParametrized<NlaBuffer<&'a T>, super::InfoKind> for InfoIpTunnel
+{
+    fn parse_with_param(
+        buf: &NlaBuffer<&'a T>,
+        kind: super::InfoKind,
+    ) -> Result<Self, DecodeError> {
         use self::InfoIpTunnel::*;
         let payload = buf.value();
         Ok(match buf.kind() {
@@ -202,13 +207,26 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for InfoIpTunnel {
                 parse_u32(payload)
                     .context("invalid IFLA_IPTUN_FLOWINFO value")?,
             ),
-            IFLA_IPTUN_FLAGS => Flags(TunnelFlags::from_bits_retain(
-                parse_u32(payload).context("invalid IFLA_IPTUN_FLAGS value")?,
-            )),
-            IFLA_IPTUN_PROTO => Protocol(IpProtocol::from(
-                parse_u8(payload).context("invalid IFLA_IPTUN_PROTO value")?
-                    as i32,
-            )),
+            IFLA_IPTUN_FLAGS => match kind {
+                super::InfoKind::SitTun => {
+                    // Parse as u16 for SIT tunnels
+                    Flags(TunnelFlags::from_bits_retain(u32::from(
+                        parse_u16(payload).context(
+                            "invalid IFLA_IPTUN_FLAGS value for SIT",
+                        )?,
+                    )))
+                }
+                _ => {
+                    // Default: parse as u32 for other tunnel types
+                    Flags(TunnelFlags::from_bits_retain(
+                        parse_u32(payload)
+                            .context("invalid IFLA_IPTUN_FLAGS value")?,
+                    ))
+                }
+            },
+            IFLA_IPTUN_PROTO => Protocol(IpProtocol::from(i32::from(
+                parse_u8(payload).context("invalid IFLA_IPTUN_PROTO value")?,
+            ))),
             IFLA_IPTUN_PMTUDISC => PMtuDisc(
                 parse_u8(payload)
                     .context("invalid IFLA_IPTUN_PMTUDISC value")?