summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2024-05-17 17:03:53 +0200
committerThomas Haller <thaller@redhat.com>2024-05-17 17:52:52 +0200
commit45a10f9613f59fed9360935192ee6c34e74afeff (patch)
tree2ba7b76dd6ed69949c58cef77f75f2ebd735ef91
parent153f213b64532cc4b41cabf5f94925f36d692b20 (diff)
downloadlibnl-45a10f9613f59fed9360935192ee6c34e74afeff.tar.gz
route: move "struct rtnl_nexthop" to "nl-priv-dynamic-route"
rtnl_route_get_nexthops() returns the list of nexthops, but that is not usable without access to the rtnh_list field. We want to use that from tests. Move to another header (but still not public API).
-rw-r--r--include/nl-priv-dynamic-route/nl-priv-dynamic-route.h15
-rw-r--r--lib/route/nl-route.h15
2 files changed, 15 insertions, 15 deletions
diff --git a/include/nl-priv-dynamic-route/nl-priv-dynamic-route.h b/include/nl-priv-dynamic-route/nl-priv-dynamic-route.h
index c8168a3d..b6192a7a 100644
--- a/include/nl-priv-dynamic-route/nl-priv-dynamic-route.h
+++ b/include/nl-priv-dynamic-route/nl-priv-dynamic-route.h
@@ -93,4 +93,19 @@ extern struct rtnl_tc_ops *rtnl_tc_lookup_ops(enum rtnl_tc_type, const char *);
struct rtnl_tc_ops *rtnl_tc_get_ops(struct rtnl_tc *);
+struct rtnl_nexthop {
+ uint8_t rtnh_flags;
+ uint8_t rtnh_flag_mask;
+ uint8_t rtnh_weight;
+ /* 1 byte spare */
+ uint32_t rtnh_ifindex;
+ struct nl_addr *rtnh_gateway;
+ uint32_t ce_mask; /* HACK to support attr macros */
+ struct nl_list_head rtnh_list;
+ uint32_t rtnh_realms;
+ struct nl_addr *rtnh_newdst;
+ struct nl_addr *rtnh_via;
+ struct rtnl_nh_encap *rtnh_encap;
+};
+
#endif /* __NL_PRIVATE_TYPES_NL_ROUTE_H__ */
diff --git a/lib/route/nl-route.h b/lib/route/nl-route.h
index 28d01662..30ce442a 100644
--- a/lib/route/nl-route.h
+++ b/lib/route/nl-route.h
@@ -80,21 +80,6 @@ struct rtnl_nh_encap {
void *priv; /* private data for encap type */
};
-struct rtnl_nexthop {
- uint8_t rtnh_flags;
- uint8_t rtnh_flag_mask;
- uint8_t rtnh_weight;
- /* 1 byte spare */
- uint32_t rtnh_ifindex;
- struct nl_addr *rtnh_gateway;
- uint32_t ce_mask; /* HACK to support attr macros */
- struct nl_list_head rtnh_list;
- uint32_t rtnh_realms;
- struct nl_addr *rtnh_newdst;
- struct nl_addr *rtnh_via;
- struct rtnl_nh_encap *rtnh_encap;
-};
-
struct rtnl_ratespec {
uint64_t rs_rate64;
uint16_t rs_overhead;