sys: improve cmsghdr description

4 files changed, 111 insertions, 10 deletions

diff --git a/sys/socket.txt b/sys/socket.txt
index 4ac9e4b27..c123a5db9 100644
--- a/sys/socket.txt
+++ b/sys/socket.txt
@@ -99,7 +99,7 @@ socket_domain = AF_UNIX, AF_INET, AF_INET6, AF_IPX, AF_NETLINK, AF_X25, AF_AX25,
 socket_type = SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET, SOCK_RAW, SOCK_RDM, SOCK_PACKET, SOCK_NONBLOCK, SOCK_CLOEXEC
 accept_flags = SOCK_NONBLOCK, SOCK_CLOEXEC
 shutdown_flags  = SHUT_RD, SHUT_WR
-send_flags = MSG_CONFIRM, MSG_DONTROUTE, MSG_DONTWAIT, MSG_EOR, MSG_MORE, MSG_NOSIGNAL, MSG_OOB
+send_flags = MSG_CONFIRM, MSG_DONTROUTE, MSG_DONTWAIT, MSG_EOR, MSG_MORE, MSG_NOSIGNAL, MSG_OOB, MSG_PROBE, MSG_BATCH, MSG_FASTOPEN
 recv_flags = MSG_CMSG_CLOEXEC, MSG_DONTWAIT, MSG_ERRQUEUE, MSG_OOB, MSG_PEEK, MSG_TRUNC, MSG_WAITALL, MSG_WAITFORONE
 sockopt_opt_sock_void = SO_DETACH_FILTER, SO_MARK
 sockopt_opt_sock_int = SO_ACCEPTCONN, SO_BROADCAST, SO_DEBUG, SO_DOMAIN, SO_ERROR, SO_DONTROUTE, SO_KEEPALIVE, SO_PEEK_OFF, SO_PRIORITY, SO_PROTOCOL, SO_RCVBUF, SO_RCVBUFFORCE, SO_RCVLOWAT, SO_SNDLOWAT, SO_REUSEADDR, SO_SNDBUF, SO_SNDBUFFORCE, SO_TIMESTAMP, SO_TYPE, SO_REUSEPORT, SO_OOBINLINE, SO_NO_CHECK, SO_PASSCRED, SO_TIMESTAMPNS, SO_LOCK_FILTER, SO_PASSSEC, SO_RXQ_OVFL, SO_WIFI_STATUS, SO_NOFCS, SO_SELECT_ERR_QUEUE, SO_BUSY_POLL, SO_MAX_PACING_RATE
@@ -116,6 +116,7 @@ ip_msfilter_mode = MCAST_INCLUDE, MCAST_EXCLUDE
 ip_mtu_discover = IP_PMTUDISC_DONT, IP_PMTUDISC_WANT, IP_PMTUDISC_DO, IP_PMTUDISC_PROBE, IP_PMTUDISC_INTERFACE, IP_PMTUDISC_OMIT
 sockopt_opt_ipv6_int = IPV6_ADDRFORM, IPV6_MTU, IPV6_MULTICAST_HOPS, IPV6_MULTICAST_IF, IPV6_MULTICAST_LOOP, IPV6_RECVPKTINFO, IPV6_RECVERR, IPV6_ROUTER_ALERT, IPV6_UNICAST_HOPS, IPV6_V6ONLY, IPV6_RTHDR, IPV6_AUTHHDR, IPV6_DSTOPTS, IPV6_HOPOPTS, IPV6_FLOWINFO, IPV6_HOPLIMIT, IPV6_CHECKSUM, IPV6_2292PKTINFO, IPV6_2292HOPOPTS, IPV6_2292DSTOPTS, IPV6_2292RTHDR, IPV6_2292HOPLIMIT
 sockopt_opt_ipv6_mreq = IPV6_ADD_MEMBERSHIP, IPV6_DROP_MEMBERSHIP, IPV6_JOIN_ANYCAST, IPV6_LEAVE_ANYCAST
