sys/linux: add type aliases for complex xfrm types

2 files changed, 48 insertions, 44 deletions

diff --git a/sys/linux/socket_key.txt b/sys/linux/socket_key.txt
index 875781d4b..192a5d02f 100644
--- a/sys/linux/socket_key.txt
+++ b/sys/linux/socket_key.txt
@@ -38,8 +38,8 @@ sadb_msg {
 	sadb_msg_satype		flags[sadb_satype, int8]
 	sadb_msg_len		bytesize8[parent, int16]
 	sadb_msg_reserved	const[0, int16]
-	sadb_msg_seq		proc[7388453, 8, int32]
-	sadb_msg_pid		proc[635427835, 4, int32]
+	sadb_msg_seq		xfrm_seq
+	sadb_msg_pid		xfrm_port_id
 	ext_headers		array[sadb_ext_hdr]
 } [packed]
 
@@ -126,7 +126,7 @@ sadb_x_policy {
 	sadb_x_policy_type	int16[IPSEC_POLICY_DISCARD:IPSEC_POLICY_BYPASS]
 	sadb_x_policy_dir	flags[ipsec_policy_dir, int8]
 	sadb_x_policy_reserved	const[0, int8]
-	sadb_x_policy_id	proc[7236528, 16, int32, opt]
+	sadb_x_policy_id	xfrm_policy_index
 	sadb_x_policy_priority	int32
 	policy			sadb_x_ipsecrequest
 } [packed, align_8]
