include: split and drop "netlink-private/types.h"

Move all the declarations from "netlink-private/types.h" to places
closer to where they are used.

6 files changed, 131 insertions, 1469 deletions

diff --git a/include/netlink-private/netlink.h b/include/netlink-private/netlink.h
index 3019bed..6c02274 100644
--- a/include/netlink-private/netlink.h
+++ b/include/netlink-private/netlink.h
@@ -58,7 +58,6 @@
 #include <netlink/handlers.h>
 #include <netlink/cache.h>
 #include <netlink/route/tc.h>
-#include <netlink-private/types.h>
 
 #include "nl-priv-dynamic-core/cache-api.h"
 #include "nl-aux-core/nl-core.h"
@@ -133,16 +132,6 @@ extern int __str2flags(const char *, const struct trans_tbl *, size_t);
 extern void dump_from_ops(struct nl_object *, struct nl_dump_params *);
 extern struct rtnl_link *link_lookup(struct nl_cache *cache, int ifindex);
 
-static inline int nl_cb_call(struct nl_cb *cb, enum nl_cb_type type, struct nl_msg *msg)
-{
-	int ret;
-
-	cb->cb_active = type;
-	ret = cb->cb_set[type](msg, cb->cb_args[type]);
-	cb->cb_active = __NL_CB_TYPE_MAX;
-	return ret;
-}
-
 #define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0]))
 
 /* This is also defined in stddef.h */
@@ -154,45 +143,12 @@ extern int nl_cache_parse(struct nl_cache_ops *, struct sockaddr_nl *,
 			  struct nlmsghdr *, struct nl_parser_param *);
 
 
-static inline void rtnl_copy_ratespec(struct rtnl_ratespec *dst,
-				      struct tc_ratespec *src)
-{
-	dst->rs_cell_log = src->cell_log;
-	dst->rs_overhead = src->overhead;
-	dst->rs_cell_align = src->cell_align;
-	dst->rs_mpu = src->mpu;
-	dst->rs_rate64 = src->rate;
-}
-
-static inline void rtnl_rcopy_ratespec(struct tc_ratespec *dst,
-				       struct rtnl_ratespec *src)
-{
-	dst->cell_log = src->rs_cell_log;
-	dst->overhead = src->rs_overhead;
-	dst->cell_align = src->rs_cell_align;
-	dst->mpu = src->rs_mpu;
-	dst->rate = src->rs_rate64 > 0xFFFFFFFFull ? 0xFFFFFFFFull : (uint32_t) src->rs_rate64;
-}
-
-static inline const char *nl_cache_name(struct nl_cache *cache)
-{
-	return cache->c_ops ? cache->c_ops->co_name : "unknown";
-}
-
 #define GENL_FAMILY(id, name) \
 	{ \
 		{ id, NL_ACT_UNSPEC, name }, \
 		END_OF_MSGTYPES_LIST, \
 	}
 
