Merge pull request #165 from xairy/better-sockets

Improve socket options

16 files changed, 452 insertions, 170 deletions

diff --git a/sys/socket.txt b/sys/socket.txt
index 686b6aee1..13002b6b6 100644
--- a/sys/socket.txt
+++ b/sys/socket.txt
@@ -16,32 +16,33 @@ resource sock[fd]
 
 socket(domain flags[socket_domain], type flags[socket_type], proto int8) sock
 socketpair(domain flags[socket_domain], type flags[socket_type], proto int8, fds ptr[out, pipefd])
-bind(fd sock, addr ptr[in, sockaddr_all], addrlen len[addr])
-connect(fd sock, addr ptr[in, sockaddr_all], addrlen len[addr])
-accept(fd sock, peer ptr[out, sockaddr_all, opt], peerlen ptr[inout, len[peer, int32]]) sock
-accept4(fd sock, peer ptr[out, sockaddr_all, opt], peerlen ptr[inout, len[peer, int32]], flags flags[accept_flags]) sock
-sendto(fd sock, buf buffer[in], len len[buf], f flags[send_flags], addr ptr[in, sockaddr_all, opt], addrlen len[addr])
-recvfrom(fd sock, buf buffer[out], len len[buf], f flags[recv_flags], addr ptr[in, sockaddr_all, opt], addrlen len[addr])
-getsockname(fd sock, addr ptr[out, sockaddr_all], addrlen ptr[inout, len[addr, int32]])
-getpeername(fd sock, peer ptr[out, sockaddr_all], peerlen ptr[inout, len[peer, int32]])
+bind(fd sock, addr ptr[in, sockaddr_storage], addrlen len[addr])
+connect(fd sock, addr ptr[in, sockaddr_storage], addrlen len[addr])
+accept(fd sock, peer ptr[out, sockaddr_storage, opt], peerlen ptr[inout, len[peer, int32]]) sock
+accept4(fd sock, peer ptr[out, sockaddr_storage, opt], peerlen ptr[inout, len[peer, int32]], flags flags[accept_flags]) sock
+sendto(fd sock, buf buffer[in], len len[buf], f flags[send_flags], addr ptr[in, sockaddr_storage, opt], addrlen len[addr])
+recvfrom(fd sock, buf buffer[out], len len[buf], f flags[recv_flags], addr ptr[in, sockaddr_storage, opt], addrlen len[addr])
+getsockname(fd sock, addr ptr[out, sockaddr_storage], addrlen ptr[inout, len[addr, int32]])
+getpeername(fd sock, peer ptr[out, sockaddr_storage], peerlen ptr[inout, len[peer, int32]])
 
-listen(fd sock, backlog int32)
-shutdown(fd sock, how flags[shutdown_flags])
 sendmsg(fd sock, msg ptr[in, send_msghdr], f flags[send_flags])
-sendmmsg(fd sock, mmsg ptr[in, array[send_msghdr]], vlen len[mmsg], f flags[send_flags])
+sendmmsg(fd sock, mmsg ptr[in, array[send_mmsghdr]], vlen len[mmsg], f flags[send_flags])
 recvmsg(fd sock, msg ptr[in, recv_msghdr], f flags[recv_flags])
-recvmmsg(fd sock, mmsg ptr[in, array[recv_msghdr]], vlen len[mmsg], f flags[recv_flags])
+recvmmsg(fd sock, mmsg ptr[in, array[recv_mmsghdr]], vlen len[mmsg], f flags[recv_flags])
+
+listen(fd sock, backlog int32)
+shutdown(fd sock, how flags[shutdown_flags])
 
 getsockopt(fd sock, level int32, optname int32, optval buffer[out], optlen ptr[inout, len[optval, int32]])
 setsockopt(fd sock, level int32, optname int32, optval buffer[in], optlen len[optval])
 
 socket_domain = AF_UNIX, AF_INET, AF_INET6, AF_IPX, AF_NETLINK, AF_X25, AF_AX25, AF_ATMPVC, AF_APPLETALK, AF_PACKET