+sock_level = IPPROTO_ICMP, SOL_IP, SOL_TCP, SOL_UDP, SOL_IPV6, SOL_ICMPV6, SOL_SCTP, SOL_UDPLITE, SOL_RAW, SOL_IPX, SOL_AX25, SOL_ATALK, SOL_NETROM, SOL_ROSE, SOL_DECNET, SOL_PACKET, SOL_ATM, SOL_AAL, SOL_IRDA, SOL_NETBEUI, SOL_LLC, SOL_DCCP, SOL_NETLINK, SOL_TIPC, SOL_RXRPC, SOL_PPPOL2TP, SOL_BLUETOOTH, SOL_PNPIPE, SOL_RDS, SOL_IUCV, SOL_CAIF, SOL_ALG, SOL_NFC, SOL_KCM
 
 sockaddr [
 	un		sockaddr_un
@@ -184,10 +185,10 @@ recv_msghdr {
 
 cmsghdr {
 	len	len[parent, intptr]
-	level	int32
+	level	flags[sock_level, int32]
 	type	int32
 	data	array[int8]
-}
+} [align_ptr]
 
 
 
@@ -254,8 +255,7 @@ cmsghdr_un_rights {
 	level	const[SOL_SOCKET, int32]
 	type	const[SCM_RIGHTS, int32]
 	fds	array[fd]
-# TODO: this struct must be padded to intptr (see CMSG_ALIGN)
-}
+} [align_ptr]
 
 cmsghdr_un_cred {
 	len	len[parent, intptr]
@@ -264,7 +264,7 @@ cmsghdr_un_cred {
 	pid	pid
 	uid	uid
 	gid	gid
-}
+} [align_ptr]
 
 
 
@@ -312,22 +312,21 @@ cmsghdr_alg_iv {
 	type	const[ALG_SET_IV, int32]
 	ivlen	len[iv, int32]
 	iv	array[int8]
-# TODO: this struct must be padded to intptr (see CMSG_ALIGN)
-}
+} [align_ptr]
 
 cmsghdr_alg_op {
 	len	len[parent, intptr]
 	level	const[SOL_ALG, int32]
 	type	const[ALG_SET_OP, int32]
 	op	int32
-}
+} [align_ptr]
 
 cmsghdr_alg_assoc {
 	len	len[parent, intptr]
 	level	const[SOL_ALG, int32]
 	type	const[ALG_SET_AEAD_ASSOCLEN, int32]
 	assoc	int32
-}
+} [align_ptr]
 
 af_alg_type = CRYPTO_ALG_TYPE_MASK, CRYPTO_ALG_TYPE_CIPHER, CRYPTO_ALG_TYPE_COMPRESS, CRYPTO_ALG_TYPE_AEAD, CRYPTO_ALG_TYPE_BLKCIPHER, CRYPTO_ALG_TYPE_ABLKCIPHER, CRYPTO_ALG_TYPE_GIVCIPHER, CRYPTO_ALG_TYPE_DIGEST, CRYPTO_ALG_TYPE_HASH, CRYPTO_ALG_TYPE_SHASH, CRYPTO_ALG_TYPE_AHASH, CRYPTO_ALG_TYPE_RNG, CRYPTO_ALG_TYPE_AKCIPHER, CRYPTO_ALG_TYPE_PCOMPRESS, CRYPTO_ALG_LARVAL, CRYPTO_ALG_DEAD, CRYPTO_ALG_DYING, CRYPTO_ALG_ASYNC, CRYPTO_ALG_NEED_FALLBACK, CRYPTO_ALG_GENIV, CRYPTO_ALG_TESTED, CRYPTO_ALG_INSTANCE, CRYPTO_ALG_KERN_DRIVER_ONLY, CRYPTO_ALG_INTERNAL
 
diff --git a/sys/socket_amd64.const b/sys/socket_amd64.const
index 3be72a2f9..6eae25fc5 100644
--- a/sys/socket_amd64.const
+++ b/sys/socket_amd64.const
@@ -98,6 +98,7 @@ HIDPCONNADD = 1074022600
 HIDPCONNDEL = 1074022601
 HIDPGETCONNINFO = 2147764435
 HIDPGETCONNLIST = 2147764434
+IPPROTO_ICMP = 1
 IPPROTO_IP = 0
 IPPROTO_IPV6 = 41
 IPPROTO_TCP = 6
@@ -182,16 +183,19 @@ L2CAP_LM_TRUSTED = 8
 L2CAP_OPTIONS = 1
 MCAST_EXCLUDE = 0
 MCAST_INCLUDE = 1
