Support tc flower mpls matches

Author: daniel-noland

src/tc/filters/cls_flower.rs

@@ -149,6 +149,8 @@ pub enum EthType {
     Arp = 0x0806,
     Vlan = 0x8100,
     Qinq = 0x88A8,
+    MplsUnicast = 0x8847,
+    MplsMulticast = 0x8848,
     Other(u16),
 }
 
@@ -160,6 +162,8 @@ impl EthType {
             EthType::Arp => 0x0806,
             EthType::Vlan => 0x8100,
             EthType::Qinq => 0x88A8,
+            EthType::MplsUnicast => 0x8847,
+            EthType::MplsMulticast => 0x8848,
             EthType::Other(val) => *val,
         }
     }
@@ -175,6 +179,8 @@ impl From<u16> for EthType {
             0x0800 => Self::IPv4,
             0x86DD => Self::IPv6,
             0x0806 => Self::Arp,
+            0x8847 => Self::MplsUnicast,
+            0x8848 => Self::MplsMulticast,
             _ => Self::Other(val),
         }
     }
@@ -188,6 +194,8 @@ impl From<EthType> for u16 {
             EthType::Arp => 0x0806,
             EthType::Vlan => 0x8100,
             EthType::Qinq => 0x88A8,
+            EthType::MplsUnicast => 0x8847,
+            EthType::MplsMulticast => 0x8848,
             EthType::Other(val) => val,
         }
     }
@@ -196,6 +204,10 @@ impl From<EthType> for u16 {
 pub type TcpPort = u16;
 pub type UdpPort = u16;
 pub type SctpPort = u16;
+pub type MplsTtl = u8;
+pub type MplsBos = u8;
+pub type MplsTc = u8;
+pub type MplsLabel = u32;
 
 // Lists sourced from https://www.iana.org/assignments/icmp-parameters/icmp-parameters.xhtml
 pub mod icmpv4 {
@@ -1333,6 +1345,10 @@ pub enum TcFilterFlowerOption {
     KeyArpShaMask(arp::ShaMask),
     KeyArpTha(arp::Tha),
     KeyArpThaMask(arp::ThaMask),
+    KeyMplsTtl(MplsTtl),
+    KeyMplsBos(MplsBos),
+    KeyMplsTc(MplsTc),
+    KeyMplsLabel(MplsLabel),
 }
 
 impl Nla for TcFilterFlowerOption {
@@ -1402,6 +1418,10 @@ impl Nla for TcFilterFlowerOption {
             Self::KeyArpShaMask(_) => 6,
             Self::KeyArpTha(_) => 6,
             Self::KeyArpThaMask(_) => 6,
+            Self::KeyMplsTtl(_) => 1,
+            Self::KeyMplsBos(_) => 1,
+            Self::KeyMplsTc(_) => 1,
+            Self::KeyMplsLabel(_) => 4,
             Self::Other(attr) => attr.value_len(),
         }
     }
@@ -1476,6 +1496,10 @@ impl Nla for TcFilterFlowerOption {
             Self::KeyArpShaMask(_) => TCA_FLOWER_KEY_ARP_SHA_MASK,
             Self::KeyArpTha(_) => TCA_FLOWER_KEY_ARP_THA,
             Self::KeyArpThaMask(_) => TCA_FLOWER_KEY_ARP_THA_MASK,
+            Self::KeyMplsTtl(_) => TCA_FLOWER_KEY_MPLS_TTL,
+            Self::KeyMplsBos(_) => TCA_FLOWER_KEY_MPLS_BOS,
+            Self::KeyMplsTc(_) => TCA_FLOWER_KEY_MPLS_TC,
+            Self::KeyMplsLabel(_) => TCA_FLOWER_KEY_MPLS_LABEL,
             Self::Other(attr) => attr.kind(),
         }
     }
@@ -1607,6 +1631,20 @@ impl Nla for TcFilterFlowerOption {
             Self::KeyArpShaMask(k) => buffer.copy_from_slice(k.as_slice()),
             Self::KeyArpTha(k) => buffer.copy_from_slice(k.as_slice()),
             Self::KeyArpThaMask(k) => buffer.copy_from_slice(k.as_slice()),
+            Self::KeyMplsTtl(ttl) => {
+                buffer.copy_from_slice(ttl.to_be_bytes().as_slice())
+            }
+            Self::KeyMplsBos(bos) => {
+                buffer.copy_from_slice(bos.to_be_bytes().as_slice())
+            }
+            Self::KeyMplsTc(tc) => {
+                buffer.copy_from_slice(tc.to_be_bytes().as_slice())
+            }
+            Self::KeyMplsLabel(label) => {
+                // TODO: I don't know why the yaml says this should be big endian
+                // but nothing works unless it's native endian.  Bug report?
+                buffer.copy_from_slice(label.to_ne_bytes().as_slice())
+            }
             Self::Other(attr) => attr.emit_value(buffer),
         }
     }
@@ -2167,6 +2205,31 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
                     Err(e) => return Err(e),
                 }
             }
+            TCA_FLOWER_KEY_MPLS_TTL => {
+                if payload.len() != 1 {
+                    return Err(DecodeError::from("invalid mpls ttl length"));
+                }
+                Self::KeyMplsTtl(payload[0])
+            }
+            TCA_FLOWER_KEY_MPLS_BOS => {
+                if payload.len() != 1 {
+                    return Err(DecodeError::from("invalid mpls bos length"));
+                }
+                Self::KeyMplsBos(payload[0])
+            }
+            TCA_FLOWER_KEY_MPLS_TC => {
+                if payload.len() != 1 {
+                    return Err(DecodeError::from("invalid mpls tc length"));
+                }
+                Self::KeyMplsTc(payload[0])
+            }
+            TCA_FLOWER_KEY_MPLS_LABEL => {
+                if payload.len() != 4 {
+                    return Err(DecodeError::from("invalid mpls label length"));
+                }
+                let label = BigEndian::read_u32(payload);
+                Self::KeyMplsLabel(label)
+            }
             _ => Self::Other(
                 DefaultNla::parse(buf).context("failed to parse flower nla")?,
             ),