-socket_type = SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET, SOCK_RAW, SOCK_RDM, SOCK_PACKET, SOCK_NONBLOCK, SOCK_CLOEXEC
+socket_type = SOCK_STREAM, SOCK_DGRAM, SOCK_RAW, SOCK_RDM, SOCK_SEQPACKET, SOCK_DCCP, 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, 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
-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
+cmsg_levels = SOL_SOCKET, 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
 
 # This sockaddr type corresponds to the struct sockaddr and is 16 bytes or less.
 sockaddr [
@@ -86,8 +87,8 @@ sockaddr [
 	generic		sockaddr_generic
 ]
 
-# This sockaddr can be of arbitrary size and it's meant to be passed as a pointer.
-sockaddr_all [
+# This sockaddr type corresponds to the sockaddr_storage type and is 128 bytes size.
+sockaddr_storage [
 	un		sockaddr_un
 	in		sockaddr_in
 	ax25		sockaddr_ax25
@@ -127,7 +128,7 @@ sockaddr_all [
 # TODO: AF_VSOCK
 # TODO: AF_QIPCRTR
 	ethernet	sockaddr_ethernet
-	generic		sockaddr_all_generic
+	generic		sockaddr_storage_generic
 ] [varlen]
 
 sockaddr_generic {
@@ -135,36 +136,46 @@ sockaddr_generic {
 	sa_data		array[int8, 14]
 }
 
-sockaddr_all_generic {
+sockaddr_storage_generic {
 	sa_family	flags[socket_domain, int16]
 	sa_data		array[int8, 126]
 }
 
 send_msghdr {
-	addr	ptr[in, sockaddr_all, opt]
-	addrlen	len[addr, int32]
-	vec	ptr[in, array[iovec_in]]
-	vlen	len[vec, intptr]
-	ctrl	ptr[in, array[cmsghdr]]
-	ctrllen	len[ctrl, intptr]
-	f	flags[send_flags, int32]
+	msg_name	ptr[in, sockaddr_storage, opt]
+	msg_namelen	len[msg_name, int32]
+	msg_iov		ptr[in, array[iovec_in]]
+	msg_iovlen	len[msg_iov, intptr]
+	msg_control	ptr[in, array[cmsghdr]]
+	msg_controllen	len[msg_control, intptr]
+	msg_flags	flags[send_flags, int32]
+}
+
+send_mmsghdr {
+	msg_hdr		send_msghdr
+	msg_len		int32
 }
 
 recv_msghdr {
-	addr	ptr[out, sockaddr_all, opt]
-	addrlen	len[addr, int32]
-	vec	ptr[in, array[iovec_out]]
-	vlen	len[vec, intptr]
-	ctrl	buffer[out]
-	ctrllen	len[ctrl, intptr]
-	f	int32
+	msg_name	ptr[out, sockaddr_storage, opt]
+	msg_namelen	len[msg_name, int32]
+	msg_iov		ptr[in, array[iovec_out]]
+	msg_iovlen	len[msg_iov, intptr]
+	msg_control	buffer[out]
+	msg_controllen	len[msg_control, intptr]
+	msg_flags	int32
+}
+
+recv_mmsghdr {
+	msg_hdr		recv_msghdr
+	msg_len		int32
 }
 
 cmsghdr {
-	len	len[parent, intptr]
-	level	flags[sock_level, int32]
-	type	int32
-	data	array[int8]
+	cmsg_len	len[parent, intptr]
+	cmsg_level	flags[cmsg_levels, int32]
+	cmsg_type	int32
+	data		array[int8]
 } [align_ptr]
 
 # Socket options
diff --git a/sys/socket_amd64.const b/sys/socket_amd64.const
index 894687482..e8ef6ff7c 100644
--- a/sys/socket_amd64.const
+++ b/sys/socket_amd64.const
@@ -114,6 +114,7 @@ SIOCSMIIREG = 35145
 SIOCSPGRP = 35074
 SIOCWANDEV = 35146
 SOCK_CLOEXEC = 524288
+SOCK_DCCP = 6
 SOCK_DGRAM = 2
 SOCK_NONBLOCK = 2048
 SOCK_PACKET = 10
diff --git a/sys/socket_arm64.const b/sys/socket_arm64.const
index bbf0e6628..13b184bed 100644
--- a/sys/socket_arm64.const
+++ b/sys/socket_arm64.const
@@ -114,6 +114,7 @@ SIOCSMIIREG = 35145
 SIOCSPGRP = 35074
 SIOCWANDEV = 35146
 SOCK_CLOEXEC = 524288
+SOCK_DCCP = 6
 SOCK_DGRAM = 2
 SOCK_NONBLOCK = 2048
 SOCK_PACKET = 10
diff --git a/sys/socket_inet.txt b/sys/socket_inet.txt
index 7ebc92cb3..b5a612003 100644
--- a/sys/socket_inet.txt
+++ b/sys/socket_inet.txt
@@ -6,6 +6,7 @@ include <linux/ipv6.h>
 include <linux/route.h>
 include <uapi/linux/if_arp.h>
 include <uapi/linux/netfilter_ipv6/ip6_tables.h>
+include <uapi/linux/xfrm.h>
 
 # IP sockets
 
@@ -23,6 +24,11 @@ sockaddr_in {
 	pad     array[const[0, int8], 8]
 }
 
+sockaddr_storage_in {
+	addr	sockaddr_in
+	pad	array[const[0, int64], 15]
+}
+
 socket$inet(domain const[AF_INET], type flags[socket_type], proto int8) sock_in
 socketpair$inet(domain const[AF_INET], type flags[socket_type], proto int8, fds ptr[out, sock_in_pair])
 accept$inet(fd sock_in, peer ptr[out, sockaddr_in, opt], peerlen ptr[inout, len[peer, int32]]) sock_in
@@ -47,132 +53,180 @@ setsockopt$inet_buf(fd sock_in, level const[IPPROTO_IP], optname flags[inet_opti
 
 # Specific IP options
 
+sockopt_opt_ip_opts = IP_OPTIONS, IP_PKTOPTIONS
+
+getsockopt$inet_opts(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_opts], optval buffer[out], optlen ptr[inout, len[optval, int32]])
+setsockopt$inet_opts(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_opts], optval buffer[in], optlen len[optval])
+
+getsockopt$inet_IP_IPSEC_POLICY(fd sock_in, level const[IPPROTO_IP], optname const[IP_IPSEC_POLICY], optval ptr[out, xfrm_filter], optlen ptr[inout, len[optval, int32]])
+setsockopt$inet_IP_IPSEC_POLICY(fd sock_in, level const[IPPROTO_IP], optname const[IP_IPSEC_POLICY], optval ptr[in, xfrm_filter], optlen len[optval])
+getsockopt$inet_IP_XFRM_POLICY(fd sock_in, level const[IPPROTO_IP], optname const[IP_XFRM_POLICY], optval ptr[out, xfrm_filter], optlen ptr[inout, len[optval, int32]])
+setsockopt$inet_IP_XFRM_POLICY(fd sock_in, level const[IPPROTO_IP], optname const[IP_XFRM_POLICY], optval ptr[in, xfrm_filter], optlen len[optval])
+
+sockopt_opt_ip_mreq = IP_ADD_MEMBERSHIP, IP_DROP_MEMBERSHIP, IP_MULTICAST_IF
+
 getsockopt$inet_mreq(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_mreq], optval ptr[out, ip_mreq], optlen ptr[inout, len[optval, int32]])
 setsockopt$inet_mreq(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_mreq], optval ptr[in, ip_mreq], optlen len[optval])
 getsockopt$inet_mreqn(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_mreq], optval ptr[out, ip_mreqn], optlen ptr[inout, len[optval, int32]])
 setsockopt$inet_mreqn(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_mreq], optval ptr[in, ip_mreqn], optlen len[optval])
+
+sockopt_opt_ip_mreqsrc = IP_ADD_SOURCE_MEMBERSHIP, IP_BLOCK_SOURCE, IP_DROP_SOURCE_MEMBERSHIP, IP_UNBLOCK_SOURCE
+
 getsockopt$inet_mreqsrc(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_mreqsrc], optval ptr[out, ip_mreq_source], optlen ptr[inout, len[optval, int32]])
 setsockopt$inet_mreqsrc(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_mreqsrc], optval ptr[in, ip_mreq_source], optlen len[optval])
+
 setsockopt$inet_msfilter(fd sock_in, level const[IPPROTO_IP], optname const[IP_MSFILTER], optval ptr[in, ip_msfilter], optlen len[optval])
-getsockopt$inet_mtu(fd sock_in, level const[IPPROTO_IP], optname const[IP_MTU_DISCOVER], optval ptr[out, flags[ip_mtu_discover, int32]], optlen ptr[inout, len[optval, int32]])
-setsockopt$inet_mtu(fd sock_in, level const[IPPROTO_IP], optname const[IP_MTU_DISCOVER], optval ptr[in, flags[ip_mtu_discover, int32]], optlen len[optval])
-getsockopt$inet_opts(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_opts], optval buffer[out], optlen ptr[inout, len[optval, int32]])
-setsockopt$inet_opts(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_opts], optval buffer[in], optlen len[optval])
+
+setsockopt$inet_MCAST_JOIN_GROUP(fd sock_in, level const[IPPROTO_IP], optname const[MCAST_JOIN_GROUP], optval ptr[in, group_req_in], optlen len[optval])
+setsockopt$inet_MCAST_LEAVE_GROUP(fd sock_in, level const[IPPROTO_IP], optname const[MCAST_LEAVE_GROUP], optval ptr[in, group_req_in], optlen len[optval])
+
+sockopt_opt_ip_group_source_req = MCAST_JOIN_SOURCE_GROUP, MCAST_LEAVE_SOURCE_GROUP, MCAST_BLOCK_SOURCE, MCAST_UNBLOCK_SOURCE
+
+setsockopt$inet_group_source_req(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_group_source_req], optval ptr[in, group_source_req_in], optlen len[optval])
+
+setsockopt$inet_MCAST_MSFILTER(fd sock_in, level const[IPPROTO_IP], optname const[MCAST_MSFILTER], optval ptr[in, group_filter_in], optlen len[optval])
+
 getsockopt$inet_pktinfo(fd sock_in, level const[IPPROTO_IP], optname const[IP_PKTINFO], optval ptr[out, in_pktinfo], optlen ptr[inout, len[optval, int32]])
 setsockopt$inet_pktinfo(fd sock_in, level const[IPPROTO_IP], optname const[IP_PKTINFO], optval ptr[in, in_pktinfo], optlen len[optval])
-getsockopt$inet_ipsec(fd sock_in, level const[IPPROTO_IP], optname const[IP_IPSEC_POLICY], optval ptr[out, xfrm_filer], optlen ptr[inout, len[optval, int32]])
-setsockopt$inet_ipsec(fd sock_in, level const[IPPROTO_IP], optname const[IP_IPSEC_POLICY], optval ptr[in, xfrm_filer], optlen len[optval])
 