@@ -149,8 +149,8 @@ sadb_x_sa2 {
 	sadb_x_sa2_mode		int8
 	sadb_x_sa2_reserved1	const[0, int8]
 	sadb_x_sa2_reserved2	const[0, int16]
-	sadb_x_sa2_sequence	proc[7388453, 8, int32]
-	sadb_x_sa2_reqid	proc[13567, 8, int32, opt]
+	sadb_x_sa2_sequence	xfrm_seq
+	sadb_x_sa2_reqid	xfrm_req_id
 } [packed, align_8]
 
 sadb_x_nat_t_type {
diff --git a/sys/linux/socket_netlink_xfrm.txt b/sys/linux/socket_netlink_xfrm.txt
index e4ddffae6..ef621d89d 100644
--- a/sys/linux/socket_netlink_xfrm.txt
+++ b/sys/linux/socket_netlink_xfrm.txt
@@ -10,6 +10,10 @@ include <uapi/linux/xfrm.h>
 include <uapi/linux/ipsec.h>
 
 resource sock_nl_xfrm[sock_netlink]
+type xfrm_seq proc[7388453, 8, int32]
+type xfrm_port_id proc[635427835, 4, int32]
+type xfrm_req_id proc[13567, 8, int32, opt]
+type xfrm_policy_index proc[7236528, 16, int32, opt]
 
 socket$nl_xfrm(domain const[AF_NETLINK], type const[SOCK_RAW], proto const[NETLINK_XFRM]) sock_nl_xfrm
 
@@ -51,8 +55,8 @@ xfrm_newsa {
 	len	len[parent, int32]
 	type	flags[xfrm_newsa_msgs, int16]
 	flags	flags[netlink_msg_flags, int16]
-	seq	proc[7388453, 8, int32]
-	pid	proc[635427835, 4, int32]
+	seq	xfrm_seq
+	pid	xfrm_port_id
 	msg	xfrm_usersa_info
 	attrs	array[xfrm_attr]
 } [align_4]
@@ -66,8 +70,8 @@ xfrm_usersa_info {
 	lft		xfrm_lifetime_cfg
 	curlft		xfrm_lifetime_cur
 	stats		xfrm_stats
-	seq		proc[7388453, 8, int32]
-	reqid		proc[13567, 8, int32, opt]
+	seq		xfrm_seq
+	reqid		xfrm_req_id
 	family		flags[xfrm_family, int16]
 	mode		flags[xfrm_mode, int8]
 	replay_window	int8
@@ -78,8 +82,8 @@ xfrm_delsa {
 	len	len[parent, int32]
 	type	flags[xfrm_delsa_msgs, int16]
 	flags	flags[netlink_msg_flags, int16]
-	seq	proc[7388453, 8, int32]
-	pid	proc[635427835, 4, int32]
+	seq	xfrm_seq
+	pid	xfrm_port_id
 	msg	xfrm_usersa_id
 	attrs	array[xfrm_attr]
 } [align_4]
@@ -97,8 +101,8 @@ xfrm_newpolicy {
 	len	len[parent, int32]
 	type	flags[xfrm_newpolicy_msgs, int16]
 	flags	flags[netlink_msg_flags, int16]
-	seq	proc[7388453, 8, int32]
-	pid	proc[635427835, 4, int32]
+	seq	xfrm_seq
+	pid	xfrm_port_id
 	msg	xfrm_userpolicy_info
 	attrs	array[xfrm_attr]
 } [align_4]
@@ -109,8 +113,8 @@ xfrm_delpolicy {
 	len	len[parent, int32]
 	type	flags[xfrm_delpolicy_msgs, int16]
 	flags	flags[netlink_msg_flags, int16]
-	seq	proc[7388453, 8, int32]
-	pid	proc[635427835, 4, int32]
+	seq	xfrm_seq
+	pid	xfrm_port_id
 	msg	xfrm_userpolicy_id
 	attrs	array[xfrm_attr]
 } [align_4]
@@ -119,7 +123,7 @@ xfrm_delpolicy_msgs = XFRM_MSG_DELPOLICY, XFRM_MSG_GETPOLICY, XFRM_MSG_MIGRATE
 
 xfrm_userpolicy_id {
 	sel	xfrm_selector
-	index	proc[7236528, 16, int32, opt]
+	index	xfrm_policy_index
 	dir	flags[xfrm_policy_dir, int8]
 }
 
@@ -127,8 +131,8 @@ xfrm_allocspi {
 	len	len[parent, int32]
 	type	const[XFRM_MSG_ALLOCSPI, int16]
 	flags	flags[netlink_msg_flags, int16]
-	seq	proc[7388453, 8, int32]
-	pid	proc[635427835, 4, int32]
+	seq	xfrm_seq
+	pid	xfrm_port_id
 	msg	xfrm_userspi_info
 	attrs	array[xfrm_attr]
 } [align_4]
@@ -143,8 +147,8 @@ xfrm_acquire {
 	len	len[parent, int32]
 	type	const[XFRM_MSG_ACQUIRE, int16]
 	flags	flags[netlink_msg_flags, int16]
-	seq	proc[7388453, 8, int32]
-	pid	proc[635427835, 4, int32]
+	seq	xfrm_seq
+	pid	xfrm_port_id
 	msg	xfrm_user_acquire
 	attrs	array[xfrm_attr]
 } [align_4]
@@ -157,15 +161,15 @@ xfrm_user_acquire {
 	aalgos	int32
 	ealgos	int32
 	calgo	int32
-	seq	proc[7388453, 8, int32]
+	seq	xfrm_seq
 }
 
 xfrm_expire {
 	len	len[parent, int32]
 	type	const[XFRM_MSG_EXPIRE, int16]
 	flags	flags[netlink_msg_flags, int16]
-	seq	proc[7388453, 8, int32]
-	pid	proc[635427835, 4, int32]
+	seq	xfrm_seq
+	pid	xfrm_port_id
 	msg	xfrm_user_expire
 	attrs	array[xfrm_attr]
 } [align_4]
@@ -179,8 +183,8 @@ xfrm_polexpire {
 	len	len[parent, int32]
 	type	const[XFRM_MSG_POLEXPIRE, int16]
 	flags	flags[netlink_msg_flags, int16]
-	seq	proc[7388453, 8, int32]
-	pid	proc[635427835, 4, int32]
+	seq	xfrm_seq
+	pid	xfrm_port_id
 	msg	xfrm_user_polexpire
 	attrs	array[xfrm_attr]
 } [align_4]
@@ -194,8 +198,8 @@ xfrm_flushsa {
 	len	len[parent, int32]
 	type	const[XFRM_MSG_FLUSHSA, int16]
 	flags	flags[netlink_msg_flags, int16]
-	seq	proc[7388453, 8, int32]
-	pid	proc[635427835, 4, int32]
+	seq	xfrm_seq
+	pid	xfrm_port_id
 	msg	xfrm_usersa_flush
 	attrs	array[xfrm_attr]
 } [align_4]
@@ -208,8 +212,8 @@ xfrm_report {
 	len	len[parent, int32]
 	type	const[XFRM_MSG_REPORT, int16]
 	flags	flags[netlink_msg_flags, int16]
-	seq	proc[7388453, 8, int32]
-	pid	proc[635427835, 4, int32]
+	seq	xfrm_seq
+	pid	xfrm_port_id
 	msg	xfrm_user_report
 	attrs	array[xfrm_attr]
 } [align_4]
@@ -224,7 +228,7 @@ xfrm_flushpolicy {
 	type	const[XFRM_MSG_FLUSHPOLICY, int16]
 	flags	flags[netlink_msg_flags, int16]
 	seq	int32
-	pid	proc[635427835, 4, int32]
+	pid	xfrm_port_id
 	attrs	array[xfrm_attr]
 } [align_4]
 
@@ -232,8 +236,8 @@ xfrm_newae {
 	len	len[parent, int32]
 	type	flags[xfrm_newae_msgs, int16]
 	flags	flags[netlink_msg_flags, int16]
-	seq	proc[7388453, 8, int32]
-	pid	proc[635427835, 4, int32]
+	seq	xfrm_seq
+	pid	xfrm_port_id
 	data	xfrm_aevent_id
 	attrs	array[xfrm_attr]
 } [align_4]
@@ -244,15 +248,15 @@ xfrm_aevent_id {
 	sa_id	xfrm_usersa_id
 	saddr	xfrm_address
 	flags	int32
-	reqid	proc[13567, 8, int32, opt]
+	reqid	xfrm_req_id
 }
 
 xfrm_getsadinfo {
 	len	len[parent, int32]
 	type	flags[xfrm_newae_msgs, int16]
 	flags	flags[netlink_msg_flags, int16]
-	seq	proc[7388453, 8, int32]
-	pid	proc[635427835, 4, int32]
+	seq	xfrm_seq
+	pid	xfrm_port_id
 	data	int32
 	attrs	array[xfrm_attr]
 } [align_4]
@@ -420,8 +424,8 @@ xfrm_attr_replay_val {
 } [align_4]
 
 xfrm_replay_state {
-	oseq	proc[7388453, 8, int32]
-	seq	proc[7388453, 8, int32]
+	oseq	xfrm_seq
+	seq	xfrm_seq
 	bitmap	int32
 }
 
@@ -433,10 +437,10 @@ xfrm_attr_replay_esn_val {
 
 xfrm_replay_state_esn {
 	bmp_len		len[bmp, int32]
-	oseq		proc[7388453, 8, int32]
-	seq		proc[7388453, 8, int32]
-	oseq_hi		proc[7388453, 8, int32]
-	seq_hi		proc[7388453, 8, int32]
+	oseq		xfrm_seq
+	seq		xfrm_seq
+	oseq_hi		xfrm_seq
+	seq_hi		xfrm_seq
 	replay_window	int32
 	bmp		array[int32]
 }
@@ -465,7 +469,7 @@ xfrm_user_migrate {
 	proto		flags[xfrm_proto, int8]
 	mode		flags[xfrm_mode, int8]
 	reserved	const[0, int16]
-	reqid		proc[13567, 8, int32, opt]
+	reqid		xfrm_req_id
 	old_family	flags[xfrm_family, int16]
 	new_family	flags[xfrm_family, int16]
 }
@@ -630,7 +634,7 @@ xfrm_userpolicy_info {
 	lft		xfrm_lifetime_cfg
 	curlft		xfrm_lifetime_cur
 	priority	int32
-	index		proc[7236528, 16, int32, opt]
+	index		xfrm_policy_index
 	dir		flags[xfrm_policy_dir, int8]
 	action		flags[xfrm_policy_actions, int8]
 	flags		flags[xfrm_policy_flags, int8]
@@ -641,7 +645,7 @@ xfrm_user_tmpl {
 	id		xfrm_id
 	family		flags[xfrm_family, int16]
 	saddr		xfrm_address
-	reqid		proc[13567, 8, int32, opt]
+	reqid		xfrm_req_id
 	mode		flags[xfrm_mode, int8]
 	share		flags[xfrm_policy_shares, int8]
 	optional	int8