sys/linux: add type alias for socket port

type sock_port proc[20000, 4, int16be]

That was repeated a few times.

6 files changed, 18 insertions, 19 deletions

diff --git a/sys/linux/socket.txt b/sys/linux/socket.txt
index 232bb3452..d9a01d5dc 100644
--- a/sys/linux/socket.txt
+++ b/sys/linux/socket.txt
@@ -15,6 +15,7 @@ include <uapi/linux/ethtool.h>
 include <uapi/linux/if_ether.h>
 
 resource sock[fd]
+type sock_port proc[20000, 4, int16be]
 
 # TODO: describe socketcall syscall
 
@@ -695,8 +696,8 @@ ethtool_flow_ext {
 ethtool_tcpip4_spec {
 	ip4src	ipv4_addr
 	ip4dst	ipv4_addr
-	psrc	proc[20000, 4, int16be]
-	pdst	proc[20000, 4, int16be]
+	psrc	sock_port
+	pdst	sock_port
 	tos	int8
 }
 
@@ -719,8 +720,8 @@ ethtool_usrip4_spec {
 ethtool_tcpip6_spec {
 	ip6src	ipv6_addr
 	ip6dst	ipv6_addr
-	psrc	proc[20000, 4, int16be]
-	pdst	proc[20000, 4, int16be]
+	psrc	sock_port
+	pdst	sock_port
 	tclass	int8
 }
 
diff --git a/sys/linux/socket_inet.txt b/sys/linux/socket_inet.txt
index 9b00266fe..b938b119c 100644
--- a/sys/linux/socket_inet.txt
+++ b/sys/linux/socket_inet.txt
@@ -18,7 +18,7 @@ sock_in_pair {
 
 sockaddr_in {
 	family	const[AF_INET, int16]
-	port	proc[20000, 4, int16be]
+	port	sock_port
 	addr	ipv4_addr
 	pad	array[const[0, int8], 8]
 }
diff --git a/sys/linux/socket_inet6.txt b/sys/linux/socket_inet6.txt
index a645288b2..8b15d753f 100644
--- a/sys/linux/socket_inet6.txt
+++ b/sys/linux/socket_inet6.txt
@@ -20,7 +20,7 @@ sock_in6_pair {
 
 sockaddr_in6 {
 	family	const[AF_INET6, int16]
-	port	proc[20000, 4, int16be]
+	port	sock_port
 	flow	int32
 	addr	ipv6_addr
 	scope	int32
diff --git a/sys/linux/socket_key.txt b/sys/linux/socket_key.txt
index 942ce9ea2..875781d4b 100644
--- a/sys/linux/socket_key.txt
+++ b/sys/linux/socket_key.txt
@@ -163,7 +163,7 @@ sadb_x_nat_t_type {
 sadb_x_nat_t_port {
 	sadb_len			bytesize8[parent, int16]
 	sadb_exttype			flags[sadb_nat_port_type, int16]
-	sadb_x_nat_t_port_port		proc[20000, 4, int16be]
+	sadb_x_nat_t_port_port		sock_port
 	sadb_x_nat_t_port_reserved	const[0, int16]
 } [packed, align_8]
 
diff --git a/sys/linux/socket_netlink_xfrm.txt b/sys/linux/socket_netlink_xfrm.txt
index 48a9a1166..ceb9d6f11 100644
--- a/sys/linux/socket_netlink_xfrm.txt
+++ b/sys/linux/socket_netlink_xfrm.txt
@@ -365,8 +365,8 @@ xfrm_attr_encap {
 xfrm_encap_tmpl {
 # TODO: what's this?
 	encap_type	int16
-	encap_sport	proc[20000, 4, int16be]
-	encap_dport	proc[20000, 4, int16be]
+	encap_sport	sock_port
+	encap_dport	sock_port
 	encap_oa	xfrm_address
 }
 
@@ -542,10 +542,10 @@ xfrmu_spdhthresh6 {
 xfrm_selector {
 	daddr		xfrm_address
 	saddr		xfrm_address
-	dport		proc[20000, 4, int16be]
+	dport		sock_port
 # TODO: dport_mask/sport_mask are some be16, what should we pass here?
 	dport_mask	int16
-	sport		proc[20000, 4, int16be]
+	sport		sock_port
 	sport_mask	int16
 	family		flags[xfrm_family, int16]
 	prefixlen_d	flags[xfrm_prefixlens, int8]
diff --git a/sys/linux/vnet.txt b/sys/linux/vnet.txt
index 718f28206..7c54a9950 100644
--- a/sys/linux/vnet.txt
+++ b/sys/linux/vnet.txt
@@ -771,10 +771,8 @@ tcp_options {
 tcp_flags = 0, TCPHDR_FIN, TCPHDR_SYN, TCPHDR_RST, TCPHDR_PSH, TCPHDR_ACK, TCPHDR_URG, TCPHDR_ECE, TCPHDR_CWR, TCPHDR_SYN_ECN
 
 tcp_header {
-# TODO: proc[20000, 4, int16be] is a good candidate for typedef when/if we have them.
-# I.e. typedef proc[20000, 4, int16be] sock_port
-	src_port	proc[20000, 4, int16be]
-	dst_port	proc[20000, 4, int16be]
+	src_port	sock_port
+	dst_port	sock_port
 	seq_num		tcp_seq_num
 	ack_num		tcp_seq_num
 	ns		int8:1
@@ -804,8 +802,8 @@ tcp_payload {
 # https://en.wikipedia.org/wiki/User_Datagram_Protocol#Packet_structure
 
 udp_packet {
-	src_port	proc[20000, 4, int16be]
-	dst_port	proc[20000, 4, int16be]
+	src_port	sock_port
+	dst_port	sock_port
 	length		len[parent, int16be]
 	csum		csum[parent, pseudo, IPPROTO_UDP, int16be]
 	data		array[int8]
@@ -1112,8 +1110,8 @@ include <uapi/linux/dccp.h>
 dccp_types = DCCP_PKT_REQUEST, DCCP_PKT_RESPONSE, DCCP_PKT_DATA, DCCP_PKT_ACK, DCCP_PKT_DATAACK, DCCP_PKT_CLOSEREQ, DCCP_PKT_CLOSE, DCCP_PKT_RESET, DCCP_PKT_SYNC, DCCP_PKT_SYNCACK, DCCP_PKT_INVALID
 
 dccp_header {
-	src_port	proc[20000, 4, int16be]
-	dst_port	proc[20000, 4, int16be]
+	src_port	sock_port
+	dst_port	sock_port
 	offset		bytesize4[parent, int8]
 	cscov		const[1, int8:4]
 # TODO: cscov might have other values, affects checksummed data