+MSG_BATCH = 262144
 MSG_CMSG_CLOEXEC = 1073741824
 MSG_CONFIRM = 2048
 MSG_DONTROUTE = 4
 MSG_DONTWAIT = 64
 MSG_EOR = 128
 MSG_ERRQUEUE = 8192
+MSG_FASTOPEN = 536870912
 MSG_MORE = 32768
 MSG_NOSIGNAL = 16384
 MSG_OOB = 1
 MSG_PEEK = 2
+MSG_PROBE = 16
 MSG_TRUNC = 32
 MSG_WAITALL = 256
 MSG_WAITFORONE = 65536
@@ -241,13 +245,43 @@ SOF_TIMESTAMPING_TX_ACK = 512
 SOF_TIMESTAMPING_TX_HARDWARE = 1
 SOF_TIMESTAMPING_TX_SCHED = 256
 SOF_TIMESTAMPING_TX_SOFTWARE = 2
+SOL_AAL = 265
 SOL_ALG = 279
+SOL_ATALK = 258
+SOL_ATM = 264
+SOL_AX25 = 257
 SOL_BLUETOOTH = 274
+SOL_CAIF = 278
+SOL_DCCP = 269
+SOL_DECNET = 261
+SOL_ICMPV6 = 58
+SOL_IP = 0
+SOL_IPV6 = 41
+SOL_IPX = 256
+SOL_IRDA = 266
+SOL_IUCV = 277
+SOL_KCM = 281
 SOL_L2CAP = 6
+SOL_LLC = 268
+SOL_NETBEUI = 267
+SOL_NETLINK = 270
+SOL_NETROM = 259
 SOL_NFC = 280
+SOL_PACKET = 263
+SOL_PNPIPE = 275
+SOL_PPPOL2TP = 273
+SOL_RAW = 255
+SOL_RDS = 276
 SOL_RFCOMM = 18
+SOL_ROSE = 260
+SOL_RXRPC = 272
 SOL_SCO = 17
+SOL_SCTP = 132
 SOL_SOCKET = 1
+SOL_TCP = 6
+SOL_TIPC = 271
+SOL_UDP = 17
+SOL_UDPLITE = 136
 SO_ACCEPTCONN = 30
 SO_ATTACH_BPF = 50
 SO_ATTACH_FILTER = 26
diff --git a/sys/socket_arm64.const b/sys/socket_arm64.const
index 08c2e2128..2df95853f 100644
--- a/sys/socket_arm64.const
+++ b/sys/socket_arm64.const
@@ -98,6 +98,7 @@ HIDPCONNADD = 1074022600
 HIDPCONNDEL = 1074022601
 HIDPGETCONNINFO = 2147764435
 HIDPGETCONNLIST = 2147764434
+IPPROTO_ICMP = 1
 IPPROTO_IP = 0
 IPPROTO_IPV6 = 41
 IPPROTO_TCP = 6
@@ -182,16 +183,19 @@ L2CAP_LM_TRUSTED = 8
 L2CAP_OPTIONS = 1
 MCAST_EXCLUDE = 0
 MCAST_INCLUDE = 1
+MSG_BATCH = 262144
 MSG_CMSG_CLOEXEC = 1073741824
 MSG_CONFIRM = 2048
 MSG_DONTROUTE = 4
 MSG_DONTWAIT = 64
 MSG_EOR = 128
 MSG_ERRQUEUE = 8192
+MSG_FASTOPEN = 536870912
 MSG_MORE = 32768
 MSG_NOSIGNAL = 16384
 MSG_OOB = 1
 MSG_PEEK = 2
+MSG_PROBE = 16
 MSG_TRUNC = 32
 MSG_WAITALL = 256
 MSG_WAITFORONE = 65536
@@ -241,13 +245,43 @@ SOF_TIMESTAMPING_TX_ACK = 512
 SOF_TIMESTAMPING_TX_HARDWARE = 1
 SOF_TIMESTAMPING_TX_SCHED = 256
 SOF_TIMESTAMPING_TX_SOFTWARE = 2
+SOL_AAL = 265
 SOL_ALG = 279
+SOL_ATALK = 258
+SOL_ATM = 264
+SOL_AX25 = 257
 SOL_BLUETOOTH = 274