-static inline int wait_for_ack(struct nl_sock *sk)
-{
-	if (sk->s_flags & NL_NO_AUTO_ACK)
-		return 0;
-	else
-		return nl_wait_for_ack(sk);
-}
-
 static inline int build_sysconf_path(char **strp, const char *filename)
 {
 	char *sysconfdir;
diff --git a/include/netlink-private/types.h b/include/netlink-private/types.h
deleted file mode 100644
index 0d63913..0000000
--- a/include/netlink-private/types.h
+++ /dev/null
@@ -1,1411 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-only */
-/*
- * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
- * Copyright (c) 2013 Sassano Systems LLC <joe@sassanosystems.com>
- */
-
-#ifndef NETLINK_LOCAL_TYPES_H_
-#define NETLINK_LOCAL_TYPES_H_
-
-#include <netlink/list.h>
-#include <netlink/route/link.h>
-#include <netlink/route/qdisc.h>
-#include <netlink/route/rtnl.h>
-#include <netlink/route/route.h>
-#include <netlink/idiag/idiagnl.h>
-#include <netlink/netfilter/ct.h>
-#include <netlink/route/link/sriov.h>
-#include <netlink/route/nh.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-#include <linux/genetlink.h>
-#include <linux/tc_act/tc_mirred.h>
-#include <linux/tc_act/tc_skbedit.h>
-#include <linux/tc_act/tc_gact.h>
-#include <linux/tc_act/tc_vlan.h>
-#include <linux/sock_diag.h>
-#include <linux/fib_rules.h>
-#include <linux/if_ether.h>
-
-#include <netinet/in.h>
-
-#include "nl-priv-dynamic-core/object-api.h"
-
-#define NL_SOCK_PASSCRED	(1<<1)
-#define NL_OWN_PORT		(1<<2)
-#define NL_MSG_PEEK		(1<<3)
-#define NL_MSG_PEEK_EXPLICIT	(1<<4)
-#define NL_NO_AUTO_ACK		(1<<5)
-
-#define NL_MSG_CRED_PRESENT 1
-
-struct nl_cache_ops;
-struct nl_sock;
-struct nl_object;
-struct nl_hash_table;
-struct nl_vf_vlans;
-
-struct nl_cb
-{
-	nl_recvmsg_msg_cb_t	cb_set[NL_CB_TYPE_MAX+1];
-	void *			cb_args[NL_CB_TYPE_MAX+1];
-
-	nl_recvmsg_err_cb_t	cb_err;
-	void *			cb_err_arg;
-
-	/** May be used to replace nl_recvmsgs with your own implementation
-	 * in all internal calls to nl_recvmsgs. */
-	int			(*cb_recvmsgs_ow)(struct nl_sock *,
-						  struct nl_cb *);
-
-	/** Overwrite internal calls to nl_recv, must return the number of
-	 * octets read and allocate a buffer for the received data. */
-	int			(*cb_recv_ow)(struct nl_sock *,
-					      struct sockaddr_nl *,
-					      unsigned char **,
-					      struct ucred **);
-
-	/** Overwrites internal calls to nl_send, must send the netlink
-	 * message. */
-	int			(*cb_send_ow)(struct nl_sock *,
-					      struct nl_msg *);
-
-	int			cb_refcnt;
-	/** indicates the callback that is currently active */
-	enum nl_cb_type		cb_active;
-};
-
-struct nl_sock
-{
-	struct sockaddr_nl	s_local;
-	struct sockaddr_nl	s_peer;
-	int			s_fd;
-	int			s_proto;
-	unsigned int		s_seq_next;
-	unsigned int		s_seq_expect;
-	int			s_flags;
-	struct nl_cb *		s_cb;
-	size_t			s_bufsize;
-};
-
-struct nl_cache
-{
-	struct nl_list_head	c_items;
-	int			c_nitems;
-	int                     c_iarg1;
-	int                     c_iarg2;
-	int			c_refcnt;
-	unsigned int		c_flags;
-	struct nl_hash_table *	hashtable;
-	struct nl_cache_ops *   c_ops;
-};
-
-struct nl_cache_assoc
-{
-	struct nl_cache *	ca_cache;
-	change_func_t		ca_change;
-	change_func_v2_t	ca_change_v2;
-	void *			ca_change_data;
-};
-
-struct nl_cache_mngr
-{
-	int			cm_protocol;
-	int			cm_flags;
-	int			cm_nassocs;
-	struct nl_sock *	cm_sock;
-	struct nl_sock *	cm_sync_sock;
-	struct nl_cache_assoc *	cm_assocs;
-};
-
-struct nl_parser_param;
-
-#define LOOSE_COMPARISON	1
-#define ID_COMPARISON           2
-
-#define NL_OBJ_MARK		1
-
-struct nl_data
-{
-	size_t			d_size;
-	void *			d_data;
-};
-
-struct nl_addr
-{
-	int			a_family;
-	unsigned int		a_maxsize;
-	unsigned int		a_len;
-	int			a_prefixlen;
-	int			a_refcnt;
-	char			a_addr[0];
-};
-
-struct nl_msg
-{
-	int			nm_protocol;
-	int			nm_flags;
-	struct sockaddr_nl	nm_src;
-	struct sockaddr_nl	nm_dst;
-	struct ucred		nm_creds;
-	struct nlmsghdr *	nm_nlh;
-	size_t			nm_size;
-	int			nm_refcnt;
-};
-
-struct rtnl_link_map
-{
-	uint64_t lm_mem_start;
-	uint64_t lm_mem_end;
-	uint64_t lm_base_addr;
-	uint16_t lm_irq;
-	uint8_t  lm_dma;
-	uint8_t  lm_port;
-};
-
-struct rtnl_link_vf
-{
-	struct nl_list_head	vf_list;
-	int			ce_refcnt;
-	uint32_t		ce_mask;
-	uint32_t		vf_index;
-	uint64_t		vf_guid_node;
-	uint64_t		vf_guid_port;
-	uint32_t		vf_linkstate;
-	struct nl_addr *	vf_lladdr;
-	uint32_t		vf_max_tx_rate;
-	uint32_t		vf_min_tx_rate;
-	uint32_t		vf_rate;
-	uint32_t		vf_rss_query_en;
-	uint32_t		vf_spoofchk;
-	uint64_t		vf_stats[RTNL_LINK_VF_STATS_MAX+1];
-	uint32_t		vf_trust;
-	struct nl_vf_vlans *	vf_vlans;
-};
-
-#define IFQDISCSIZ	32
-
-struct rtnl_link
-{
-	NLHDR_COMMON
-
-	char				l_name[IFNAMSIZ];
-	uint32_t			l_family;
-	uint32_t			l_arptype;
-	uint32_t			l_index;
-	uint32_t			l_flags;
-	uint32_t			l_change;
-	uint32_t			l_mtu;
-	uint32_t			l_link;
-	int32_t                         l_link_netnsid;
-	uint32_t			l_txqlen;
-	uint32_t			l_weight;
-	uint32_t			l_master;
-	struct nl_addr *		l_addr;
-	struct nl_addr *		l_bcast;
-	char				l_qdisc[IFQDISCSIZ];
-	struct rtnl_link_map		l_map;
-	uint64_t			l_stats[RTNL_LINK_STATS_MAX+1];
-	uint32_t			l_flag_mask;
-	uint32_t			l_num_vf;
-	uint8_t				l_operstate;
-	uint8_t				l_linkmode;
-	/* 2 byte hole */
-	char *				l_info_kind;
-	char *				l_info_slave_kind;
-	struct rtnl_link_info_ops *	l_info_ops;
-	void *				l_af_data[AF_MAX];
-	void *				l_info;
-	char *				l_ifalias;
-	uint32_t			l_promiscuity;
-	uint32_t			l_num_tx_queues;
-	uint32_t			l_num_rx_queues;
-	uint32_t			l_gso_max_segs;
-	uint32_t			l_gso_max_size;
-	uint32_t			l_group;
-	uint8_t				l_carrier;
-	/* 3 byte hole */
-	uint32_t			l_carrier_changes;
-	struct rtnl_link_af_ops *	l_af_ops;
-	struct nl_data *		l_phys_port_id;
-	char				l_phys_port_name[IFNAMSIZ];
-	struct nl_data *		l_phys_switch_id;
-	int				l_ns_fd;
-	pid_t				l_ns_pid;
-	struct rtnl_link_vf *		l_vf_list;
-};
-
-struct rtnl_ncacheinfo
-{
-	uint32_t nci_confirmed;	/**< Time since neighbour validty was last confirmed */
-	uint32_t nci_used;	/**< Time since neighbour entry was last ued */
-	uint32_t nci_updated;	/**< Time since last update */
-	uint32_t nci_refcnt;	/**< Reference counter */
-};
-
-
-struct rtnl_neigh
-{
-	NLHDR_COMMON
-	uint32_t	n_family;
-	uint32_t	n_ifindex;
-	uint16_t	n_state;
-	uint8_t		n_flags;
-	uint8_t		n_type;
-	struct nl_addr *n_lladdr;
-	struct nl_addr *n_dst;
-	uint32_t	n_nhid;
-	uint32_t	n_probes;
-	struct rtnl_ncacheinfo n_cacheinfo;
-	uint32_t                n_state_mask;
-	uint32_t                n_flag_mask;
-	uint32_t		n_master;
-	uint16_t	n_vlan;
-};
-
-
-struct rtnl_addr_cacheinfo
-{
-	/* Preferred lifetime in seconds, ticking from when the message gets constructed */
-	uint32_t aci_prefered;
-
-	/* Valid lifetime in seconds, ticking from when the message gets constructed */
-	uint32_t aci_valid;
-
-	/* Timestamp of creation in 1/100s since boottime, clock_gettime(CLOCK_MONOTONIC) */
-	uint32_t aci_cstamp;
-
-	/* Timestamp of last update in 1/100s since boottime, clock_gettime(CLOCK_MONOTONIC) */
-	uint32_t aci_tstamp;
-};
-
-struct rtnl_addr
-{
-	NLHDR_COMMON
-
-	uint8_t		a_family;
-	uint8_t		a_prefixlen;
-	uint8_t		a_scope;
-	uint32_t	a_flags;
-	uint32_t	a_ifindex;
-
-	struct nl_addr *a_peer;
-	struct nl_addr *a_local;
-	struct nl_addr *a_bcast;
-	struct nl_addr *a_anycast;
-	struct nl_addr *a_multicast;
-
-	struct rtnl_addr_cacheinfo a_cacheinfo;
-
-	char a_label[IFNAMSIZ];
-	uint32_t a_flag_mask;
-	struct rtnl_link *a_link;
-};
-
-struct rtnl_nh_encap
-{
-	struct nh_encap_ops *ops;
-	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_nexthop_group
-{
-	struct nl_list_head	nexthop_list;
-	int			ce_refcnt;
-	uint32_t id;
-	uint8_t weight;
-};
-
-struct rtnl_nh
-{
-	NLHDR_COMMON
-
-	uint8_t nh_family;
-	uint32_t nh_flags;
-
-	uint32_t nh_id;
-	uint32_t nh_group_type;
-	nl_nh_group_t * nh_group;
-	uint32_t nh_oif;
-	struct nl_addr * nh_gateway;
-};
-
-struct rtnl_route
-{
-	NLHDR_COMMON
-
-	uint8_t			rt_family;
-	uint8_t			rt_dst_len;
-	uint8_t			rt_src_len;
-	uint8_t			rt_tos;
-	uint8_t			rt_protocol;
-	uint8_t			rt_scope;
-	uint8_t			rt_type;
-	uint8_t			rt_nmetrics;
-	uint8_t			rt_ttl_propagate;
-	uint32_t		rt_flags;
-	struct nl_addr *	rt_dst;
-	struct nl_addr *	rt_src;
-	uint32_t		rt_table;
-	uint32_t		rt_iif;
-	uint32_t		rt_prio;
-	uint32_t		rt_metrics[RTAX_MAX];
-	uint32_t		rt_metrics_mask;
-	uint32_t		rt_nr_nh;
-	struct nl_addr *	rt_pref_src;
-	struct nl_list_head	rt_nexthops;
-	struct rtnl_rtcacheinfo	rt_cacheinfo;
-	uint32_t		rt_flag_mask;
-};
-
-struct rtnl_rule
-{
-	NLHDR_COMMON
-	uint8_t		r_family;
-	uint8_t		r_action;
-	uint8_t		r_dsfield; /* ipv4 only */
-	uint8_t		r_l3mdev;
-	uint8_t		r_protocol; /* protocol that installed rule */
-	uint8_t		r_ip_proto; /* IP/IPv6 protocol */
-	uint32_t	r_table;
-	uint32_t	r_flags;
-	uint32_t	r_prio;
-	uint32_t	r_mark;
-	uint32_t	r_mask;
-	uint32_t	r_goto;
-	uint32_t	r_flow; /* ipv4 only */
-	struct nl_addr *r_src;
-	struct nl_addr *r_dst;
-	char		r_iifname[IFNAMSIZ];
-	char		r_oifname[IFNAMSIZ];
-
-	struct fib_rule_port_range	r_sport;
-	struct fib_rule_port_range	r_dport;
-};
-
-struct rtnl_neightbl_parms
-{
-	/**
-	 * Interface index of the device this parameter set is assigned
-	 * to or 0 for the default set.
-	 */
-	uint32_t		ntp_ifindex;
-
-	/**
-	 * Number of references to this parameter set.
-	 */
-	uint32_t		ntp_refcnt;
-
-	/**
-	 * Queue length for pending arp requests, i.e. the number of
-	 * packets which are accepted from other layers while the
-	 * neighbour address is still being resolved
-	 */
-	uint32_t		ntp_queue_len;
-
-	/**
-	 * Number of requests to send to the user level ARP daemon.
-	 * Specify 0 to disable.
-	 */
-	uint32_t		ntp_app_probes;
-
-	/**
-	 * Maximum number of retries for unicast solicitation.
-	 */
-	uint32_t		ntp_ucast_probes;
-
-	/**
-	 * Maximum number of retries for multicast solicitation.
-	 */
-	uint32_t		ntp_mcast_probes;
-
-	/**
-	 * Base value in milliseconds to ompute reachable time, see RFC2461.
-	 */
-	uint64_t		ntp_base_reachable_time;
-
-	/**
-	 * Actual reachable time (read-only)
-	 */
-	uint64_t		ntp_reachable_time;	/* secs */
-
-	/**
-	 * The time in milliseconds between retransmitted Neighbor
-	 * Solicitation messages.
-	 */
-	uint64_t		ntp_retrans_time;
-
-	/**
-	 * Interval in milliseconds to check for stale neighbour
-	 * entries.
-	 */
-	uint64_t		ntp_gc_stale_time;	/* secs */
-
-	/**
-	 * Delay in milliseconds for the first time probe if
-	 * the neighbour is reachable.
-	 */
-	uint64_t		ntp_probe_delay;	/* secs */
-
-	/**
-	 * Maximum delay in milliseconds of an answer to a neighbour
-	 * solicitation message.
-	 */
-	uint64_t		ntp_anycast_delay;
-
-	/**
-	 * Minimum age in milliseconds before a neighbour entry
-	 * may be replaced.
-	 */
-	uint64_t		ntp_locktime;
-
-	/**
-	 * Delay in milliseconds before answering to an ARP request
-	 * for which a proxy ARP entry exists.
-	 */
-	uint64_t		ntp_proxy_delay;
-
-	/**
-	 * Queue length for the delayed proxy arp requests.
-	 */
-	uint32_t		ntp_proxy_qlen;
-
-	/**
-	 * Mask of available parameter attributes
-	 */
-	uint32_t		ntp_mask;
-};
-
-#define NTBLNAMSIZ	32
-
-/**
- * Neighbour table
- * @ingroup neightbl
- */
-struct rtnl_neightbl
-{
-	NLHDR_COMMON
-
-	char			nt_name[NTBLNAMSIZ];
-	uint32_t		nt_family;
-	uint32_t		nt_gc_thresh1;
-	uint32_t		nt_gc_thresh2;
-	uint32_t		nt_gc_thresh3;
-	uint64_t		nt_gc_interval;
-	struct ndt_config	nt_config;
-	struct rtnl_neightbl_parms nt_parms;
-	struct ndt_stats	nt_stats;
-};
-
-struct rtnl_ratespec
-{
-	uint64_t		rs_rate64;
-	uint16_t		rs_overhead;
-	int16_t			rs_cell_align;
-	uint16_t		rs_mpu;
-	uint8_t			rs_cell_log;
-};
-
-struct rtnl_tstats
-{
-	struct {
-		uint64_t            bytes;
-		uint64_t            packets;
-	} tcs_basic;
-
-	struct {
-		uint32_t            bps;
-		uint32_t            pps;
-	} tcs_rate_est;
-
-	struct {
-		uint32_t            qlen;
-		uint32_t            backlog;
-		uint32_t            drops;
-		uint32_t            requeues;
-		uint32_t            overlimits;
-	} tcs_queue;
-};
-
-#define TCKINDSIZ	32
-
-#define NL_TC_GENERIC(pre)				\
-	NLHDR_COMMON					\
-	uint32_t		pre ##_family;		\
-	uint32_t		pre ##_ifindex;		\
-	uint32_t		pre ##_handle;		\
-	uint32_t		pre ##_parent;		\
-	uint32_t		pre ##_info;		\
-	uint32_t		pre ##_mtu;		\
-	uint32_t		pre ##_mpu;		\
-	uint32_t		pre ##_overhead;	\
-	uint32_t		pre ##_linktype;	\
-	char			pre ##_kind[TCKINDSIZ];	\
-	struct nl_data *	pre ##_opts;		\
-	uint64_t		pre ##_stats[RTNL_TC_STATS_MAX+1]; \
-	struct nl_data *	pre ##_xstats;		\
-	struct nl_data *	pre ##_subdata;		\
-	struct rtnl_link *	pre ##_link;		\
-	struct rtnl_tc_ops *	pre ##_ops;		\
-	enum rtnl_tc_type	pre ##_type;		\
-	uint32_t		pre ##_chain
-
-struct rtnl_tc
-{
-	NL_TC_GENERIC(tc);
-};
-
-struct rtnl_qdisc
-{
-	NL_TC_GENERIC(q);
-};
-
-struct rtnl_class
-{
-	NL_TC_GENERIC(c);
-};
-
-struct rtnl_cls
-{
-	NL_TC_GENERIC(c);
-	uint16_t		c_prio;
-	uint16_t		c_protocol;
-};
-
-struct rtnl_act
-{
-	NL_TC_GENERIC(c);
-	struct rtnl_act *	a_next;
-};
-
-struct rtnl_mirred
-{
-	struct tc_mirred m_parm;
-};
-
-struct rtnl_skbedit
-{
-	struct tc_skbedit s_parm;
-	uint32_t	  s_flags;
-	uint32_t	  s_mark;
-	uint32_t	  s_prio;
-	uint16_t	  s_queue_mapping;
-};
-
-struct rtnl_gact
-{
-	struct tc_gact g_parm;
-};
-
-struct rtnl_u32
-{
-	uint32_t		cu_divisor;
-	uint32_t		cu_hash;
-	uint32_t		cu_classid;
-	uint32_t		cu_link;
-	struct nl_data *	cu_pcnt;
-	struct nl_data *	cu_selector;
-	struct nl_data *	cu_mark;
-	struct rtnl_act*	cu_act;
-	struct nl_data *	cu_police;
-	char			cu_indev[IFNAMSIZ];
-	int			cu_mask;
-};
-
-struct rtnl_mall
-{
-	uint32_t         m_classid;
-	uint32_t         m_flags;
-	struct rtnl_act *m_act;
-	int              m_mask;
-};
-
-struct rtnl_flower
-{
-	struct rtnl_act *cf_act;
-	int              cf_mask;
-	uint32_t         cf_flags;
-	uint16_t         cf_proto;
-	uint16_t         cf_vlan_id;
-	uint16_t         cf_vlan_ethtype;
-	uint8_t          cf_vlan_prio;
-	uint8_t          cf_src_mac[ETH_ALEN];
-	uint8_t          cf_src_mac_mask[ETH_ALEN];
-	uint8_t          cf_dst_mac[ETH_ALEN];
-	uint8_t          cf_dst_mac_mask[ETH_ALEN];
-	in_addr_t        cf_ipv4_src;
-	in_addr_t        cf_ipv4_src_mask;
-	in_addr_t        cf_ipv4_dst;
-	in_addr_t        cf_ipv4_dst_mask;
-	uint8_t          cf_ip_dscp;
-	uint8_t          cf_ip_dscp_mask;
-};
-
-struct rtnl_cgroup
-{
-	struct rtnl_ematch_tree *cg_ematch;
-	int			cg_mask;
-};
-
-struct rtnl_fw
-{
-	uint32_t		cf_classid;
-	struct nl_data *	cf_act;
-	struct nl_data *	cf_police;
-	char			cf_indev[IFNAMSIZ];
-	uint32_t		cf_fwmask;
-	int			cf_mask;
-};
-
-struct rtnl_ematch
-{
-	uint16_t		e_id;
-	uint16_t		e_kind;
-	uint16_t		e_flags;
-	uint16_t		e_index;
-	size_t			e_datalen;
-
-	struct nl_list_head	e_childs;
-	struct nl_list_head	e_list;
-	struct rtnl_ematch_ops *e_ops;
-
-	void *			e_data;
-};
-
-struct rtnl_ematch_tree
-{
-	uint16_t		et_progid;
-	struct nl_list_head	et_list;
-
-};
-
-struct rtnl_dsmark_qdisc
-{
-	uint16_t	qdm_indices;
-	uint16_t	qdm_default_index;
-	uint32_t	qdm_set_tc_index;
-	uint32_t	qdm_mask;
-};
-
-struct rtnl_dsmark_class
-{
-	uint8_t		cdm_bmask;
-	uint8_t		cdm_value;
-	uint32_t	cdm_mask;
-};
-
-struct rtnl_fifo
-{
-	uint32_t	qf_limit;
-	uint32_t	qf_mask;
-};
-
-struct rtnl_prio
-{
-	uint32_t	qp_bands;
-	uint8_t		qp_priomap[TC_PRIO_MAX+1];
-	uint32_t	qp_mask;
-};
-
-struct rtnl_mqprio
-{
-        uint8_t         qm_num_tc;
-        uint8_t         qm_prio_map[TC_QOPT_BITMASK + 1];
-        uint8_t         qm_hw;
-        uint16_t        qm_count[TC_QOPT_MAX_QUEUE];
-        uint16_t        qm_offset[TC_QOPT_MAX_QUEUE];
-        uint16_t        qm_mode;
-        uint16_t        qm_shaper;
-        uint64_t        qm_min_rate[TC_QOPT_MAX_QUEUE];
-        uint64_t        qm_max_rate[TC_QOPT_MAX_QUEUE];
-        uint32_t        qm_mask;
-};
-
-struct rtnl_tbf
-{
-	uint32_t		qt_limit;
-	struct rtnl_ratespec	qt_rate;
-	uint32_t		qt_rate_bucket;
-	uint32_t		qt_rate_txtime;
-	struct rtnl_ratespec	qt_peakrate;
-	uint32_t		qt_peakrate_bucket;
-	uint32_t		qt_peakrate_txtime;
-	uint32_t		qt_mask;
-};
-
-struct rtnl_sfq
-{
-	uint32_t	qs_quantum;
-	uint32_t	qs_perturb;
-	uint32_t	qs_limit;
-	uint32_t	qs_divisor;
-	uint32_t	qs_flows;
-	uint32_t	qs_mask;
-};
-
-struct rtnl_netem_corr
-{
-	uint32_t	nmc_delay;
-	uint32_t	nmc_loss;
-	uint32_t	nmc_duplicate;
-};
-
-struct rtnl_netem_reo
-{
-	uint32_t	nmro_probability;
-	uint32_t	nmro_correlation;
-};
-
-struct rtnl_netem_crpt
-{
-	uint32_t	nmcr_probability;
-	uint32_t	nmcr_correlation;
-};
-
-struct rtnl_netem_dist
-{
-	int16_t	*	dist_data;
-	size_t		dist_size;
-};
-
-struct rtnl_netem
-{
-	uint32_t		qnm_latency;
-	uint32_t		qnm_limit;
-	uint32_t		qnm_loss;
-	uint32_t		qnm_gap;
-	uint32_t		qnm_duplicate;
-	uint32_t		qnm_jitter;
-	uint32_t		qnm_mask;
-	struct rtnl_netem_corr	qnm_corr;
-	struct rtnl_netem_reo	qnm_ro;
-	struct rtnl_netem_crpt	qnm_crpt;
-	struct rtnl_netem_dist  qnm_dist;
-};
-
-struct rtnl_htb_qdisc
-{
-	uint32_t		qh_rate2quantum;
-	uint32_t		qh_defcls;
-	uint32_t		qh_mask;
-	uint32_t		qh_direct_pkts;
-};
-
-struct rtnl_htb_class
-{
-	uint32_t		ch_prio;
-	struct rtnl_ratespec	ch_rate;
-	struct rtnl_ratespec	ch_ceil;
-	uint32_t		ch_rbuffer;
-	uint32_t		ch_cbuffer;
-	uint32_t		ch_quantum;
-	uint32_t		ch_mask;
-	uint32_t		ch_level;
-};
-
-struct rtnl_cbq
-{
-	struct tc_cbq_lssopt    cbq_lss;
-	struct tc_ratespec      cbq_rate;
-	struct tc_cbq_wrropt    cbq_wrr;
-	struct tc_cbq_ovl       cbq_ovl;
-	struct tc_cbq_fopt      cbq_fopt;
-	struct tc_cbq_police    cbq_police;
-};
-
-struct rtnl_red
-{
-	uint32_t	qr_limit;
-	uint32_t	qr_qth_min;
-	uint32_t	qr_qth_max;
-	uint8_t		qr_flags;
-	uint8_t		qr_wlog;
-	uint8_t		qr_plog;
-	uint8_t		qr_scell_log;
-	uint32_t	qr_mask;
-};
-
-struct rtnl_plug
-{
-	int             action;
-	uint32_t        limit;
-};
-
-struct rtnl_fq_codel
-{
-	int		fq_limit;
-	uint32_t	fq_target;
-	uint32_t	fq_interval;
-	int		fq_flows;
-	uint32_t	fq_quantum;
-	int		fq_ecn;
-	uint32_t	fq_mask;
-};
-
-struct rtnl_hfsc_qdisc
-{
-	uint32_t		qh_defcls;
-	uint32_t		qh_mask;
-};
-
-struct rtnl_hfsc_class
-{
-	struct tc_service_curve ch_rsc;
-	struct tc_service_curve ch_fsc;
-	struct tc_service_curve ch_usc;
-	uint32_t		ch_mask;
-};
-
-struct flnl_request
-{
-	NLHDR_COMMON
-
-	struct nl_addr *	lr_addr;
-	uint32_t		lr_fwmark;
-	uint8_t			lr_tos;
-	uint8_t			lr_scope;
-	uint8_t			lr_table;
-};
-
-
-struct flnl_result
-{
-	NLHDR_COMMON
-
-	struct flnl_request *	fr_req;
-	uint8_t			fr_table_id;
-	uint8_t			fr_prefixlen;
-	uint8_t			fr_nh_sel;
-	uint8_t			fr_type;
-	uint8_t			fr_scope;
-	uint32_t		fr_error;
-};
-
-#define GENL_OP_HAS_POLICY	1
-#define GENL_OP_HAS_DOIT	2
-#define GENL_OP_HAS_DUMPIT	4
-
-struct genl_family_op
-{
-	uint32_t		o_id;
-	uint32_t		o_flags;
-
-	struct nl_list_head	o_list;
-};
-
-struct genl_family_grp {
-        struct genl_family      *family;        /* private */
-        struct nl_list_head     list;           /* private */
-        char                    name[GENL_NAMSIZ];
-        u_int32_t               id;
-};
-
-struct genl_family
-{
-	NLHDR_COMMON
-
-	uint16_t		gf_id;
-	char 			gf_name[GENL_NAMSIZ];
-	uint32_t		gf_version;
-	uint32_t		gf_hdrsize;
-	uint32_t		gf_maxattr;
-
-	struct nl_list_head	gf_ops;
-	struct nl_list_head	gf_mc_grps;
-};
-
-union nfnl_ct_proto
-{
-	struct {
-		uint16_t	src;
-		uint16_t	dst;
-	} port;
-	struct {
-		uint16_t	id;
-		uint8_t		type;
-		uint8_t		code;
-	} icmp;
-};
-
-struct nfnl_ct_dir {
-	struct nl_addr *	src;
-	struct nl_addr *	dst;
-	union nfnl_ct_proto	proto;
-	uint64_t		packets;
-	uint64_t		bytes;
-};
-
-union nfnl_ct_protoinfo {
-	struct {
-		uint8_t		state;
-	} tcp;
-};
-
-struct nfnl_ct {
-	NLHDR_COMMON
-
-	uint8_t			ct_family;
-	uint8_t			ct_proto;
-	union nfnl_ct_protoinfo	ct_protoinfo;
-
-	uint32_t		ct_status;
-	uint32_t		ct_status_mask;
-	uint32_t		ct_timeout;
-	uint32_t		ct_mark;
-	uint32_t		ct_use;
-	uint32_t		ct_id;
-	uint16_t		ct_zone;
-
-	struct nfnl_ct_dir	ct_orig;
-	struct nfnl_ct_dir	ct_repl;
-
-	struct nfnl_ct_timestamp ct_tstamp;
-};
-
-union nfnl_exp_protodata {
-	struct {
-		uint16_t	src;
-		uint16_t	dst;
-	} port;
-	struct {
-		uint16_t	id;
-		uint8_t		type;
-		uint8_t		code;
-	} icmp;
-};
-
-// Allow for different master/expect l4 protocols
-struct nfnl_exp_proto
-{
-	uint8_t						l4protonum;
-	union nfnl_exp_protodata	l4protodata;
-};
-
-struct nfnl_exp_dir {
-	struct nl_addr *		src;
-	struct nl_addr *		dst;
-	struct nfnl_exp_proto	proto;
-};
-
-struct nfnl_exp {
-	NLHDR_COMMON
-
-	uint8_t			exp_family;
-	uint32_t		exp_timeout;
-	uint32_t		exp_id;
-	uint16_t		exp_zone;
-	uint32_t		exp_class;
-	uint32_t		exp_flags;
-	char *			exp_helper_name;
-	char *			exp_fn;
-	uint8_t			exp_nat_dir;
-
-	struct nfnl_exp_dir		exp_expect;
-	struct nfnl_exp_dir		exp_master;
-	struct nfnl_exp_dir		exp_mask;
-	struct nfnl_exp_dir		exp_nat;
-};
-
-struct nfnl_log {
-	NLHDR_COMMON
-
-	uint16_t		log_group;
-	uint8_t			log_copy_mode;
-	uint32_t		log_copy_range;
-	uint32_t		log_flush_timeout;
-	uint32_t		log_alloc_size;
-	uint32_t		log_queue_threshold;
-	uint32_t		log_flags;
-	uint32_t		log_flag_mask;
-};
-
-struct nfnl_log_msg {
-	NLHDR_COMMON
-
-	uint8_t			log_msg_family;
-	uint8_t			log_msg_hook;
-	uint16_t		log_msg_hwproto;
-	uint32_t		log_msg_mark;
-	struct timeval		log_msg_timestamp;
-	uint32_t		log_msg_indev;
-	uint32_t		log_msg_outdev;
-	uint32_t		log_msg_physindev;
-	uint32_t		log_msg_physoutdev;
-	uint8_t			log_msg_hwaddr[8];
-	int			log_msg_hwaddr_len;
-	void *			log_msg_payload;
-	int			log_msg_payload_len;
-	char *			log_msg_prefix;
-	uint32_t		log_msg_uid;
-	uint32_t		log_msg_gid;
-	uint32_t		log_msg_seq;
-	uint32_t		log_msg_seq_global;
-	uint16_t		log_msg_hwtype;
-	uint16_t		log_msg_hwlen;
-	void *			log_msg_hwheader;
-	int			log_msg_hwheader_len;
-	uint16_t		log_msg_vlan_tag;
-	uint16_t		log_msg_vlan_proto;
-	uint32_t		log_msg_ct_info;
-	struct nfnl_ct *	log_msg_ct;
-};
-
-struct nfnl_queue {
-	NLHDR_COMMON
-
-	uint16_t		queue_group;
-	uint32_t		queue_maxlen;
-	uint32_t		queue_copy_range;
-	uint8_t			queue_copy_mode;
-};
-
-struct nfnl_queue_msg {
-	NLHDR_COMMON
-
-	uint16_t		queue_msg_group;
-	uint8_t			queue_msg_family;
-	uint8_t			queue_msg_hook;
-	uint16_t		queue_msg_hwproto;
-	uint32_t		queue_msg_packetid;
-	uint32_t		queue_msg_mark;
-	struct timeval		queue_msg_timestamp;
-	uint32_t		queue_msg_indev;
-	uint32_t		queue_msg_outdev;
-	uint32_t		queue_msg_physindev;
-	uint32_t		queue_msg_physoutdev;
-	uint8_t			queue_msg_hwaddr[8];
-	int			queue_msg_hwaddr_len;
-	void *			queue_msg_payload;
-	int			queue_msg_payload_len;
-	uint32_t		queue_msg_verdict;
-};
-
-struct ematch_quoted {
-	char *	data;
-	size_t	len;
-	int	index;
-};
-
-struct idiagnl_meminfo {
-	NLHDR_COMMON
-
-	uint32_t idiag_rmem;
-	uint32_t idiag_wmem;
-	uint32_t idiag_fmem;
-	uint32_t idiag_tmem;
-};
-
-struct idiagnl_vegasinfo {
-	NLHDR_COMMON
-
-	uint32_t tcpv_enabled;
-	uint32_t tcpv_rttcnt;
-	uint32_t tcpv_rtt;
-	uint32_t tcpv_minrtt;
-};
-
-struct idiagnl_msg {
-	NLHDR_COMMON
-
-	uint8_t			    idiag_family;
-	uint8_t			    idiag_state;
-	uint8_t			    idiag_timer;
-	uint8_t			    idiag_retrans;
-	uint16_t		    idiag_sport;
-	uint16_t		    idiag_dport;
-	struct nl_addr *	    idiag_src;
-	struct nl_addr *	    idiag_dst;
-	uint32_t		    idiag_ifindex;
-	uint32_t		    idiag_expires;
-	uint32_t		    idiag_rqueue;
-	uint32_t		    idiag_wqueue;
-	uint32_t		    idiag_uid;
-	uint32_t		    idiag_inode;
-
-	uint8_t			    idiag_tos;
-	uint8_t			    idiag_tclass;
-	uint8_t			    idiag_shutdown;
-	char *			    idiag_cong;
-	struct idiagnl_meminfo *    idiag_meminfo;
-	struct idiagnl_vegasinfo *  idiag_vegasinfo;
-	struct tcp_info		    idiag_tcpinfo;
-	uint32_t		    idiag_skmeminfo[SK_MEMINFO_VARS];
-};
-
-struct idiagnl_req {
-	NLHDR_COMMON
-
-	uint8_t			idiag_family;
-	uint8_t			idiag_ext;
-	struct nl_addr *	idiag_src;
-	struct nl_addr *	idiag_dst;
-	uint32_t		idiag_ifindex;
-	uint32_t		idiag_states;
-	uint32_t		idiag_dbs;
-};
-
-// XFRM related definitions
-
-/* Selector, used as selector both on policy rules (SPD) and SAs. */
-struct xfrmnl_sel {
-	uint32_t        refcnt;
-	struct nl_addr* daddr;
-	struct nl_addr* saddr;
-	uint16_t        dport;
-	uint16_t        dport_mask;
-	uint16_t        sport;
-	uint16_t        sport_mask;
-	uint16_t        family;
-	uint8_t         prefixlen_d;
-	uint8_t         prefixlen_s;
-	uint8_t         proto;
-	int32_t         ifindex;
-	uint32_t        user;
-};
-
-/* Lifetime configuration, used for both policy rules (SPD) and SAs. */
-struct xfrmnl_ltime_cfg {
-	uint32_t        refcnt;
-	uint64_t        soft_byte_limit;
-	uint64_t        hard_byte_limit;
-	uint64_t        soft_packet_limit;
-	uint64_t        hard_packet_limit;
-	uint64_t        soft_add_expires_seconds;
-	uint64_t        hard_add_expires_seconds;
-	uint64_t        soft_use_expires_seconds;
-	uint64_t        hard_use_expires_seconds;
-};
-
-/* Current lifetime, used for both policy rules (SPD) and SAs. */
-struct xfrmnl_lifetime_cur {
-	uint64_t        bytes;
-	uint64_t        packets;
-	uint64_t        add_time;
-	uint64_t        use_time;
-};
-
-struct xfrmnl_replay_state {
-	uint32_t        oseq;
-	uint32_t        seq;
-	uint32_t        bitmap;
-};
-
-struct xfrmnl_replay_state_esn {
-	uint32_t        bmp_len;
-	uint32_t        oseq;
-	uint32_t        seq;
-	uint32_t        oseq_hi;
-	uint32_t        seq_hi;
-	uint32_t        replay_window;
-	uint32_t        bmp[0];
-};
-
-struct xfrmnl_mark {
-	uint32_t        v; /* value */
-	uint32_t        m; /* mask */
-};
-
-/* XFRM AE related definitions */
-
-struct xfrmnl_sa_id {
-	struct nl_addr* daddr;
-	uint32_t        spi;
-	uint16_t        family;
-	uint8_t         proto;
-};
-
-struct xfrmnl_ae {
-	NLHDR_COMMON
-
-	struct xfrmnl_sa_id             sa_id;
-	struct nl_addr*                 saddr;
-	uint32_t                        flags;
-	uint32_t                        reqid;
-	struct xfrmnl_mark              mark;
-	struct xfrmnl_lifetime_cur      lifetime_cur;
-	uint32_t                        replay_maxage;
-	uint32_t                        replay_maxdiff;
-	struct xfrmnl_replay_state      replay_state;
-	struct xfrmnl_replay_state_esn* replay_state_esn;
-};
-
-/* XFRM SA related definitions */
-
-struct xfrmnl_id {
-	struct nl_addr* daddr;
-	uint32_t        spi;
-	uint8_t         proto;
-};
-
-struct xfrmnl_stats {
-	uint32_t        replay_window;
-	uint32_t        replay;
-	uint32_t        integrity_failed;
-};
-
-struct xfrmnl_algo_aead {
-	char            alg_name[64];
-	uint32_t        alg_key_len;    /* in bits */
-	uint32_t        alg_icv_len;    /* in bits */
-	char            alg_key[0];
-};
-
-struct xfrmnl_algo_auth {
-	char            alg_name[64];
-	uint32_t        alg_key_len;    /* in bits */
-	uint32_t        alg_trunc_len;  /* in bits */
-	char            alg_key[0];
-};
-
-struct xfrmnl_algo {
-	char            alg_name[64];
-	uint32_t        alg_key_len;    /* in bits */
-	char            alg_key[0];
-};
-
-struct xfrmnl_encap_tmpl {
-	uint16_t        encap_type;
-	uint16_t        encap_sport;
-	uint16_t        encap_dport;
-	struct nl_addr* encap_oa;
-};
-
-struct xfrmnl_user_offload {
-	int             ifindex;
-	uint8_t         flags;
-};
-
-struct xfrmnl_sa {
-	NLHDR_COMMON
-
-	struct xfrmnl_sel*              sel;
-	struct xfrmnl_id                id;
-	struct nl_addr*                 saddr;
-	struct xfrmnl_ltime_cfg*        lft;
-	struct xfrmnl_lifetime_cur      curlft;
-	struct xfrmnl_stats             stats;
-	uint32_t                        seq;
-	uint32_t                        reqid;
-	uint16_t                        family;
-	uint8_t                         mode;        /* XFRM_MODE_xxx */
-	uint8_t                         replay_window;
-	uint8_t                         flags;
-	struct xfrmnl_algo_aead*        aead;
-	struct xfrmnl_algo_auth*        auth;
-	struct xfrmnl_algo*             crypt;
-	struct xfrmnl_algo*             comp;
-	struct xfrmnl_encap_tmpl*       encap;
-	uint32_t                        tfcpad;
-	struct nl_addr*                 coaddr;
-	struct xfrmnl_mark              mark;
-	struct xfrmnl_user_sec_ctx*     sec_ctx;
-	uint32_t                        replay_maxage;
-	uint32_t                        replay_maxdiff;
-	struct xfrmnl_replay_state      replay_state;
-	struct xfrmnl_replay_state_esn* replay_state_esn;
-	uint8_t                         hard;
-	struct xfrmnl_user_offload*     user_offload;
-};
-
-struct xfrmnl_usersa_flush {
-	uint8_t                         proto;
-};
-
-
-/* XFRM SP related definitions */
-
-struct xfrmnl_userpolicy_id {
-	struct xfrmnl_sel               sel;
-	uint32_t                        index;
-	uint8_t                         dir;
-};
-
-struct xfrmnl_user_sec_ctx {
-	uint16_t                        len;
-	uint16_t                        exttype;
-	uint8_t                         ctx_alg;
-	uint8_t                         ctx_doi;
-	uint16_t                        ctx_len;
-	char                            ctx[0];
-};
-
-struct xfrmnl_userpolicy_type {
-	uint8_t                         type;
-	uint16_t                        reserved1;
-	uint16_t                        reserved2;
-};
-
-struct xfrmnl_user_tmpl {
-	struct xfrmnl_id                id;
-	uint16_t                        family;
-	struct nl_addr*                 saddr;
-	uint32_t                        reqid;
-	uint8_t                         mode;
-	uint8_t                         share;
-	uint8_t                         optional;
-	uint32_t                        aalgos;
-	uint32_t                        ealgos;
-	uint32_t                        calgos;
-	struct nl_list_head             utmpl_list;
-};
-
-struct xfrmnl_sp {
-	NLHDR_COMMON
-
-	struct xfrmnl_sel*              sel;
-	struct xfrmnl_ltime_cfg*        lft;
-	struct xfrmnl_lifetime_cur      curlft;
-	uint32_t                        priority;
-	uint32_t                        index;
-	uint8_t                         dir;
-	uint8_t                         action;
-	uint8_t                         flags;
-	uint8_t                         share;
-	struct xfrmnl_user_sec_ctx*     sec_ctx;
-	struct xfrmnl_userpolicy_type   uptype;
-	uint32_t                        nr_user_tmpl;
-	struct nl_list_head             usertmpl_list;
-	struct xfrmnl_mark              mark;
-};
-
-struct rtnl_vlan
-{
-	struct tc_vlan v_parm;
-	uint16_t       v_vid;
-	uint16_t       v_proto;
-	uint8_t        v_prio;
-	uint32_t       v_flags;
-};
-
-struct rtnl_mdb {
-	NLHDR_COMMON
-	uint32_t ifindex;
-
-	struct nl_list_head mdb_entry_list;
-};
-
-struct rtnl_mdb_entry {
-	struct nl_list_head mdb_list;
-	struct nl_addr *addr;
-	uint32_t ifindex;
-	uint16_t vid;
-	uint16_t proto;
-	uint8_t state;
-};
-#endif
diff --git a/include/nl-priv-dynamic-core/nl-core.h b/include/nl-priv-dynamic-core/nl-core.h
new file mode 100644
index 0000000..d4866b2
--- /dev/null
+++ b/include/nl-priv-dynamic-core/nl-core.h
@@ -0,0 +1,90 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+/*
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
+ */
+
+#ifndef __NL_SHARED_CORE_NL_CORE_H__
+#define __NL_SHARED_CORE_NL_CORE_H__
+
+#define NL_SOCK_PASSCRED (1 << 1)
+#define NL_OWN_PORT (1 << 2)
+#define NL_MSG_PEEK (1 << 3)
+#define NL_MSG_PEEK_EXPLICIT (1 << 4)
+#define NL_NO_AUTO_ACK (1 << 5)
+
+struct nl_sock {
+	struct sockaddr_nl s_local;
+	struct sockaddr_nl s_peer;
+	int s_fd;
+	int s_proto;
+	unsigned int s_seq_next;
+	unsigned int s_seq_expect;
+	int s_flags;
+	struct nl_cb *s_cb;
+	size_t s_bufsize;
+};
+
+static inline int wait_for_ack(struct nl_sock *sk)
+{
+	if (sk->s_flags & NL_NO_AUTO_ACK)
+		return 0;
+	else
+		return nl_wait_for_ack(sk);
+}
+
+struct nl_cache {
+	struct nl_list_head c_items;
+	int c_nitems;
+	int c_iarg1;
+	int c_iarg2;
+	int c_refcnt;
+	unsigned int c_flags;
+	struct nl_hash_table *hashtable;
+	struct nl_cache_ops *c_ops;
+};
+
+static inline const char *nl_cache_name(struct nl_cache *cache)
+{
+	return cache->c_ops ? cache->c_ops->co_name : "unknown";
+}
+
+struct nl_cache_assoc {
+	struct nl_cache *ca_cache;
+	change_func_t ca_change;
+	change_func_v2_t ca_change_v2;
+	void *ca_change_data;
+};
+
+#define LOOSE_COMPARISON 1
+#define ID_COMPARISON 2
+
+#define NL_OBJ_MARK 1
+
+struct nl_data {
+	size_t d_size;
+	void *d_data;
+};
+
+struct nl_addr {
+	int a_family;
+	unsigned int a_maxsize;
+	unsigned int a_len;
+	int a_prefixlen;
+	int a_refcnt;
+	char a_addr[0];
+};
+
+#define NL_MSG_CRED_PRESENT 1
+
+struct nl_msg {
+	int nm_protocol;
+	int nm_flags;
+	struct sockaddr_nl nm_src;
+	struct sockaddr_nl nm_dst;
+	struct ucred nm_creds;
+	struct nlmsghdr *nm_nlh;
+	size_t nm_size;
+	int nm_refcnt;
+};
+
+#endif /* __NL_SHARED_CORE_NL_CORE_H__ */
diff --git a/include/nl-priv-dynamic-route/README.md b/include/nl-priv-dynamic-route/README.md
index 8750dc7..b27e14a 100644
--- a/include/nl-priv-dynamic-route/README.md
+++ b/include/nl-priv-dynamic-route/README.md
@@ -1,10 +1,11 @@
 include/nl-priv-dynamic-route
 =============================
 
-libnl-route-3 wrongly exposes some symbols that are not part of public headers.
-They are used by other internal code.
+This exposes private API from libnl-route-3. The only purpose is for tests to
+be able to access the internals.  This is usable to lib/route itself, and tests
+that either statically or dynamically link with libnl-route-3.
 
-These are the symbols.
-
-This header can be used by internal code, that dynamically links with libnl-route-3.
-But best we reduce the use of such hidden API, so avoid it.
+The difference between nl-priv-static-route and nl-priv-dynamic-route, is that
+the former uses internal ABI, so it is only usable when the test statically
+links with lib/route.  On the other hand, nl-priv-dynamic-route also works with
+only the public API (that is, dynamically linking with libnl-route-3).
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 1baba32..c8168a3 100644
--- a/include/nl-priv-dynamic-route/nl-priv-dynamic-route.h
+++ b/include/nl-priv-dynamic-route/nl-priv-dynamic-route.h
@@ -1,10 +1,32 @@
 /* SPDX-License-Identifier: LGPL-2.1-only */
 /*
- * Copyright (c) 2011-2013 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2013 Sassano Systems LLC <joe@sassanosystems.com>
  */
 
-#ifndef __NL_HIDDEN_ROUTE_NL_HIDDEN_ROUTE_H__
-#define __NL_HIDDEN_ROUTE_NL_HIDDEN_ROUTE_H__
+#ifndef __NL_PRIVATE_TYPES_NL_ROUTE_H__
+#define __NL_PRIVATE_TYPES_NL_ROUTE_H__
+
+struct rtnl_ematch {
+	uint16_t e_id;
+	uint16_t e_kind;
+	uint16_t e_flags;
+	uint16_t e_index;
+	size_t e_datalen;
+
+	struct nl_list_head e_childs;
+	struct nl_list_head e_list;
+	struct rtnl_ematch_ops *e_ops;
+
+	void *e_data;
+};
+
+struct rtnl_ematch_tree {
+	uint16_t et_progid;
+	struct nl_list_head et_list;
+};
+
+/*****************************************************************************/
 
 /**
  * Traffic control object operations
@@ -71,4 +93,4 @@ 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 *);
 
-#endif /* __NL_HIDDEN_ROUTE_NL_HIDDEN_ROUTE_H__ */
+#endif /* __NL_PRIVATE_TYPES_NL_ROUTE_H__ */
diff --git a/include/nl-priv-static-route/README.md b/include/nl-priv-static-route/README.md
index f42285b..fd2fa8e 100644
--- a/include/nl-priv-static-route/README.md
+++ b/include/nl-priv-static-route/README.md
@@ -1,7 +1,11 @@
 include/nl-priv-static-route
 ============================
 
-This contains headers that extend the libnl-route-3 API with internal helpers.
-It is only usable to components that statically link with the libnl-route-3
-source. That means libnl-route-3 sources itself (lib/libnl-route-3.la)
-and the unit tests.
+This exposes private API from libnl-route-3. The only purpose is for tests to
+be able to access the internals.  This is usable to lib/route itself, and to
+tests that statically link with libnl-route-3.
+
+The difference between nl-priv-static-route and nl-priv-dynamic-route, is that
+the former uses internal ABI, so it is only usable when the test statically
+links with lib/route.  On the other hand, nl-priv-dynamic-route also works with
+only the public API (that is, dynamically linking with libnl-route-3).