iptunnel: add support for ipip, ipip6 and ip6ip6 tunnels

All these tunnels use the IFLA_IPTUN_* netlink API. Therefore, both
IFLAN_INFO_KIND "ipip" and "ip6tnl" data is serialized using the
IpTunnel struct.

Unit tests added.

Co-authored-by: Fernando Fernandez Mancera <[email protected]>
Co-authored-by: Wen Liang <[email protected]>
Signed-off-by: Jan Vaclav <[email protected]>

Author: 3 people

src/link/link_info/info_data.rs

@@ -2,14 +2,14 @@
 
 use netlink_packet_core::{
     DecodeError, Emitable, ErrorContext, Nla, NlaBuffer, NlasIterator,
-    Parseable,
+    Parseable, ParseableParametrized,
 };
 
 use super::super::{
     InfoBond, InfoBridge, InfoGeneve, InfoGreTap, InfoGreTap6, InfoGreTun,
-    InfoGreTun6, InfoGtp, InfoHsr, InfoIpVlan, InfoIpVtap, InfoIpoib, InfoKind,
-    InfoMacSec, InfoMacVlan, InfoMacVtap, InfoSitTun, InfoTun, InfoVeth,
-    InfoVlan, InfoVrf, InfoVti, InfoVxlan, InfoXfrm,
+    InfoGreTun6, InfoGtp, InfoHsr, InfoIpTunnel, InfoIpVlan, InfoIpVtap,
+    InfoIpoib, InfoKind, InfoMacSec, InfoMacVlan, InfoMacVtap, InfoTun,
+    InfoVeth, InfoVlan, InfoVrf, InfoVti, InfoVxlan, InfoXfrm,
 };
 
 const IFLA_INFO_DATA: u16 = 2;
@@ -29,7 +29,7 @@ pub enum InfoData {
     MacVtap(Vec<InfoMacVtap>),
     GreTap(Vec<InfoGreTap>),
     GreTap6(Vec<InfoGreTap6>),
-    SitTun(Vec<InfoSitTun>),
+    SitTun(Vec<InfoIpTunnel>),
     GreTun(Vec<InfoGreTun>),
     GreTun6(Vec<InfoGreTun6>),
     Vti(Vec<InfoVti>),
@@ -40,6 +40,7 @@ pub enum InfoData {
     MacSec(Vec<InfoMacSec>),
     Hsr(Vec<InfoHsr>),
     Geneve(Vec<InfoGeneve>),
+    IpTunnel(Vec<InfoIpTunnel>),
     Other(Vec<u8>),
 }
 
@@ -69,6 +70,7 @@ impl Nla for InfoData {
             Self::Vti(nlas) => nlas.as_slice().buffer_len(),
             Self::Gtp(nlas) => nlas.as_slice().buffer_len(),
             Self::Geneve(nlas) => nlas.as_slice().buffer_len(),
+            Self::IpTunnel(nlas) => nlas.as_slice().buffer_len(),
             Self::Other(v) => v.len(),
         }
     }
@@ -98,6 +100,7 @@ impl Nla for InfoData {
             Self::Vti(nlas) => nlas.as_slice().emit(buffer),
             Self::Gtp(nlas) => nlas.as_slice().emit(buffer),
             Self::Geneve(nlas) => nlas.as_slice().emit(buffer),
+            Self::IpTunnel(nlas) => nlas.as_slice().emit(buffer),
             Self::Other(v) => buffer.copy_from_slice(v.as_slice()),
         }
     }
@@ -247,7 +250,8 @@ impl InfoData {
                     let nla = &nla.context(format!(
                         "invalid IFLA_INFO_DATA for {kind} {payload:?}"
                     ))?;
-                    let parsed = InfoSitTun::parse(nla)?;
+                    let parsed =
+                        InfoIpTunnel::parse_with_param(nla, kind.clone())?;
                     v.push(parsed);
                 }
                 InfoData::SitTun(v)
@@ -351,6 +355,18 @@ impl InfoData {
                 }
                 InfoData::Hsr(v)
             }
+            InfoKind::IpIp | InfoKind::Ip6Tnl => {
+                let mut v = Vec::new();
+                for nla in NlasIterator::new(payload) {
+                    let nla = &nla.context(format!(
+                        "invalid IFLA_INFO_DATA for {kind} {payload:?}"
+                    ))?;
+                    let parsed =
+                        InfoIpTunnel::parse_with_param(nla, kind.clone())?;
+                    v.push(parsed);
+                }
+                InfoData::IpTunnel(v)
+            }
             InfoKind::Geneve => {
                 let mut v = Vec::new();
                 for nla in NlasIterator::new(payload) {

src/link/link_info/infos.rs

@@ -29,6 +29,7 @@ const MACVTAP: &str = "macvtap";
 const GRETAP: &str = "gretap";
 const IP6GRETAP: &str = "ip6gretap";
 const IPIP: &str = "ipip";
+const IP6TNL: &str = "ip6tnl";
 const SIT: &str = "sit";
 const GRE: &str = "gre";
 const IP6GRE: &str = "ip6gre";
@@ -186,7 +187,8 @@ pub enum InfoKind {
     MacVtap,
     GreTap,
     GreTap6,
-    IpTun,
+    IpIp,
+    Ip6Tnl,
     SitTun,
     GreTun,
     GreTun6,
@@ -223,7 +225,8 @@ impl std::fmt::Display for InfoKind {
                 Self::MacVtap => MACVTAP,
                 Self::GreTap => GRETAP,
                 Self::GreTap6 => IP6GRETAP,
-                Self::IpTun => IPIP,
+                Self::IpIp => IPIP,
+                Self::Ip6Tnl => IP6TNL,
                 Self::SitTun => SIT,
                 Self::GreTun => GRE,
                 Self::GreTun6 => IP6GRE,
@@ -260,7 +263,8 @@ impl Nla for InfoKind {
             Self::MacVtap => MACVTAP.len(),
             Self::GreTap => GRETAP.len(),
             Self::GreTap6 => IP6GRETAP.len(),
-            Self::IpTun => IPIP.len(),
+            Self::IpIp => IPIP.len(),
+            Self::Ip6Tnl => IP6TNL.len(),
             Self::SitTun => SIT.len(),
             Self::GreTun => GRE.len(),
             Self::GreTun6 => IP6GRE.len(),
@@ -317,7 +321,8 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for InfoKind {
             MACVTAP => Self::MacVtap,
             GRETAP => Self::GreTap,
             IP6GRETAP => Self::GreTap6,
-            IPIP => Self::IpTun,
+            IPIP => Self::IpIp,
+            IP6TNL => Self::Ip6Tnl,
             SIT => Self::SitTun,
             GRE => Self::GreTun,
             IP6GRE => Self::GreTun6,