+SOL_CAIF = 278
+SOL_DCCP = 269
+SOL_DECNET = 261
+SOL_ICMPV6 = 58
+SOL_IP = 0
+SOL_IPV6 = 41
+SOL_IPX = 256
+SOL_IRDA = 266
+SOL_IUCV = 277
+SOL_KCM = 281
 SOL_L2CAP = 6
+SOL_LLC = 268
+SOL_NETBEUI = 267
+SOL_NETLINK = 270
+SOL_NETROM = 259
 SOL_NFC = 280
+SOL_PACKET = 263
+SOL_PNPIPE = 275
+SOL_PPPOL2TP = 273
+SOL_RAW = 255
+SOL_RDS = 276
 SOL_RFCOMM = 18
+SOL_ROSE = 260
+SOL_RXRPC = 272
 SOL_SCO = 17
+SOL_SCTP = 132
 SOL_SOCKET = 1
+SOL_TCP = 6
+SOL_TIPC = 271
+SOL_UDP = 17
+SOL_UDPLITE = 136
 SO_ACCEPTCONN = 30
 SO_ATTACH_BPF = 50
 SO_ATTACH_FILTER = 26
diff --git a/sys/socket_ppc64le.const b/sys/socket_ppc64le.const
index 244704317..813d52854 100644
--- a/sys/socket_ppc64le.const
+++ b/sys/socket_ppc64le.const
@@ -98,6 +98,7 @@ HIDPCONNADD = 2147764424
 HIDPCONNDEL = 2147764425
 HIDPGETCONNINFO = 1074022611
 HIDPGETCONNLIST = 1074022610
+IPPROTO_ICMP = 1
 IPPROTO_IP = 0
 IPPROTO_IPV6 = 41
 IPPROTO_TCP = 6
@@ -182,16 +183,19 @@ L2CAP_LM_TRUSTED = 8
 L2CAP_OPTIONS = 1
 MCAST_EXCLUDE = 0
 MCAST_INCLUDE = 1
+MSG_BATCH = 262144
 MSG_CMSG_CLOEXEC = 1073741824
 MSG_CONFIRM = 2048
 MSG_DONTROUTE = 4
 MSG_DONTWAIT = 64
 MSG_EOR = 128
 MSG_ERRQUEUE = 8192
+MSG_FASTOPEN = 536870912
 MSG_MORE = 32768
 MSG_NOSIGNAL = 16384
 MSG_OOB = 1
 MSG_PEEK = 2
+MSG_PROBE = 16
 MSG_TRUNC = 32
 MSG_WAITALL = 256
 MSG_WAITFORONE = 65536
@@ -241,13 +245,43 @@ SOF_TIMESTAMPING_TX_ACK = 512
 SOF_TIMESTAMPING_TX_HARDWARE = 1
 SOF_TIMESTAMPING_TX_SCHED = 256
 SOF_TIMESTAMPING_TX_SOFTWARE = 2
+SOL_AAL = 265
 SOL_ALG = 279
+SOL_ATALK = 258
+SOL_ATM = 264
+SOL_AX25 = 257
 SOL_BLUETOOTH = 274
+SOL_CAIF = 278
+SOL_DCCP = 269
+SOL_DECNET = 261
+SOL_ICMPV6 = 58
+SOL_IP = 0
+SOL_IPV6 = 41
+SOL_IPX = 256
+SOL_IRDA = 266
+SOL_IUCV = 277
+SOL_KCM = 281
 SOL_L2CAP = 6
+SOL_LLC = 268
+SOL_NETBEUI = 267
+SOL_NETLINK = 270
+SOL_NETROM = 259
 SOL_NFC = 280
+SOL_PACKET = 263
+SOL_PNPIPE = 275
+SOL_PPPOL2TP = 273
+SOL_RAW = 255
+SOL_RDS = 276
 SOL_RFCOMM = 18
+SOL_ROSE = 260
+SOL_RXRPC = 272
 SOL_SCO = 17
+SOL_SCTP = 132
 SOL_SOCKET = 1
+SOL_TCP = 6
+SOL_TIPC = 271
+SOL_UDP = 17
+SOL_UDPLITE = 136
 SO_ACCEPTCONN = 30
 SO_ATTACH_BPF = 50
 SO_ATTACH_FILTER = 26