Remove LinkHeader::LinkFlags and add two constants to RouteHeader

src/link/header.rs

@@ -7,7 +7,7 @@ use netlink_packet_utils::{
 };
 
 use crate::{
-    link::{LinkFlag, LinkFlags, LinkLayerType},
+    link::{link_flag::VecLinkFlag, LinkFlag, LinkLayerType},
     AddressFamily,
 };
 
@@ -67,13 +67,12 @@ pub struct LinkHeader {
     /// State of the link, described by a combinations of `IFF_*`
     /// constants, for instance `vec![LinkFlag::Up, LinkFlag::LowerUp]`.
     /// To convert `Vec<LinkFlag>` into `u32`, you may:
-    ///  `u32::from(&LinkFlags(Vec<LinkFlag>)`
+    ///  `u32::from(&VecLinkFlag(Vec<LinkFlag>)`
     /// To convert `u32` to `Vec<LinkFlag>`, you may:
-    ///  `LinkFlags::from(u32).0`
+    ///  `VecLinkFlag::from(u32).0`
     pub flags: Vec<LinkFlag>,
-    /// Change mask for the `flags` field. Reserved, it should be set
-    /// to u32::MAX or 0(equal to u32::MAX for backwards compatibility).
-    pub change_mask: u32,
+    /// Change mask for the `flags` field.
+    pub change_mask: Vec<LinkFlag>,
 }
 
 impl Emitable for LinkHeader {
@@ -85,9 +84,11 @@ impl Emitable for LinkHeader {
         let mut packet = LinkMessageBuffer::new(buffer);
         packet.set_interface_family(u8::from(self.interface_family));
         packet.set_link_index(self.index);
-        packet.set_change_mask(self.change_mask);
+        packet.set_change_mask(u32::from(&VecLinkFlag(
+            self.change_mask.to_vec(),
+        )));
         packet.set_link_layer_type(u16::from(self.link_layer_type));
-        packet.set_flags(u32::from(&LinkFlags(self.flags.to_vec())));
+        packet.set_flags(u32::from(&VecLinkFlag(self.flags.to_vec())));
     }
 }
 
@@ -97,8 +98,8 @@ impl<T: AsRef<[u8]>> Parseable<LinkMessageBuffer<T>> for LinkHeader {
             interface_family: buf.interface_family().into(),
             link_layer_type: buf.link_layer_type().into(),
             index: buf.link_index(),
-            change_mask: buf.change_mask(),
-            flags: LinkFlags::from(buf.flags()).0,
+            change_mask: VecLinkFlag::from(buf.change_mask()).0,
+            flags: VecLinkFlag::from(buf.flags()).0,
         })
     }
 }

src/link/link_flag.rs

@@ -23,7 +23,7 @@ const IFF_DORMANT: u32 = 1 << 17;
 const IFF_ECHO: u32 = 1 << 18;
 
 #[derive(Debug, PartialEq, Eq, Clone, Default)]
-pub struct LinkFlags(pub Vec<LinkFlag>);
+pub(crate) struct VecLinkFlag(pub Vec<LinkFlag>);
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
 #[non_exhaustive]
@@ -155,7 +155,7 @@ const ALL_LINK_FLAGS: [LinkFlag; 19] = [
     LinkFlag::Up,
 ];
 
