Add enum entries to InfoGreTun and InfoGreTun6

Signed-off-by: Julius Rüberg <[email protected]>

Author: Toorero

src/link/link_info/gre.rs

@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: MIT
+
+use std::fmt::Display;
+
+const GRE_CSUM: u16 = 0x8000;
+const GRE_ROUTING: u16 = 0x4000;
+const GRE_KEY: u16 = 0x2000;
+const GRE_SEQ: u16 = 0x1000;
+const GRE_STRICT: u16 = 0x0800;
+const GRE_REC: u16 = 0x0700;
+const GRE_ACK: u16 = 0x0080;
+const GRE_FLAGS: u16 = 0x0078;
+const GRE_VERSION: u16 = 0x0007;
+
+const TUNNEL_ENCAP_FLAG_CSUM: u16 = 0x0100;
+const TUNNEL_ENCAP_FLAG_CSUM6: u16 = 0x0200;
+const TUNNEL_ENCAP_FLAG_REMCSUM: u16 = 0x0400;
+
+bitflags! {
+    #[derive(Clone, Eq, PartialEq, Debug, Copy, Default)]
+    #[non_exhaustive]
+    pub struct GreIOFlags: u16 {
+        const Checksum = GRE_CSUM;
+        const Routing = GRE_ROUTING;
+        const Key = GRE_KEY;
+        const Seq = GRE_SEQ;
+        const Strict0 = GRE_STRICT;
+        const Rec = GRE_REC;
+        const Ack = GRE_ACK;
+        const Flags = GRE_FLAGS;
+        const Version = GRE_VERSION;
+
+        const _ = !0;
+    }
+
+    #[derive(Clone, Eq, PartialEq, Debug, Copy, Default)]
+    #[non_exhaustive]
+    pub struct GreEncapFlags: u16 {
+        const Checksum = TUNNEL_ENCAP_FLAG_CSUM;
+        const Checksum6 = TUNNEL_ENCAP_FLAG_CSUM6;
+        const RemoteChecksum = TUNNEL_ENCAP_FLAG_REMCSUM;
+
+        const _ = !0;
+    }
+}
+
+const TUNNEL_ENCAP_NONE: u16 = 0;
+const TUNNEL_ENCAP_FOU: u16 = 1;
+const TUNNEL_ENCAP_GUE: u16 = 2;
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy, Default)]
+#[non_exhaustive]
+pub enum GreEncapType {
+    #[default]
+    None,
+    Fou,
+    Gue,
+    Other(u16),
+}
+impl From<u16> for GreEncapType {
+    fn from(d: u16) -> Self {
+        match d {
+            TUNNEL_ENCAP_NONE => GreEncapType::None,
+            TUNNEL_ENCAP_FOU => GreEncapType::Fou,
+            TUNNEL_ENCAP_GUE => GreEncapType::Gue,
+            _ => Self::Other(d),
+        }
+    }
+}
+impl From<&GreEncapType> for u16 {
+    fn from(t: &GreEncapType) -> Self {
+        match t {
+            GreEncapType::None => TUNNEL_ENCAP_NONE,
+            GreEncapType::Fou => TUNNEL_ENCAP_FOU,
+            GreEncapType::Gue => TUNNEL_ENCAP_GUE,
+            GreEncapType::Other(d) => *d,
+        }
+    }
+}
+
+impl Display for GreEncapType {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            GreEncapType::None => write!(f, "none"),
+            GreEncapType::Fou => write!(f, "fou"),
+            GreEncapType::Gue => write!(f, "gue"),
+            GreEncapType::Other(d) => write!(f, "other({d})"),
+        }
+    }
+}
+
+pub(super) const IFLA_GRE_LINK: u16 = 1;
+pub(super) const IFLA_GRE_IFLAGS: u16 = 2;
+pub(super) const IFLA_GRE_OFLAGS: u16 = 3;
+pub(super) const IFLA_GRE_IKEY: u16 = 4;
+pub(super) const IFLA_GRE_OKEY: u16 = 5;
+pub(super) const IFLA_GRE_LOCAL: u16 = 6;
+pub(super) const IFLA_GRE_REMOTE: u16 = 7;
+pub(super) const IFLA_GRE_TTL: u16 = 8;
+pub(super) const IFLA_GRE_TOS: u16 = 9;
+pub(super) const IFLA_GRE_PMTUDISC: u16 = 10;
+pub(super) const IFLA_GRE_ENCAP_LIMIT: u16 = 11;
+pub(super) const IFLA_GRE_FLOWINFO: u16 = 12;
+pub(super) const IFLA_GRE_FLAGS: u16 = 13;
+pub(super) const IFLA_GRE_ENCAP_TYPE: u16 = 14;
+pub(super) const IFLA_GRE_ENCAP_FLAGS: u16 = 15;
+pub(super) const IFLA_GRE_ENCAP_SPORT: u16 = 16;
+pub(super) const IFLA_GRE_ENCAP_DPORT: u16 = 17;
+pub(super) const IFLA_GRE_COLLECT_METADATA: u16 = 18;
+pub(super) const IFLA_GRE_FWMARK: u16 = 20;

