route: merge branch 'Cordell-O:main'

#372
thom311 · Feb 29, 2024 · 3646398 · 3646398
2 parents b76c3a5 + e21278e
commit 3646398
Show file tree

Hide file tree

Showing 7 changed files with 602 additions and 8 deletions.
diff --git a/include/netlink/route/link/bridge.h b/include/netlink/route/link/bridge.h
@@ -61,6 +61,7 @@ extern int	rtnl_link_bridge_set_flags(struct rtnl_link *, unsigned int);
 extern int	rtnl_link_bridge_get_flags(struct rtnl_link *);
 
 extern int	rtnl_link_bridge_set_self(struct rtnl_link *);
+extern int	rtnl_link_bridge_set_master(struct rtnl_link *);
 
 extern int	rtnl_link_bridge_get_hwmode(struct rtnl_link *, uint16_t *);
 extern int	rtnl_link_bridge_set_hwmode(struct rtnl_link *, uint16_t);
@@ -76,6 +77,10 @@ extern uint16_t rtnl_link_bridge_str2hwmode(const char *);
 
 extern int	rtnl_link_bridge_add(struct nl_sock *sk, const char *name);
 
+extern int	rtnl_link_bridge_enable_vlan(struct rtnl_link *link);
+extern int	rtnl_link_bridge_set_port_vlan_map_range (struct rtnl_link *link, uint16_t start, uint16_t end, int untagged);
+extern int	rtnl_link_bridge_unset_port_vlan_map_range (struct rtnl_link *link, uint16_t start, uint16_t end);
+extern int	rtnl_link_bridge_set_port_vlan_pvid (struct rtnl_link *link, uint16_t pvid);
 extern int	rtnl_link_bridge_pvid(struct rtnl_link *link);
 extern int	rtnl_link_bridge_has_vlan(struct rtnl_link *link);
 

diff --git a/include/netlink/route/link/bridge_info.h b/include/netlink/route/link/bridge_info.h
@@ -13,6 +13,11 @@
 extern "C" {
 #endif
 
+extern void rtnl_link_bridge_set_ageing_time(struct rtnl_link *link,
+					     uint32_t ageing_time);
+extern int rtnl_link_bridge_get_ageing_time(struct rtnl_link *link,
+					    uint32_t *ageing_time);
+
 extern void rtnl_link_bridge_set_vlan_filtering(struct rtnl_link *link,
 						uint8_t vlan_filtering);
 extern int rtnl_link_bridge_get_vlan_filtering(struct rtnl_link *link,
@@ -23,6 +28,11 @@ extern void rtnl_link_bridge_set_vlan_protocol(struct rtnl_link *link,
 extern int rtnl_link_bridge_get_vlan_protocol(struct rtnl_link *link,
 					      uint16_t *vlan_protocol);
 
+extern void rtnl_link_bridge_set_vlan_default_pvid(struct rtnl_link *link,
+						   uint16_t default_pvid);
+extern int rtnl_link_bridge_get_vlan_default_pvid(struct rtnl_link *link,
+						  uint16_t *default_pvid);
+
 extern void rtnl_link_bridge_set_vlan_stats_enabled(struct rtnl_link *link,
 						    uint8_t vlan_stats_enabled);
 extern int rtnl_link_bridge_get_vlan_stats_enabled(struct rtnl_link *link,

diff --git a/include/nl-priv-static-route/nl-priv-static-route.h b/include/nl-priv-static-route/nl-priv-static-route.h
@@ -3,6 +3,10 @@
 #ifndef NETLINK_ROUTE_UTILS_PRIV_H_
 #define NETLINK_ROUTE_UTILS_PRIV_H_
 
+#include <netlink/route/link/bridge.h>
+
 extern const uint8_t *const _nltst_map_stat_id_from_IPSTATS_MIB_v2;
+extern int _nl_bridge_fill_vlan_info(struct nl_msg *msg,
+				     struct rtnl_link_bridge_vlan *vlan_info);
 
 #endif