-impl From<u32> for LinkFlags {
+impl From<u32> for VecLinkFlag {
     fn from(d: u32) -> Self {
         let mut got: u32 = 0;
         let mut ret = Vec::new();
@@ -172,8 +172,8 @@ impl From<u32> for LinkFlags {
     }
 }
 
-impl From<&LinkFlags> for u32 {
-    fn from(v: &LinkFlags) -> u32 {
+impl From<&VecLinkFlag> for u32 {
+    fn from(v: &VecLinkFlag) -> u32 {
         let mut d: u32 = 0;
         for flag in &v.0 {
             d += u32::from(*flag);

src/link/mod.rs

@@ -6,7 +6,7 @@ mod buffer_tool;
 mod down_reason;
 mod event;
 mod header;
-mod link_flag;
+pub(crate) mod link_flag;
 mod link_info;
 mod link_layer_type;
 mod link_state;
@@ -34,7 +34,7 @@ pub use self::attribute::LinkAttribute;
 pub use self::down_reason::LinkProtocolDownReason;
 pub use self::event::LinkEvent;
 pub use self::header::{LinkHeader, LinkMessageBuffer};
-pub use self::link_flag::{LinkFlag, LinkFlags};
+pub use self::link_flag::LinkFlag;
 pub use self::link_info::{
     BondAdInfo, BondPortState, BridgeQuerierState, HsrProtocol, InfoBond,
     InfoBondPort, InfoBridge, InfoData, InfoGreTap, InfoGreTap6, InfoGreTun,

src/link/tests/bond.rs

@@ -52,7 +52,7 @@ fn test_bond_link_info() {
                 LinkFlag::Running,
                 LinkFlag::Up,
             ],
-            change_mask: 0,
+            change_mask: vec![],
         },
         attributes: vec![LinkAttribute::LinkInfo(vec![
             LinkInfo::Kind(InfoKind::Bond),
@@ -123,7 +123,7 @@ fn test_bond_port_link_info() {
                 LinkFlag::Running,
                 LinkFlag::Up,
             ],
-            change_mask: 0,
+            change_mask: vec![],
         },
         attributes: vec![LinkAttribute::LinkInfo(vec![
             LinkInfo::Kind(InfoKind::Veth),

src/link/tests/bridge.rs

@@ -152,7 +152,7 @@ fn test_parse_link_bridge_no_extention_mask() {
                 LinkFlag::Running,
                 LinkFlag::Up,
             ],
-            change_mask: 0,
+            change_mask: vec![],
         },
         attributes: vec![
             LinkAttribute::IfName("br0".into()),

src/link/tests/hsr.rs

@@ -32,7 +32,7 @@ fn test_parsing_link_hsr() {
                 LinkFlag::Running,
                 LinkFlag::Up,
             ],
-            change_mask: 0,
+            change_mask: vec![],
         },
         attributes: vec![LinkAttribute::LinkInfo(vec![
             LinkInfo::Kind(InfoKind::Hsr),

src/link/tests/ipvlan.rs

@@ -24,7 +24,7 @@ fn test_ipvlan_link_info() {
             index: 18,
             link_layer_type: LinkLayerType::Ether,
             flags: vec![LinkFlag::Broadcast, LinkFlag::Multicast],
-            change_mask: 0,
+            change_mask: vec![],
         },
         attributes: vec![LinkAttribute::LinkInfo(vec![
             LinkInfo::Kind(InfoKind::IpVlan),

src/link/tests/macsec.rs

@@ -38,7 +38,7 @@ fn test_macsec_link_info() {
                 LinkFlag::Running,
                 LinkFlag::Up,
             ],
-            change_mask: 0,
+            change_mask: vec![],
         },
         attributes: vec![LinkAttribute::LinkInfo(vec![
             LinkInfo::Kind(InfoKind::MacSec),

src/link/tests/macvlan.rs

@@ -34,7 +34,7 @@ fn test_macvlan_link_info() {
                 LinkFlag::Running,
                 LinkFlag::Up,
             ],
-            change_mask: 0,
+            change_mask: vec![],
         },
         attributes: vec![LinkAttribute::LinkInfo(vec![
             LinkInfo::Kind(InfoKind::MacVlan),

src/link/tests/message.rs

@@ -3,7 +3,7 @@
 use netlink_packet_utils::traits::{Emitable, ParseableParametrized};
 
 use crate::link::{
-    LinkAttribute, LinkFlag, LinkFlags, LinkHeader, LinkLayerType, LinkMessage,
+    LinkAttribute, LinkFlag, LinkHeader, LinkLayerType, LinkMessage,
     LinkMessageBuffer, State,
 };
 use crate::AddressFamily;
@@ -44,13 +44,11 @@ fn link_message_packet_header_read() {
     assert_eq!(packet.link_layer_type(), LinkLayerType::Loopback.into());
     assert_eq!(packet.link_index(), 1);
     assert_eq!(
-        LinkFlags::from(packet.flags()).0,
-        vec![
-            LinkFlag::Loopback,
-            LinkFlag::LowerUp,
-            LinkFlag::Running,
-            LinkFlag::Up,
-        ]
+        packet.flags(),
+        u32::from(LinkFlag::Loopback)
+            | u32::from(LinkFlag::LowerUp)
+            | u32::from(LinkFlag::Running)
+            | u32::from(LinkFlag::Up)
     );
     assert_eq!(packet.change_mask(), 0);
 }
@@ -64,12 +62,12 @@ fn link_message_packet_header_build() {
         packet.set_reserved_1(0);
         packet.set_link_layer_type(LinkLayerType::Loopback.into());
         packet.set_link_index(1);
-        packet.set_flags(u32::from(&LinkFlags(vec![
-            LinkFlag::Loopback,
-            LinkFlag::LowerUp,
-            LinkFlag::Running,
-            LinkFlag::Up,
-        ])));
+        packet.set_flags(
+            u32::from(LinkFlag::Loopback)
+                | u32::from(LinkFlag::LowerUp)
+                | u32::from(LinkFlag::Running)
+                | u32::from(LinkFlag::Up),
+        );
         packet.set_change_mask(0);
     }
     assert_eq!(&buf[..], &LINK_MSG[0..16]);

src/link/tests/prop_list.rs

@@ -31,7 +31,7 @@ fn test_wlan0_with_prop_altname() {
                 LinkFlag::Running,
                 LinkFlag::Up,
             ],
-            change_mask: 0,
+            change_mask: vec![],
         },
         attributes: vec![LinkAttribute::PropList(vec![
             Prop::AltIfName("wlp0s20f3".to_string()),

src/link/tests/veth.rs

@@ -36,7 +36,7 @@ fn test_veth_get_link_info() {
                 LinkFlag::Running,
                 LinkFlag::Up,
             ],
-            change_mask: 0,
+            change_mask: vec![],
         },
         attributes: vec![LinkAttribute::LinkInfo(vec![LinkInfo::Kind(
             InfoKind::Veth,

src/link/tests/vlan.rs

@@ -60,7 +60,7 @@ fn test_parsing_link_vlan() {
                 LinkFlag::Running,
                 LinkFlag::Up,
             ],
-            change_mask: 0,
+            change_mask: vec![],
         },
         attributes: vec![LinkAttribute::LinkInfo(vec![
             LinkInfo::Kind(InfoKind::Vlan),

src/link/tests/vrf.rs

@@ -29,7 +29,7 @@ fn test_parsing_link_vrf() {
                 LinkFlag::Running,
                 LinkFlag::Up,
             ],
-            change_mask: 0,
+            change_mask: vec![],
         },
         attributes: vec![LinkAttribute::LinkInfo(vec![
             LinkInfo::Kind(InfoKind::Vrf),

src/link/tests/vxlan.rs

@@ -132,7 +132,7 @@ fn test_parsing_link_vxlan() {
                 LinkFlag::Running,
                 LinkFlag::Up,
             ],
-            change_mask: 0,
+            change_mask: vec![],
         },
         attributes: vec![
             LinkAttribute::IfName("vxlan0".into()),

src/link/tests/xfrm.rs

@@ -29,7 +29,7 @@ fn test_parsing_link_xfrm() {
                 LinkFlag::Running,
                 LinkFlag::Up,
             ],
-            change_mask: 0,
+            change_mask: vec![],
         },
         attributes: vec![LinkAttribute::LinkInfo(vec![
             LinkInfo::Kind(InfoKind::Xfrm),

src/route/header.rs

@@ -56,6 +56,11 @@ pub struct RouteHeader {
     pub flags: Vec<RouteFlag>,
 }
 
+impl RouteHeader {
+    pub const RT_TABLE_MAIN: u8 = 254;
+    pub const RT_TABLE_UNSPEC: u8 = 0;
+}
+
 impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<RouteMessageBuffer<&'a T>>
     for RouteHeader
 {