-sockopt_opt_ip_mreq = IP_ADD_MEMBERSHIP, IP_DROP_MEMBERSHIP, IP_MULTICAST_IF
-sockopt_opt_ip_mreqsrc = IP_ADD_SOURCE_MEMBERSHIP, IP_BLOCK_SOURCE, IP_DROP_SOURCE_MEMBERSHIP, IP_UNBLOCK_SOURCE
-sockopt_opt_ip_opts = IP_OPTIONS, IP_PKTOPTIONS
-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
+getsockopt$inet_mtu(fd sock_in, level const[IPPROTO_IP], optname const[IP_MTU_DISCOVER], optval ptr[out, flags[ip_mtu_discover, int32]], optlen ptr[inout, len[optval, int32]])
+setsockopt$inet_mtu(fd sock_in, level const[IPPROTO_IP], optname const[IP_MTU_DISCOVER], optval ptr[in, flags[ip_mtu_discover, int32]], optlen len[optval])
 
-ip_mreq {
-	multi	ipv4_addr
-	addr	ipv4_addr
+xfrm_filter {
+	info		xfrm_userpolicy_info
+	tmpl		xfrm_user_tmpl
 }
 
-ip_mreqn {
-	multi	ipv4_addr
-	addr	ipv4_addr
-	ifindex	int32
+xfrm_userpolicy_info {
+	sel		xfrm_selector
+	lft		xfrm_lifetime_cfg
+	curlft		xfrm_lifetime_cur
+	priority	int32
+	index		int32
+	dir		int8
+	action		flags[xfrm_policy_actions, int8]
+	flags		flags[xfrm_policy_flags, int8]
+	share		flags[xfrm_policy_shares, int8]
 }
 
-ip_mreq_source {
-	multi	ipv4_addr
-	iface	ipv4_addr
-	source	ipv4_addr
+xfrm_policy_actions = XFRM_POLICY_ALLOW, XFRM_POLICY_BLOCK
+xfrm_policy_flags = XFRM_STATE_NOECN, XFRM_STATE_DECAP_DSCP, XFRM_STATE_NOPMTUDISC, XFRM_STATE_WILDRECV, XFRM_STATE_ICMP, XFRM_STATE_AF_UNSPEC, XFRM_STATE_ALIGN4, XFRM_STATE_ESN
+xfrm_policy_shares = XFRM_SHARE_ANY, XFRM_SHARE_SESSION, XFRM_SHARE_USER, XFRM_SHARE_UNIQUE
+
+xfrm_selector {
+	daddr		xfrm_address
+	saddr		xfrm_address
+	dport		proc[int16be, 20000, 4]
+	dport_mask	int16
+	sport		proc[int16be, 20000, 4]
+	sport_mask	int16
+	family		flags[socket_domain, int16]
+	prefixlen_d	flags[xfrm_prefixlens, int8]
+	prefixlen_s	flags[xfrm_prefixlens, int8]
+	proto		int8
+	ifindex		int32
+	user		uid
 }
 
-ip_msfilter {
-	multi	ipv4_addr
-	iface	ipv4_addr
-	fmode	flags[ip_msfilter_mode, int32]
-	numsrc	len[slist, int32]
-	slist	array[ipv4_addr]
+xfrm_prefixlens = 32, 128
+
+xfrm_address [
+	in		ipv4_addr
+	in6		ipv6_addr
+]
+
+xfrm_lifetime_cfg {
+	soft_byte_limit			int64
+	hard_byte_limit			int64
+	soft_packet_limit		int64
+	hard_packet_limit		int64
+	soft_add_expires_seconds	int64
+	hard_add_expires_seconds	int64
+	soft_use_expires_seconds	int64
+	hard_use_expires_seconds	int64
 }
 
-in_pktinfo {
-	ifindex	int32
-	dst	ipv4_addr
-	addr	ipv4_addr
+xfrm_lifetime_cur {
+	bytes		int64
+	packets		int64
+	add_time	int64
+	use_time	int64
 }
 
-xfrm_filer {
-	info	xfrm_userpolicy_info
-	tmpl	xfrm_user_tmpl
+xfrm_user_tmpl {
+	id		xfrm_id
+	family		flags[socket_domain, int16]
+	saddr		xfrm_address
+	reqid		int32
+	mode		flags[xfrm_modes, int8]
+	share		flags[xfrm_policy_shares, int8]
+	optional	int8
+	aalgos		int32
+	ealgos		int32
+	calgos		int32
 }
 
-xfrm_userpolicy_info {
-	sel	xfrm_selector
-	lft	xfrm_lifetime_cfg
-	cur	xfrm_lifetime_cur
-	prio	int32
-	index	int32
-	dir	int8
-	action	int8
-	flags	int8
-	share	int8
+xfrm_modes = XFRM_MODE_TRANSPORT, XFRM_MODE_TUNNEL, XFRM_MODE_ROUTEOPTIMIZATION, XFRM_MODE_IN_TRIGGER, XFRM_MODE_BEET
+
+xfrm_id {
+	daddr		xfrm_address
+	spi		int32
+	proto		int8
 }
 
-xfrm_user_tmpl {
-	id	xfrm_id
-	fam	int16
-	saddr	xfrm_in_addr
-	reqid	int32
-	mode	int8
-	share	int8
-	opt	int8
-	aalgod	int32
-	ealgos	int32
-	calgos	int32
+ip_mreq {
+	imr_multiaddr	ipv4_addr
+	imr_interface	ipv4_addr
 }
 
-xfrm_selector {
-	daddr	xfrm_in_addr
-	saddr	xfrm_in_addr
-	dport	proc[int16be, 20000, 4]
-	dmask	int16
-	sport	proc[int16be, 20000, 4]
-	smask	int16
-	fam	int16
-	len_d	int8
-	len_s	int8
-	proto	int8
-	ifindex	int32
-	user	int32
+ip_mreqn {
+	imr_multiaddr	ipv4_addr
+	imr_address	ipv4_addr
+	imr_ifindex	int32
 }
 
-xfrm_lifetime_cfg {
-	x0	int64
-	x1	int64
-	x2	int64
-	x3	int64
-	x4	int64
-	x5	int64
-	x6	int64
-	x7	int64
+ip_mreq_source {
+	imr_multiaddr	ipv4_addr
+	imr_interface	ipv4_addr
+	imr_sourceaddr	ipv4_addr
 }
 
-xfrm_lifetime_cur {
-	bytes	int64
-	packets	int64
-	atime	int64
-	utime	int64
+ip_msfilter {
+	imsf_multiaddr	ipv4_addr
+	imsf_interface	ipv4_addr
+	imsf_fmode	flags[ip_msfilter_mode, int32]
+	imsf_numsrc	len[imsf_slist, int32]
+	imsf_slist	array[ipv4_addr]
 }
 
-xfrm_id {
-	daddr	xfrm_in_addr
-	spi	int32
-	proto	int8
+ip_msfilter_mode = MCAST_INCLUDE, MCAST_EXCLUDE
+
+in_pktinfo {
+	ipi_ifindex	int32
+	ipi_spec_dst	ipv4_addr
+	ipi_addr	ipv4_addr
 }
 
-xfrm_in_addr [
-	in	ipv4_addr
-	in6	ipv6_addr
-]
+group_req_in {
+	gr_interface	int32
+	gr_group	sockaddr_storage_in
+}
+
+group_source_req_in {
+	gsr_interface	int32
+	gsr_group	sockaddr_storage_in
+	gsr_source	sockaddr_storage_in
+}
+
+group_filter_in {
+	gf_interface	int32
+	gf_group	sockaddr_storage_in
+	gf_fmode	flags[ip_msfilter_mode, int32]
+	gf_numsrc	len[gf_slist, int32]
+	gf_slist	array[sockaddr_storage_in]
+}
+
+ip_mtu_discover = IP_PMTUDISC_DONT, IP_PMTUDISC_WANT, IP_PMTUDISC_DO, IP_PMTUDISC_PROBE, IP_PMTUDISC_INTERFACE, IP_PMTUDISC_OMIT
 
 # IP ioctls
 
diff --git a/sys/socket_inet6.txt b/sys/socket_inet6.txt
index 14be9aece..382ca1614 100644
--- a/sys/socket_inet6.txt
+++ b/sys/socket_inet6.txt
@@ -6,6 +6,7 @@ include <linux/ipv6.h>
 include <linux/route.h>
 include <uapi/linux/route.h>
 include <uapi/linux/ipv6_route.h>
+include <uapi/linux/mroute6.h>
 include <uapi/linux/netfilter_ipv6/ip6_tables.h>
 
 # IPv6 sockets
@@ -17,7 +18,6 @@ sock_in6_pair {
 	f1	sock_in6
 }
 
-
 sockaddr_in6 {
 	family	const[AF_INET6, int16]
 	port	proc[int16be, 20000, 4]
@@ -26,6 +26,11 @@ sockaddr_in6 {
 	scope	int32
 }
 
+sockaddr_storage_in6 {
+	addr	sockaddr_in6
+	pad	array[const[0, int64], 12]
+}
+
 socket$inet6(domain const[AF_INET6], type flags[socket_type], proto int8) sock_in6
 socketpair$inet6(domain const[AF_INET6], type flags[socket_type], proto int8, fds ptr[out, sock_in6_pair])
 accept$inet6(fd sock_in6, peer ptr[out, sockaddr_in6, opt], peerlen ptr[inout, len[peer, int32]]) sock_in6
@@ -39,9 +44,9 @@ getpeername$inet6(fd sock_in6, peer ptr[out, sockaddr_in6], peerlen ptr[inout, l
 
 # Generic IPv6 options
 
-inet6_option_types_int = IPV6_ADDRFORM, IPV6_2292PKTINFO, IPV6_2292HOPOPTS, IPV6_2292DSTOPTS, IPV6_2292RTHDR, IPV6_CHECKSUM, IPV6_2292HOPLIMIT, IPV6_NEXTHOP, IPV6_AUTHHDR, IPV6_FLOWINFO, IPV6_UNICAST_HOPS, IPV6_MULTICAST_IF, IPV6_MULTICAST_HOPS, IPV6_MULTICAST_LOOP, IPV6_ROUTER_ALERT, IPV6_MTU_DISCOVER, IPV6_MTU, IPV6_RECVERR, IPV6_V6ONLY, IPV6_FLOWINFO_SEND, IPV6_HDRINCL, IPV6_RECVPKTINFO, IPV6_RECVHOPLIMIT, IPV6_HOPLIMIT, IPV6_RECVHOPOPTS, IPV6_RECVRTHDR, IPV6_RECVDSTOPTS, IPV6_RECVPATHMTU, IPV6_DONTFRAG, IPV6_RECVTCLASS, IPV6_TCLASS, IP6T_SO_ORIGINAL_DST, IPV6_AUTOFLOWLABEL, IPV6_ADDR_PREFERENCES, IPV6_MINHOPCOUNT, IPV6_RECVORIGDSTADDR, IPV6_TRANSPARENT, IPV6_UNICAST_IF
+inet6_option_types_int = IPV6_ADDRFORM, IPV6_2292PKTINFO, IPV6_2292HOPOPTS, IPV6_2292DSTOPTS, IPV6_2292RTHDR, IPV6_CHECKSUM, IPV6_2292HOPLIMIT, IPV6_NEXTHOP, IPV6_AUTHHDR, IPV6_FLOWINFO, IPV6_UNICAST_HOPS, IPV6_MULTICAST_IF, IPV6_MULTICAST_HOPS, IPV6_MULTICAST_LOOP, IPV6_ROUTER_ALERT, IPV6_MTU_DISCOVER, IPV6_MTU, IPV6_RECVERR, IPV6_V6ONLY, IPV6_FLOWINFO_SEND, IPV6_HDRINCL, IPV6_RECVPKTINFO, IPV6_RECVHOPLIMIT, IPV6_HOPLIMIT, IPV6_RECVHOPOPTS, IPV6_RECVRTHDR, IPV6_RECVDSTOPTS, IPV6_RECVPATHMTU, IPV6_DONTFRAG, IPV6_RECVTCLASS, IPV6_TCLASS, IP6T_SO_ORIGINAL_DST, IPV6_AUTOFLOWLABEL, IPV6_ADDR_PREFERENCES, IPV6_MINHOPCOUNT, IPV6_RECVORIGDSTADDR, IPV6_TRANSPARENT, IPV6_UNICAST_IF, MRT6_INIT, MRT6_DONE, MRT6_DEL_MIF, MRT6_VERSION, MRT6_ASSERT, MRT6_PIM, MRT6_TABLE
 
-inet6_option_types_buf = IPV6_2292PKTOPTIONS, IPV6_ADD_MEMBERSHIP, IPV6_DROP_MEMBERSHIP, IPV6_JOIN_ANYCAST, IPV6_LEAVE_ANYCAST, IPV6_FLOWLABEL_MGR, IPV6_IPSEC_POLICY, IPV6_XFRM_POLICY, MCAST_JOIN_GROUP, MCAST_BLOCK_SOURCE, MCAST_UNBLOCK_SOURCE, MCAST_LEAVE_GROUP, MCAST_JOIN_SOURCE_GROUP, MCAST_LEAVE_SOURCE_GROUP, MCAST_MSFILTER, IPV6_PKTINFO, IPV6_HOPOPTS, IPV6_RTHDRDSTOPTS, IPV6_RTHDR, IPV6_DSTOPTS, IPV6_PATHMTU, IP6T_SO_GET_REVISION_MATCH, IP6T_SO_GET_REVISION_TARGET
+inet6_option_types_buf = IPV6_2292PKTOPTIONS, IPV6_ADD_MEMBERSHIP, IPV6_DROP_MEMBERSHIP, IPV6_JOIN_ANYCAST, IPV6_LEAVE_ANYCAST, IPV6_FLOWLABEL_MGR, IPV6_IPSEC_POLICY, IPV6_XFRM_POLICY, MCAST_JOIN_GROUP, MCAST_BLOCK_SOURCE, MCAST_UNBLOCK_SOURCE, MCAST_LEAVE_GROUP, MCAST_JOIN_SOURCE_GROUP, MCAST_LEAVE_SOURCE_GROUP, MCAST_MSFILTER, IPV6_PKTINFO, IPV6_HOPOPTS, IPV6_RTHDRDSTOPTS, IPV6_RTHDR, IPV6_DSTOPTS, IPV6_PATHMTU, IP6T_SO_GET_REVISION_MATCH, IP6T_SO_GET_REVISION_TARGET, MRT6_ADD_MIF, MRT6_ADD_MFC, MRT6_DEL_MFC, MRT6_ADD_MFC_PROXY, MRT6_DEL_MFC_PROXY
 
 getsockopt$inet6_int(fd sock_in6, level const[IPPROTO_IPV6], optname flags[inet6_option_types_int], optval ptr[out, int32], optlen ptr[inout, len[optval, int32]])
 setsockopt$inet6_int(fd sock_in6, level const[IPPROTO_IPV6], optname flags[inet6_option_types_int], optval ptr[in, int32], optlen len[optval])
@@ -50,24 +55,110 @@ setsockopt$inet6_buf(fd sock_in6, level const[IPPROTO_IPV6], optname flags[inet6
 
 # Specific IPv6 options
 
+# http://lxr.free-electrons.com/ident?i=do_ipv6_setsockopt
+# http://lxr.free-electrons.com/ident?i=do_ipv6_getsockopt
+
+sockopt_opt_ipv6_mreq = IPV6_ADD_MEMBERSHIP, IPV6_DROP_MEMBERSHIP, IPV6_JOIN_ANYCAST, IPV6_LEAVE_ANYCAST
+
 getsockopt$inet6_mreq(fd sock_in6, level const[IPPROTO_IPV6], optname flags[sockopt_opt_ipv6_mreq], optval ptr[out, ipv6_mreq], optlen ptr[inout, len[optval, int32]])
 setsockopt$inet6_mreq(fd sock_in6, level const[IPPROTO_IPV6], optname flags[sockopt_opt_ipv6_mreq], optval ptr[in, ipv6_mreq], optlen len[optval])
+
+setsockopt$inet6_IPV6_FLOWLABEL_MGR(fd sock_in6, level const[IPPROTO_IPV6], optname const[IPV6_FLOWLABEL_MGR], optval ptr[in, in6_flowlabel_req], optlen len[optval])
+getsockopt$inet6_IPV6_FLOWLABEL_MGR(fd sock_in6, level const[IPPROTO_IPV6], optname const[IPV6_FLOWLABEL_MGR], optval ptr[inout, in6_flowlabel_req], optlen ptr[inout, len[optval, int32]])
+
+getsockopt$inet6_IPV6_IPSEC_POLICY(fd sock_in6, level const[IPPROTO_IPV6], optname const[IPV6_IPSEC_POLICY], optval ptr[out, xfrm_filter], optlen ptr[inout, len[optval, int32]])
+setsockopt$inet6_IPV6_IPSEC_POLICY(fd sock_in6, level const[IPPROTO_IPV6], optname const[IPV6_IPSEC_POLICY], optval ptr[in, xfrm_filter], optlen len[optval])
+getsockopt$inet6_IPV6_XFRM_POLICY(fd sock_in6, level const[IPPROTO_IPV6], optname const[IPV6_XFRM_POLICY], optval ptr[out, xfrm_filter], optlen ptr[inout, len[optval, int32]])
+setsockopt$inet6_IPV6_XFRM_POLICY(fd sock_in6, level const[IPPROTO_IPV6], optname const[IPV6_XFRM_POLICY], optval ptr[in, xfrm_filter], optlen len[optval])
+
+setsockopt$inet6_MCAST_JOIN_GROUP(fd sock_in6, level const[IPPROTO_IPV6], optname const[MCAST_JOIN_GROUP], optval ptr[in, group_req_in6], optlen len[optval])
+setsockopt$inet6_MCAST_LEAVE_GROUP(fd sock_in6, level const[IPPROTO_IPV6], optname const[MCAST_LEAVE_GROUP], optval ptr[in, group_req_in6], optlen len[optval])
+
+sockopt_opt_ipv6_group_source_req = MCAST_JOIN_SOURCE_GROUP, MCAST_LEAVE_SOURCE_GROUP, MCAST_BLOCK_SOURCE, MCAST_UNBLOCK_SOURCE
+
+setsockopt$inet6_group_source_req(fd sock_in6, level const[IPPROTO_IPV6], optname flags[sockopt_opt_ipv6_group_source_req], optval ptr[in, group_source_req_in6], optlen len[optval])
+
+setsockopt$inet6_MCAST_MSFILTER(fd sock_in6, level const[IPPROTO_IPV6], optname const[MCAST_MSFILTER], optval ptr[in, group_filter_in6], optlen len[optval])
+
+setsockopt$inet6_IPV6_PKTINFO(fd sock_in6, level const[IPPROTO_IPV6], optname const[IPV6_PKTINFO], optval ptr[in, in6_pktinfo], optlen len[optval])
+
+# TODO: IPV6_HOPOPTS, IPV6_RTHDRDSTOPTS, IPV6_RTHDR, IPV6_DSTOPTS
+# TODO: IPV6_PATHMTU
+# TODO: IP6T_SO_GET_REVISION_MATCH, IP6T_SO_GET_REVISION_TARGET
+
+setsockopt$inet6_MRT6_ADD_MIF(fd sock_in6, level const[IPPROTO_IPV6], optname const[MRT6_ADD_MIF], optval ptr[in, mif6ctl], optlen len[optval])
+setsockopt$inet6_MRT6_ADD_MFC(fd sock_in6, level const[IPPROTO_IPV6], optname const[MRT6_ADD_MFC], optval ptr[in, mf6cctl], optlen len[optval])
+setsockopt$inet6_MRT6_DEL_MFC(fd sock_in6, level const[IPPROTO_IPV6], optname const[MRT6_DEL_MFC], optval ptr[in, mf6cctl], optlen len[optval])
+setsockopt$inet6_MRT6_ADD_MFC_PROXY(fd sock_in6, level const[IPPROTO_IPV6], optname const[MRT6_ADD_MFC_PROXY], optval ptr[in, mf6cctl], optlen len[optval])
+setsockopt$inet6_MRT6_DEL_MFC_PROXY(fd sock_in6, level const[IPPROTO_IPV6], optname const[MRT6_DEL_MFC_PROXY], optval ptr[in, mf6cctl], optlen len[optval])
+
 getsockopt$inet6_mtu(fd sock_in6, level const[IPPROTO_IPV6], optname const[IPV6_MTU_DISCOVER], optval ptr[out, flags[ip_mtu_discover, int32]], optlen ptr[inout, len[optval, int32]])
 setsockopt$inet6_mtu(fd sock_in6, level const[IPPROTO_IPV6], optname const[IPV6_MTU_DISCOVER], optval ptr[in, flags[ip_mtu_discover, int32]], optlen len[optval])
-getsockopt$inet6_opts(fd sock_in6, level const[IPPROTO_IPV6], optname const[IPV6_2292PKTOPTIONS], optval buffer[out], optlen ptr[inout, len[optval, int32]])
-setsockopt$inet6_opts(fd sock_in6, level const[IPPROTO_IPV6], optname const[IPV6_2292PKTOPTIONS], optval buffer[in], optlen len[optval])
 
-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
+mif6ctl {
+	mif6c_mifi	int16
+	mif6c_flags	flags[mif6c_flags, int8]
+	vifc_threshold	int8
+	mif6c_pifi	int16
+	vifc_rate_limit	int32
+}
+
+mif6c_flags = MIFF_REGISTER
+
+mf6cctl {
+	mf6cc_origin	sockaddr_in6
+	mf6cc_mcastgrp	sockaddr_in6
+	mf6cc_parent	int16
+	mf6cc_ifset	array[int32, 8]
+}
 
 ipv6_mreq {
 	multi	ipv6_addr
 	ifindex	int32
 }
 
+in6_flowlabel_req {
+	flr_dst		ipv6_addr
+	flr_label	int32
+	flr_action	flags[flr_actions, int8]
+	flr_share	flags[flr_shares, int8]
+	flr_flags	flags[flr_flags, int16]
+	flr_expires	int16
+	flr_linger	int16
+	__flr_pad	int32
+}
+
+flr_actions = IPV6_FL_A_GET, IPV6_FL_A_PUT, IPV6_FL_A_RENEW
+flr_shares = IPV6_FL_S_NONE, IPV6_FL_S_EXCL, IPV6_FL_S_PROCESS, IPV6_FL_S_USER, IPV6_FL_S_ANY
+flr_flags = IPV6_FL_F_CREATE, IPV6_FL_F_EXCL, IPV6_FL_F_REFLECT, IPV6_FL_F_REMOTE
+
+group_req_in6 {
+	gr_interface	int32
+	gr_group	sockaddr_storage_in6
+}
+
+group_source_req_in6 {
+	gsr_interface	int32
+	gsr_group	sockaddr_storage_in6
+	gsr_source	sockaddr_storage_in6
+}
+
+group_filter_in6 {
+	gf_interface	int32
+	gf_group	sockaddr_storage_in6
+	gf_fmode	flags[ip_msfilter_mode, int32]
+	gf_numsrc	len[gf_slist, int32]
+	gf_slist	array[sockaddr_storage_in6]
+}
+
+in6_pktinfo {
+	ipi6_addr	ipv6_addr
+	ipi6_ifindex	int32
+}
+
 # IPv6 ioctls
 
-# TODO: http://lxr.free-electrons.com/ident?i=inet6_ioctl
+# http://lxr.free-electrons.com/ident?i=inet6_ioctl
 
 ioctl$sock_inet6_SIOCADDRT(fd sock_in6, cmd const[SIOCADDRT], arg ptr[in, in6_rtmsg])
 ioctl$sock_inet6_SIOCDELRT(fd sock_in6, cmd const[SIOCDELRT], arg ptr[in, in6_rtmsg])
diff --git a/sys/socket_inet6_amd64.const b/sys/socket_inet6_amd64.const
index 88c853a06..d42b5d0c8 100644
--- a/sys/socket_inet6_amd64.const
+++ b/sys/socket_inet6_amd64.const
@@ -24,6 +24,18 @@ IPV6_DSTOPTS = 59
 IPV6_FLOWINFO = 11
 IPV6_FLOWINFO_SEND = 33
 IPV6_FLOWLABEL_MGR = 32
+IPV6_FL_A_GET = 0
+IPV6_FL_A_PUT = 1
+IPV6_FL_A_RENEW = 2
+IPV6_FL_F_CREATE = 1
+IPV6_FL_F_EXCL = 2
+IPV6_FL_F_REFLECT = 4
+IPV6_FL_F_REMOTE = 8
+IPV6_FL_S_ANY = 255
+IPV6_FL_S_EXCL = 1
+IPV6_FL_S_NONE = 0
+IPV6_FL_S_PROCESS = 2
+IPV6_FL_S_USER = 3
 IPV6_HDRINCL = 36
 IPV6_HOPLIMIT = 52
 IPV6_HOPOPTS = 54
@@ -64,6 +76,19 @@ MCAST_LEAVE_GROUP = 45
 MCAST_LEAVE_SOURCE_GROUP = 47
 MCAST_MSFILTER = 48
 MCAST_UNBLOCK_SOURCE = 44
+MIFF_REGISTER = 1
+MRT6_ADD_MFC = 204
+MRT6_ADD_MFC_PROXY = 210
+MRT6_ADD_MIF = 202
+MRT6_ASSERT = 207
+MRT6_DEL_MFC = 205
+MRT6_DEL_MFC_PROXY = 211
+MRT6_DEL_MIF = 203
+MRT6_DONE = 201
+MRT6_INIT = 200
+MRT6_PIM = 208
+MRT6_TABLE = 209
+MRT6_VERSION = 206
 RTF_ADDRCONF = 262144
 RTF_ALLONLINK = 131072
 RTF_ANYCAST = 1048576
diff --git a/sys/socket_inet6_arm64.const b/sys/socket_inet6_arm64.const
index ae90cafee..82c6ca2b2 100644
--- a/sys/socket_inet6_arm64.const
+++ b/sys/socket_inet6_arm64.const
@@ -24,6 +24,18 @@ IPV6_DSTOPTS = 59
 IPV6_FLOWINFO = 11
 IPV6_FLOWINFO_SEND = 33
 IPV6_FLOWLABEL_MGR = 32
+IPV6_FL_A_GET = 0
+IPV6_FL_A_PUT = 1
+IPV6_FL_A_RENEW = 2
+IPV6_FL_F_CREATE = 1
+IPV6_FL_F_EXCL = 2
+IPV6_FL_F_REFLECT = 4
+IPV6_FL_F_REMOTE = 8
+IPV6_FL_S_ANY = 255
+IPV6_FL_S_EXCL = 1
+IPV6_FL_S_NONE = 0
+IPV6_FL_S_PROCESS = 2
+IPV6_FL_S_USER = 3
 IPV6_HDRINCL = 36
 IPV6_HOPLIMIT = 52
 IPV6_HOPOPTS = 54
@@ -64,6 +76,19 @@ MCAST_LEAVE_GROUP = 45
 MCAST_LEAVE_SOURCE_GROUP = 47
 MCAST_MSFILTER = 48
 MCAST_UNBLOCK_SOURCE = 44
+MIFF_REGISTER = 1
+MRT6_ADD_MFC = 204
+MRT6_ADD_MFC_PROXY = 210
+MRT6_ADD_MIF = 202
+MRT6_ASSERT = 207
+MRT6_DEL_MFC = 205
+MRT6_DEL_MFC_PROXY = 211
+MRT6_DEL_MIF = 203
+MRT6_DONE = 201
+MRT6_INIT = 200
+MRT6_PIM = 208
+MRT6_TABLE = 209
+MRT6_VERSION = 206
 RTF_ADDRCONF = 262144
 RTF_ALLONLINK = 131072
 RTF_ANYCAST = 1048576
diff --git a/sys/socket_inet6_ppc64le.const b/sys/socket_inet6_ppc64le.const
index df3a66d05..9ffb55f7b 100644
--- a/sys/socket_inet6_ppc64le.const
+++ b/sys/socket_inet6_ppc64le.const
@@ -24,6 +24,18 @@ IPV6_DSTOPTS = 59
 IPV6_FLOWINFO = 11
 IPV6_FLOWINFO_SEND = 33
 IPV6_FLOWLABEL_MGR = 32
+IPV6_FL_A_GET = 0
+IPV6_FL_A_PUT = 1
+IPV6_FL_A_RENEW = 2
+IPV6_FL_F_CREATE = 1
+IPV6_FL_F_EXCL = 2
+IPV6_FL_F_REFLECT = 4
+IPV6_FL_F_REMOTE = 8
+IPV6_FL_S_ANY = 255
+IPV6_FL_S_EXCL = 1
+IPV6_FL_S_NONE = 0
+IPV6_FL_S_PROCESS = 2
+IPV6_FL_S_USER = 3
 IPV6_HDRINCL = 36
 IPV6_HOPLIMIT = 52
 IPV6_HOPOPTS = 54
@@ -64,6 +76,19 @@ MCAST_LEAVE_GROUP = 45
 MCAST_LEAVE_SOURCE_GROUP = 47
 MCAST_MSFILTER = 48
 MCAST_UNBLOCK_SOURCE = 44
+MIFF_REGISTER = 1
+MRT6_ADD_MFC = 204
+MRT6_ADD_MFC_PROXY = 210
+MRT6_ADD_MIF = 202
+MRT6_ASSERT = 207
+MRT6_DEL_MFC = 205
+MRT6_DEL_MFC_PROXY = 211
+MRT6_DEL_MIF = 203
+MRT6_DONE = 201
+MRT6_INIT = 200
+MRT6_PIM = 208
+MRT6_TABLE = 209
+MRT6_VERSION = 206
 RTF_ADDRCONF = 262144
 RTF_ALLONLINK = 131072
 RTF_ANYCAST = 1048576
diff --git a/sys/socket_inet_amd64.const b/sys/socket_inet_amd64.const
index 7ad4f46a6..f91f26aec 100644
--- a/sys/socket_inet_amd64.const
+++ b/sys/socket_inet_amd64.const
@@ -88,6 +88,25 @@ SIOCSIFDSTADDR = 35096
 SIOCSIFFLAGS = 35092
 SIOCSIFNETMASK = 35100
 SIOCSIFPFLAGS = 35124
+XFRM_MODE_BEET = 4
+XFRM_MODE_IN_TRIGGER = 3
+XFRM_MODE_ROUTEOPTIMIZATION = 2
+XFRM_MODE_TRANSPORT = 0
+XFRM_MODE_TUNNEL = 1
+XFRM_POLICY_ALLOW = 0
+XFRM_POLICY_BLOCK = 1
+XFRM_SHARE_ANY = 0
+XFRM_SHARE_SESSION = 1
+XFRM_SHARE_UNIQUE = 3
+XFRM_SHARE_USER = 2
+XFRM_STATE_AF_UNSPEC = 32
+XFRM_STATE_ALIGN4 = 64
+XFRM_STATE_DECAP_DSCP = 2
+XFRM_STATE_ESN = 128
+XFRM_STATE_ICMP = 16
+XFRM_STATE_NOECN = 1
+XFRM_STATE_NOPMTUDISC = 4
+XFRM_STATE_WILDRECV = 8
 __NR_accept = 43
 __NR_accept4 = 288
 __NR_bind = 49
diff --git a/sys/socket_inet_arm64.const b/sys/socket_inet_arm64.const
index c3589f412..c8d17037f 100644
--- a/sys/socket_inet_arm64.const
+++ b/sys/socket_inet_arm64.const
@@ -88,6 +88,25 @@ SIOCSIFDSTADDR = 35096
 SIOCSIFFLAGS = 35092
 SIOCSIFNETMASK = 35100
 SIOCSIFPFLAGS = 35124
+XFRM_MODE_BEET = 4
+XFRM_MODE_IN_TRIGGER = 3
+XFRM_MODE_ROUTEOPTIMIZATION = 2
+XFRM_MODE_TRANSPORT = 0
+XFRM_MODE_TUNNEL = 1
+XFRM_POLICY_ALLOW = 0
+XFRM_POLICY_BLOCK = 1
+XFRM_SHARE_ANY = 0
+XFRM_SHARE_SESSION = 1
+XFRM_SHARE_UNIQUE = 3
+XFRM_SHARE_USER = 2
+XFRM_STATE_AF_UNSPEC = 32
+XFRM_STATE_ALIGN4 = 64
+XFRM_STATE_DECAP_DSCP = 2
+XFRM_STATE_ESN = 128
+XFRM_STATE_ICMP = 16
+XFRM_STATE_NOECN = 1
+XFRM_STATE_NOPMTUDISC = 4
+XFRM_STATE_WILDRECV = 8
 __NR_accept = 202
 __NR_accept4 = 242
 __NR_bind = 200
diff --git a/sys/socket_inet_dccp.txt b/sys/socket_inet_dccp.txt
index 1a233da78..dc903a711 100644
--- a/sys/socket_inet_dccp.txt
+++ b/sys/socket_inet_dccp.txt
@@ -12,8 +12,8 @@ dccp_pair {
 	f1	sock_dccp
 }
 
-socket$dccp(domain const[AF_INET], type const[SOCK_DCCP], proto const[0]) sock_dccp
-socketpair$dccp(domain const[AF_INET], type const[SOCK_DCCP], proto const[0], fds ptr[out, dccp_pair])
+socket$inet_dccp(domain const[AF_INET], type const[SOCK_DCCP], proto const[0]) sock_dccp
+socketpair$inet_dccp(domain const[AF_INET], type const[SOCK_DCCP], proto const[0], fds ptr[out, dccp_pair])
 
 resource sock_dccp6[sock_in6]
 
@@ -22,8 +22,8 @@ dccp6_pair {
 	f1	sock_dccp6
 }
 
-socket$dccp6(domain const[AF_INET6], type const[SOCK_DCCP], proto const[0]) sock_dccp6
-socketpair$dccp6(domain const[AF_INET6], type const[SOCK_DCCP], proto const[0], fds ptr[out, dccp6_pair])
+socket$inet6_dccp(domain const[AF_INET6], type const[SOCK_DCCP], proto const[0]) sock_dccp6
+socketpair$inet6_dccp(domain const[AF_INET6], type const[SOCK_DCCP], proto const[0], fds ptr[out, dccp6_pair])
 
 # Generic DCCP socket options
 
diff --git a/sys/socket_inet_ppc64le.const b/sys/socket_inet_ppc64le.const
index e81c0d3d3..dfbd05964 100644
--- a/sys/socket_inet_ppc64le.const
+++ b/sys/socket_inet_ppc64le.const
@@ -88,6 +88,25 @@ SIOCSIFDSTADDR = 35096
 SIOCSIFFLAGS = 35092
 SIOCSIFNETMASK = 35100
 SIOCSIFPFLAGS = 35124
+XFRM_MODE_BEET = 4
+XFRM_MODE_IN_TRIGGER = 3
+XFRM_MODE_ROUTEOPTIMIZATION = 2
+XFRM_MODE_TRANSPORT = 0
+XFRM_MODE_TUNNEL = 1
+XFRM_POLICY_ALLOW = 0
+XFRM_POLICY_BLOCK = 1
+XFRM_SHARE_ANY = 0
+XFRM_SHARE_SESSION = 1
+XFRM_SHARE_UNIQUE = 3
+XFRM_SHARE_USER = 2
+XFRM_STATE_AF_UNSPEC = 32
+XFRM_STATE_ALIGN4 = 64
+XFRM_STATE_DECAP_DSCP = 2
+XFRM_STATE_ESN = 128
+XFRM_STATE_ICMP = 16
+XFRM_STATE_NOECN = 1
+XFRM_STATE_NOPMTUDISC = 4
+XFRM_STATE_WILDRECV = 8
 __NR_accept = 330
 __NR_accept4 = 344
 __NR_bind = 327
diff --git a/sys/socket_inet_sctp.txt b/sys/socket_inet_sctp.txt
index ac2ebc50c..67ef363a0 100755
--- a/sys/socket_inet_sctp.txt
+++ b/sys/socket_inet_sctp.txt
@@ -8,19 +8,20 @@ include <asm/ioctls.h>
 
 resource sock_sctp[sock]
 
-socket$sctp(domain const[AF_INET], type flags[sctp_socket_type], proto const[IPPROTO_SCTP]) sock_sctp
-socket$sctp6(domain const[AF_INET6], type flags[sctp_socket_type], proto const[IPPROTO_SCTP]) sock_sctp
-socketpair$sctp(domain const[AF_INET], type flags[sctp_socket_type], proto const[IPPROTO_SCTP], fds ptr[out, sctp_pair])
-bind$sctp(fd sock_sctp, addr ptr[in, sockaddr_sctp], addrlen len[addr])
-connect$sctp(fd sock_sctp, addr ptr[in, sockaddr_sctp], addrlen len[addr])
-accept$sctp(fd sock_sctp, peer ptr[out, sockaddr_sctp, opt], peerlen ptr[inout, len[peer, int32]]) sock_sctp
-accept4$sctp(fd sock_sctp, peer ptr[out, sockaddr_sctp, opt], peerlen ptr[inout, len[peer, int32]], flags flags[accept_flags]) sock_sctp
-sendto$sctp(fd sock_sctp, buf buffer[in], len len[buf], f flags[send_flags], addr ptr[in, sockaddr_sctp, opt], addrlen len[addr])
-sendmsg$sctp(fd sock_sctp, msg ptr[in, msghdr_sctp], f flags[send_flags])
-sendmmsg$sctp(fd sock_sctp, mmsg ptr[in, array[msghdr_sctp]], vlen len[mmsg], f flags[send_flags])
-recvfrom$sctp(fd sock_sctp, buf buffer[out], len len[buf], f flags[recv_flags], addr ptr[in, sockaddr_sctp, opt], addrlen len[addr])
-getsockname$sctp(fd sock_sctp, addr ptr[out, sockaddr_sctp], addrlen ptr[inout, len[addr, int32]])
-getpeername$sctp(fd sock_sctp, peer ptr[out, sockaddr_sctp], peerlen ptr[inout, len[peer, int32]])
+socket$inet_sctp(domain const[AF_INET], type flags[sctp_socket_type], proto const[IPPROTO_SCTP]) sock_sctp
+socket$inet6_sctp(domain const[AF_INET6], type flags[sctp_socket_type], proto const[IPPROTO_SCTP]) sock_sctp
+socketpair$inet_sctp(domain const[AF_INET], type flags[sctp_socket_type], proto const[IPPROTO_SCTP], fds ptr[out, sctp_pair])
+socketpair$inet6_sctp(domain const[AF_INET6], type flags[sctp_socket_type], proto const[IPPROTO_SCTP], fds ptr[out, sctp_pair])
+bind$inet_sctp(fd sock_sctp, addr ptr[in, sockaddr_sctp], addrlen len[addr])
+connect$inet_sctp(fd sock_sctp, addr ptr[in, sockaddr_sctp], addrlen len[addr])
+accept$inet_sctp(fd sock_sctp, peer ptr[out, sockaddr_sctp, opt], peerlen ptr[inout, len[peer, int32]]) sock_sctp
+accept4$inet_sctp(fd sock_sctp, peer ptr[out, sockaddr_sctp, opt], peerlen ptr[inout, len[peer, int32]], flags flags[accept_flags]) sock_sctp
+sendto$inet_sctp(fd sock_sctp, buf buffer[in], len len[buf], f flags[send_flags], addr ptr[in, sockaddr_sctp, opt], addrlen len[addr])
+sendmsg$inet_sctp(fd sock_sctp, msg ptr[in, msghdr_sctp], f flags[send_flags])
+sendmmsg$inet_sctp(fd sock_sctp, mmsg ptr[in, array[msghdr_sctp]], vlen len[mmsg], f flags[send_flags])
+recvfrom$inet_sctp(fd sock_sctp, buf buffer[out], len len[buf], f flags[recv_flags], addr ptr[in, sockaddr_sctp, opt], addrlen len[addr])
+getsockname$inet_sctp(fd sock_sctp, addr ptr[out, sockaddr_sctp], addrlen ptr[inout, len[addr, int32]])
+getpeername$inet_sctp(fd sock_sctp, peer ptr[out, sockaddr_sctp], peerlen ptr[inout, len[peer, int32]])
 
 setsockopt$inet_sctp_SCTP_SOCKOPT_BINDX_ADD(fd sock_sctp, level const[SOL_SCTP], opt const[SCTP_SOCKOPT_BINDX_ADD], val ptr[in, array[sockaddr_sctp]], len bytesize[val])
 setsockopt$inet_sctp_SCTP_SOCKOPT_BINDX_REM(fd sock_sctp, level const[SOL_SCTP], opt const[SCTP_SOCKOPT_BINDX_REM], val ptr[in, array[sockaddr_sctp]], len len[val])
@@ -109,16 +110,6 @@ sockaddr_sctp [
 	in6	sockaddr_in6
 ] [varlen]
 
-sockaddr_storage_in {
-	addr	sockaddr_in
-	pad	array[const[0, int64], 15]
-}
-
-sockaddr_storage_in6 {
-	addr	sockaddr_in6
-	pad	array[const[0, int64], 12]
-}
-
 sockaddr_storage_sctp [
 	in	sockaddr_storage_in
 	in6	sockaddr_storage_in6
diff --git a/sys/socket_inet_tcp.txt b/sys/socket_inet_tcp.txt
index 124151fd8..7c1a3a697 100644
--- a/sys/socket_inet_tcp.txt
+++ b/sys/socket_inet_tcp.txt
@@ -15,8 +15,8 @@ tcp_pair {
 	f1	sock_tcp
 }
 
-socket$tcp(domain const[AF_INET], type const[SOCK_STREAM], proto const[0]) sock_tcp
-socketpair$tcp(domain const[AF_INET], type const[SOCK_STREAM], proto const[0], fds ptr[out, tcp_pair])
+socket$inet_tcp(domain const[AF_INET], type const[SOCK_STREAM], proto const[0]) sock_tcp
+socketpair$inet_tcp(domain const[AF_INET], type const[SOCK_STREAM], proto const[0], fds ptr[out, tcp_pair])
 
 resource sock_tcp6[sock_in6]
 
@@ -25,8 +25,8 @@ tcp6_pair {
 	f1	sock_tcp6
 }
 
-socket$tcp6(domain const[AF_INET6], type const[SOCK_STREAM], proto const[0]) sock_tcp6
-socketpair$tcp6(domain const[AF_INET6], type const[SOCK_STREAM], proto const[0], fds ptr[out, tcp6_pair])
+socket$inet6_tcp(domain const[AF_INET6], type const[SOCK_STREAM], proto const[0]) sock_tcp6
+socketpair$inet6_tcp(domain const[AF_INET6], type const[SOCK_STREAM], proto const[0], fds ptr[out, tcp6_pair])
 
 # Generic TCP socket options
 
diff --git a/sys/socket_inet_udp.txt b/sys/socket_inet_udp.txt
index 52073b21e..9ea37eefb 100644
--- a/sys/socket_inet_udp.txt
+++ b/sys/socket_inet_udp.txt
@@ -14,8 +14,8 @@ udp_pair {
 	f1	sock_udp
 }
 
-socket$udp(domain const[AF_INET], type const[SOCK_DGRAM], proto const[0]) sock_udp
-socketpair$udp(domain const[AF_INET], type const[SOCK_DGRAM], proto const[0], fds ptr[out, udp_pair])
+socket$inet_udp(domain const[AF_INET], type const[SOCK_DGRAM], proto const[0]) sock_udp
+socketpair$inet_udp(domain const[AF_INET], type const[SOCK_DGRAM], proto const[0], fds ptr[out, udp_pair])
 
 resource sock_udp6[sock_in6]
 
@@ -24,8 +24,8 @@ udp6_pair {
 	f1	sock_udp6
 }
 
-socket$udp6(domain const[AF_INET6], type const[SOCK_DGRAM], proto const[0]) sock_udp6
-socketpair$udp6(domain const[AF_INET6], type const[SOCK_DGRAM], proto const[0], fds ptr[out, udp6_pair])
+socket$inet6_udp(domain const[AF_INET6], type const[SOCK_DGRAM], proto const[0]) sock_udp6
+socketpair$inet6_udp(domain const[AF_INET6], type const[SOCK_DGRAM], proto const[0], fds ptr[out, udp6_pair])
 
 # Generic UDP socket options
 
diff --git a/sys/socket_ppc64le.const b/sys/socket_ppc64le.const
index d66e232e1..710750efb 100644
--- a/sys/socket_ppc64le.const
+++ b/sys/socket_ppc64le.const
@@ -114,6 +114,7 @@ SIOCSMIIREG = 35145
 SIOCSPGRP = 35074
 SIOCWANDEV = 35146
 SOCK_CLOEXEC = 524288
+SOCK_DCCP = 6
 SOCK_DGRAM = 2
 SOCK_NONBLOCK = 2048
 SOCK_PACKET = 10