src/link/link_info/gre/gre_common.rs

@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: MIT
+
+mod gre_common;
+pub mod info_gre;
+pub mod info_gre6;
+
+pub use self::gre_common::{GreEncapFlags, GreEncapType, GreIOFlags};
+pub use self::info_gre::InfoGre;
+pub use self::info_gre6::InfoGre6;

src/link/link_info/gre/mod.rs

@@ -8,10 +8,10 @@ use netlink_packet_utils::{
 };
 
 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,
+    InfoBond, InfoBridge, InfoGeneve, InfoGre, InfoGre6, InfoGtp, InfoHsr,
+    InfoIpVlan, InfoIpVtap, InfoIpoib, InfoKind, InfoMacSec, InfoMacVlan,
+    InfoMacVtap, InfoSitTun, InfoTun, InfoVeth, InfoVlan, InfoVrf, InfoVti,
+    InfoVxlan, InfoXfrm,
 };
 
 const IFLA_INFO_DATA: u16 = 2;
@@ -29,11 +29,11 @@ pub enum InfoData {
     IpVtap(Vec<InfoIpVtap>),
     MacVlan(Vec<InfoMacVlan>),
     MacVtap(Vec<InfoMacVtap>),
-    GreTap(Vec<InfoGreTap>),
-    GreTap6(Vec<InfoGreTap6>),
+    GreTap(Vec<InfoGre>),
+    GreTap6(Vec<InfoGre6>),
     SitTun(Vec<InfoSitTun>),
-    GreTun(Vec<InfoGreTun>),
-    GreTun6(Vec<InfoGreTun6>),
+    GreTun(Vec<InfoGre>),
+    GreTun6(Vec<InfoGre6>),
     Vti(Vec<InfoVti>),
     Vrf(Vec<InfoVrf>),
     Gtp(Vec<InfoGtp>),
@@ -227,7 +227,7 @@ impl InfoData {
                     let nla = &nla.context(format!(
                         "invalid IFLA_INFO_DATA for {kind} {payload:?}"
                     ))?;
-                    let parsed = InfoGreTap::parse(nla)?;
+                    let parsed = InfoGre::parse(nla)?;
                     v.push(parsed);
                 }
                 InfoData::GreTap(v)
@@ -238,7 +238,7 @@ impl InfoData {
                     let nla = &nla.context(format!(
                         "invalid IFLA_INFO_DATA for {kind} {payload:?}"
                     ))?;
-                    let parsed = InfoGreTap6::parse(nla)?;
+                    let parsed = InfoGre6::parse(nla)?;
                     v.push(parsed);
                 }
                 InfoData::GreTap6(v)
@@ -260,7 +260,7 @@ impl InfoData {
                     let nla = &nla.context(format!(
                         "invalid IFLA_INFO_DATA for {kind} {payload:?}"
                     ))?;
-                    let parsed = InfoGreTun::parse(nla)?;
+                    let parsed = InfoGre::parse(nla)?;
                     v.push(parsed);
                 }
                 InfoData::GreTun(v)
@@ -271,7 +271,7 @@ impl InfoData {
                     let nla = &nla.context(format!(
                         "invalid IFLA_INFO_DATA for {kind} {payload:?}"
                     ))?;
-                    let parsed = InfoGreTun6::parse(nla)?;
+                    let parsed = InfoGre6::parse(nla)?;
                     v.push(parsed);
                 }
                 InfoData::GreTun6(v)

src/link/link_info/gre6.rs

@@ -6,9 +6,6 @@ mod bridge;
 mod bridge_port;
 mod geneve;
 mod gre;
-mod gre6;
-mod gre_tap;
-mod gre_tap6;
 mod gtp;
 mod hsr;
 mod info_data;
@@ -40,10 +37,9 @@ pub use self::bridge_port::{
     BridgePortMulticastRouter, BridgePortState, InfoBridgePort,
 };
 pub use self::geneve::{GeneveDf, InfoGeneve};
-pub use self::gre::InfoGreTun;
-pub use self::gre6::InfoGreTun6;
-pub use self::gre_tap::InfoGreTap;
-pub use self::gre_tap6::InfoGreTap6;
+pub use self::gre::{
+    GreEncapFlags, GreEncapType, GreIOFlags, InfoGre, InfoGre6,
+};
 pub use self::gtp::InfoGtp;
 pub use self::hsr::{HsrProtocol, InfoHsr};
 pub use self::info_data::InfoData;