sys: improve ip and ipv6 sockopts

4 files changed, 195 insertions, 64 deletions

diff --git a/sys/socket_inet.txt b/sys/socket_inet.txt
index 94a23ee99..5e1815ac1 100644
--- a/sys/socket_inet.txt
+++ b/sys/socket_inet.txt
@@ -3,6 +3,9 @@
 
 include <linux/ip.h>
 include <linux/ipv6.h>
+include <uapi/linux/netfilter_ipv6/ip6_tables.h>
+
+# IP sockets
 
 resource sock_in[sock]
 
@@ -11,6 +14,22 @@ sock_in_pair {
 	f1	sock_in
 }
 
+in_addr [
+# 0.0.0.0
+	empty		const[0x00000000, int32be]
+# 127.0.0.1
+	loopback	const[0x7f000001, int32be]
+# 255.255.255.255
+	broadcast	const[0xffffffff, int32be]
+]
+
+sockaddr_in {
+	family	const[AF_INET, int16]
+	port	proc[int16be, 20000, 4]
+	addr	in_addr
+	pad     array[const[0, int8], 8]
+}
+
 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
@@ -22,6 +41,8 @@ recvfrom$inet(fd sock_in, buf buffer[out], len len[buf], f flags[recv_flags], ad
 getsockname$inet(fd sock_in, addr ptr[out, sockaddr_in], addrlen ptr[inout, len[addr, int32]])
 getpeername$inet(fd sock_in, peer ptr[out, sockaddr_in], peerlen ptr[inout, len[peer, int32]])
 
+# IPv6 sockets
+
 resource sock_in6[sock]
 
 sock_in6_pair {
@@ -29,63 +50,6 @@ sock_in6_pair {
 	f1	sock_in6
 }
 
-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
-accept4$inet6(fd sock_in6, peer ptr[out, sockaddr_in6, opt], peerlen ptr[inout, len[peer, int32]], flags flags[accept_flags]) sock_in6
-bind$inet6(fd sock_in6, addr ptr[in, sockaddr_in6], addrlen len[addr])
-connect$inet6(fd sock_in6, addr ptr[in, sockaddr_in6], addrlen len[addr])
-sendto$inet6(fd sock_in6, buf buffer[in], len len[buf], f flags[send_flags], addr ptr[in, sockaddr_in6, opt], addrlen len[addr])
-recvfrom$inet6(fd sock_in6, buf buffer[out], len len[buf], f flags[recv_flags], addr ptr[in, sockaddr_in6, opt], addrlen len[addr])
-getsockname$inet6(fd sock_in6, addr ptr[out, sockaddr_in6], addrlen ptr[inout, len[addr, int32]])
-getpeername$inet6(fd sock_in6, peer ptr[out, sockaddr_in6], peerlen ptr[inout, len[peer, int32]])
-
-getsockopt$ip_int(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_int], optval ptr[out, int32], optlen ptr[inout, len[optval, int32]])
-setsockopt$ip_int(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_int], optval ptr[in, int32], optlen len[optval])
-getsockopt$ip_buf(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_buf], optval buffer[out], optlen ptr[inout, len[optval, int32]])
-getsockopt$ip_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$ip_mreq(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_mreq], optval ptr[in, ip_mreq], optlen len[optval])
-getsockopt$ip_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$ip_mreqn(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_mreq], optval ptr[in, ip_mreqn], optlen len[optval])
-getsockopt$ip_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$ip_mreqsrc(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_mreqsrc], optval ptr[in, ip_mreq_source], optlen len[optval])
-setsockopt$ip_msfilter(fd sock_in, level const[IPPROTO_IP], optname const[IP_MSFILTER], optval ptr[in, ip_msfilter], optlen len[optval])
-getsockopt$ip_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$ip_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$ip_opts(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_opts], optval buffer[out], optlen ptr[inout, len[optval, int32]])
-setsockopt$ip_opts(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_opts], optval buffer[in], optlen len[optval])
-getsockopt$ip_pktinfo(fd sock_in, level const[IPPROTO_IP], optname const[IP_PKTINFO], optval ptr[out, in_pktinfo], optlen ptr[inout, len[optval, int32]])
-setsockopt$ip_pktinfo(fd sock_in, level const[IPPROTO_IP], optname const[IP_PKTINFO], optval ptr[in, in_pktinfo], optlen len[optval])
-getsockopt$ip_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$ip_ipsec(fd sock_in, level const[IPPROTO_IP], optname const[IP_IPSEC_POLICY], optval ptr[in, xfrm_filer], optlen len[optval])
-
-getsockopt$ipv6_int(fd sock_in6, level const[IPPROTO_IPV6], optname flags[sockopt_opt_ipv6_int], optval ptr[out, int32], optlen ptr[inout, len[optval, int32]])
-setsockopt$ipv6_int(fd sock_in6, level const[IPPROTO_IPV6], optname flags[sockopt_opt_ipv6_int], optval ptr[in, int32], optlen len[optval])
-getsockopt$ipv6_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$ipv6_mreq(fd sock_in6, level const[IPPROTO_IPV6], optname flags[sockopt_opt_ipv6_mreq], optval ptr[in, ipv6_mreq], optlen len[optval])
-getsockopt$ipv6_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$ipv6_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$ipv6_opts(fd sock_in6, level const[IPPROTO_IPV6], optname const[IPV6_2292PKTOPTIONS], optval buffer[out], optlen ptr[inout, len[optval, int32]])
-setsockopt$ipv6_opts(fd sock_in6, level const[IPPROTO_IPV6], optname const[IPV6_2292PKTOPTIONS], optval buffer[in], optlen len[optval])
-
-sockopt_opt_ip_int = IP_FREEBIND, IP_HDRINCL, IP_MTU, IP_MULTICAST_ALL, IP_MULTICAST_LOOP, IP_MULTICAST_TTL, IP_NODEFRAG, IP_RECVOPTS, IP_RECVORIGDSTADDR, IP_RECVTOS, IP_RECVTTL, IP_RETOPTS, IP_ROUTER_ALERT, IP_TOS, IP_TRANSPARENT, IP_TTL, IP_RECVERR, IP_PASSSEC, IP_MINTTL, IP_CHECKSUM, IP_BIND_ADDRESS_NO_PORT
-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_buf = IP_MSFILTER
-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
-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
-
-in_addr [
-# 0.0.0.0
-	empty		const[0x00000000, int32be]
-# 127.0.0.1
-	loopback	const[0x7f000001, int32be]
-# 255.255.255.255
-	broadcast	const[0xffffffff, int32be]
-]
 
 in6_addr_empty {
 	a0		const[0, int64be]
@@ -102,13 +66,6 @@ in6_addr [
 	loopback	in6_addr_loopback
 ]
 
-sockaddr_in {
-	family	const[AF_INET, int16]
-	port	proc[int16be, 20000, 4]
-	addr	in_addr
-	pad     array[const[0, int8], 8]
-}
-
 sockaddr_in6 {
 	family	const[AF_INET6, int16]
 	port	proc[int16be, 20000, 4]
@@ -132,6 +89,63 @@ sockaddr_storage [
 	in6	sockaddr_storage_in6
 ]
 
+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
+accept4$inet6(fd sock_in6, peer ptr[out, sockaddr_in6, opt], peerlen ptr[inout, len[peer, int32]], flags flags[accept_flags]) sock_in6
+bind$inet6(fd sock_in6, addr ptr[in, sockaddr_in6], addrlen len[addr])
+connect$inet6(fd sock_in6, addr ptr[in, sockaddr_in6], addrlen len[addr])
+sendto$inet6(fd sock_in6, buf buffer[in], len len[buf], f flags[send_flags], addr ptr[in, sockaddr_in6, opt], addrlen len[addr])
+recvfrom$inet6(fd sock_in6, buf buffer[out], len len[buf], f flags[recv_flags], addr ptr[in, sockaddr_in6, opt], addrlen len[addr])
+getsockname$inet6(fd sock_in6, addr ptr[out, sockaddr_in6], addrlen ptr[inout, len[addr, int32]])
+getpeername$inet6(fd sock_in6, peer ptr[out, sockaddr_in6], peerlen ptr[inout, len[peer, int32]])
+
+# Generic IP options
+
+inet_option_types_int = IP_TOS, IP_TTL, IP_HDRINCL, IP_ROUTER_ALERT, IP_RECVOPTS, IP_RETOPTS, IP_PKTINFO, IP_MTU_DISCOVER, IP_RECVERR, IP_RECVTTL, IP_RECVTOS, IP_MTU, IP_FREEBIND, IP_PASSSEC, IP_TRANSPARENT, IP_RECVORIGDSTADDR, IP_MINTTL, IP_NODEFRAG, IP_CHECKSUM, IP_BIND_ADDRESS_NO_PORT, IP_MULTICAST_TTL, IP_MULTICAST_LOOP, IP_MULTICAST_ALL, IP_UNICAST_IF
+
+inet_option_types_buf = IP_OPTIONS, IP_PKTOPTIONS, IP_IPSEC_POLICY, IP_XFRM_POLICY, IP_MULTICAST_IF, IP_ADD_MEMBERSHIP, IP_DROP_MEMBERSHIP, IP_UNBLOCK_SOURCE, IP_BLOCK_SOURCE, IP_ADD_SOURCE_MEMBERSHIP, IP_DROP_SOURCE_MEMBERSHIP, IP_MSFILTER, MCAST_JOIN_GROUP, MCAST_BLOCK_SOURCE, MCAST_UNBLOCK_SOURCE, MCAST_LEAVE_GROUP, MCAST_JOIN_SOURCE_GROUP, MCAST_LEAVE_SOURCE_GROUP, MCAST_MSFILTER
+
+getsockopt$ip_int(fd sock_in, level const[IPPROTO_IP], optname flags[inet_option_types_int], optval ptr[out, int32], optlen ptr[inout, len[optval, int32]])
+setsockopt$ip_int(fd sock_in, level const[IPPROTO_IP], optname flags[inet_option_types_int], optval ptr[in, int32], optlen len[optval])
+getsockopt$ip_buf(fd sock_in, level const[IPPROTO_IP], optname flags[inet_option_types_buf], optval buffer[out], optlen ptr[inout, len[optval, int32]])
+setsockopt$ip_buf(fd sock_in, level const[IPPROTO_IP], optname flags[inet_option_types_buf], optval buffer[in], optlen len[optval])
+
+# 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_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
+
+getsockopt$ip6_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$ip6_int(fd sock_in6, level const[IPPROTO_IPV6], optname flags[inet6_option_types_int], optval ptr[in, int32], optlen len[optval])
+getsockopt$ip6_buf(fd sock_in6, level const[IPPROTO_IPV6], optname flags[inet6_option_types_buf], optval buffer[out], optlen ptr[inout, len[optval, int32]])
+setsockopt$ip6_buf(fd sock_in6, level const[IPPROTO_IPV6], optname flags[inet6_option_types_buf], optval buffer[in], optlen len[optval])
+
+# Specific IP options
+
+getsockopt$ip_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$ip_mreq(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_mreq], optval ptr[in, ip_mreq], optlen len[optval])
+getsockopt$ip_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$ip_mreqn(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_mreq], optval ptr[in, ip_mreqn], optlen len[optval])
+getsockopt$ip_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$ip_mreqsrc(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_mreqsrc], optval ptr[in, ip_mreq_source], optlen len[optval])
+setsockopt$ip_msfilter(fd sock_in, level const[IPPROTO_IP], optname const[IP_MSFILTER], optval ptr[in, ip_msfilter], optlen len[optval])
+getsockopt$ip_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$ip_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$ip_opts(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_opts], optval buffer[out], optlen ptr[inout, len[optval, int32]])
+setsockopt$ip_opts(fd sock_in, level const[IPPROTO_IP], optname flags[sockopt_opt_ip_opts], optval buffer[in], optlen len[optval])
+getsockopt$ip_pktinfo(fd sock_in, level const[IPPROTO_IP], optname const[IP_PKTINFO], optval ptr[out, in_pktinfo], optlen ptr[inout, len[optval, int32]])
+setsockopt$ip_pktinfo(fd sock_in, level const[IPPROTO_IP], optname const[IP_PKTINFO], optval ptr[in, in_pktinfo], optlen len[optval])
+getsockopt$ip_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$ip_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
+
 ip_mreq {
 	multi	in_addr
 	addr	in_addr
@@ -237,6 +251,18 @@ xfrm_in_addr [
 	in6	in6_addr
 ]
 
+# Specific IPv6 options
+
+getsockopt$ipv6_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$ipv6_mreq(fd sock_in6, level const[IPPROTO_IPV6], optname flags[sockopt_opt_ipv6_mreq], optval ptr[in, ipv6_mreq], optlen len[optval])
+getsockopt$ipv6_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$ipv6_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$ipv6_opts(fd sock_in6, level const[IPPROTO_IPV6], optname const[IPV6_2292PKTOPTIONS], optval buffer[out], optlen ptr[inout, len[optval, int32]])
+setsockopt$ipv6_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
+
 ipv6_mreq {
 	multi	in6_addr
 	ifindex	int32
diff --git a/sys/socket_inet_amd64.const b/sys/socket_inet_amd64.const
index d117d3f3f..1f1bc8f70 100644
--- a/sys/socket_inet_amd64.const
+++ b/sys/socket_inet_amd64.const
@@ -1,6 +1,9 @@
 # AUTOGENERATED FILE
 AF_INET = 2
 AF_INET6 = 10
+IP6T_SO_GET_REVISION_MATCH = 68
+IP6T_SO_GET_REVISION_TARGET = 69
+IP6T_SO_ORIGINAL_DST = 80
 IPPROTO_IP = 0
 IPPROTO_IPV6 = 41
 IPV6_2292DSTOPTS = 4
@@ -10,27 +13,50 @@ IPV6_2292PKTINFO = 2
 IPV6_2292PKTOPTIONS = 6
 IPV6_2292RTHDR = 5
 IPV6_ADDRFORM = 1
+IPV6_ADDR_PREFERENCES = 72
 IPV6_ADD_MEMBERSHIP = 20
 IPV6_AUTHHDR = 10
+IPV6_AUTOFLOWLABEL = 70
 IPV6_CHECKSUM = 7
+IPV6_DONTFRAG = 62
 IPV6_DROP_MEMBERSHIP = 21
 IPV6_DSTOPTS = 59
 IPV6_FLOWINFO = 11
+IPV6_FLOWINFO_SEND = 33
+IPV6_FLOWLABEL_MGR = 32
+IPV6_HDRINCL = 36
 IPV6_HOPLIMIT = 52
 IPV6_HOPOPTS = 54
+IPV6_IPSEC_POLICY = 34
 IPV6_JOIN_ANYCAST = 27
 IPV6_LEAVE_ANYCAST = 28
+IPV6_MINHOPCOUNT = 73
 IPV6_MTU = 24
 IPV6_MTU_DISCOVER = 23
 IPV6_MULTICAST_HOPS = 18
 IPV6_MULTICAST_IF = 17
 IPV6_MULTICAST_LOOP = 19
+IPV6_NEXTHOP = 9
+IPV6_PATHMTU = 61
+IPV6_PKTINFO = 50
+IPV6_RECVDSTOPTS = 58
 IPV6_RECVERR = 25
+IPV6_RECVHOPLIMIT = 51
+IPV6_RECVHOPOPTS = 53
+IPV6_RECVORIGDSTADDR = 74
+IPV6_RECVPATHMTU = 60
 IPV6_RECVPKTINFO = 49
+IPV6_RECVRTHDR = 56
+IPV6_RECVTCLASS = 66
 IPV6_ROUTER_ALERT = 22
 IPV6_RTHDR = 57
+IPV6_RTHDRDSTOPTS = 55
+IPV6_TCLASS = 67
+IPV6_TRANSPARENT = 75
 IPV6_UNICAST_HOPS = 16
+IPV6_UNICAST_IF = 76
 IPV6_V6ONLY = 26
+IPV6_XFRM_POLICY = 35
 IP_ADD_MEMBERSHIP = 35
 IP_ADD_SOURCE_MEMBERSHIP = 39
 IP_BIND_ADDRESS_NO_PORT = 24
@@ -71,8 +97,17 @@ IP_TOS = 1
 IP_TRANSPARENT = 19
 IP_TTL = 2
 IP_UNBLOCK_SOURCE = 37
+IP_UNICAST_IF = 50
+IP_XFRM_POLICY = 17
+MCAST_BLOCK_SOURCE = 43
 MCAST_EXCLUDE = 0
 MCAST_INCLUDE = 1
+MCAST_JOIN_GROUP = 42
+MCAST_JOIN_SOURCE_GROUP = 46
+MCAST_LEAVE_GROUP = 45
+MCAST_LEAVE_SOURCE_GROUP = 47
+MCAST_MSFILTER = 48
+MCAST_UNBLOCK_SOURCE = 44
 __NR_accept = 43
 __NR_accept4 = 288
 __NR_bind = 49
diff --git a/sys/socket_inet_arm64.const b/sys/socket_inet_arm64.const
index 19ec6c369..4981542ea 100644
--- a/sys/socket_inet_arm64.const
+++ b/sys/socket_inet_arm64.const
@@ -1,6 +1,9 @@
 # AUTOGENERATED FILE
 AF_INET = 2
 AF_INET6 = 10
+IP6T_SO_GET_REVISION_MATCH = 68
+IP6T_SO_GET_REVISION_TARGET = 69
+IP6T_SO_ORIGINAL_DST = 80
 IPPROTO_IP = 0
 IPPROTO_IPV6 = 41
 IPV6_2292DSTOPTS = 4
@@ -10,27 +13,50 @@ IPV6_2292PKTINFO = 2
 IPV6_2292PKTOPTIONS = 6
 IPV6_2292RTHDR = 5
 IPV6_ADDRFORM = 1
+IPV6_ADDR_PREFERENCES = 72
 IPV6_ADD_MEMBERSHIP = 20
 IPV6_AUTHHDR = 10
+IPV6_AUTOFLOWLABEL = 70
 IPV6_CHECKSUM = 7
+IPV6_DONTFRAG = 62
 IPV6_DROP_MEMBERSHIP = 21
 IPV6_DSTOPTS = 59
 IPV6_FLOWINFO = 11
+IPV6_FLOWINFO_SEND = 33
+IPV6_FLOWLABEL_MGR = 32
+IPV6_HDRINCL = 36
 IPV6_HOPLIMIT = 52
 IPV6_HOPOPTS = 54
+IPV6_IPSEC_POLICY = 34
 IPV6_JOIN_ANYCAST = 27
 IPV6_LEAVE_ANYCAST = 28
+IPV6_MINHOPCOUNT = 73
 IPV6_MTU = 24
 IPV6_MTU_DISCOVER = 23
 IPV6_MULTICAST_HOPS = 18
 IPV6_MULTICAST_IF = 17
 IPV6_MULTICAST_LOOP = 19
+IPV6_NEXTHOP = 9
+IPV6_PATHMTU = 61
+IPV6_PKTINFO = 50
+IPV6_RECVDSTOPTS = 58
 IPV6_RECVERR = 25
+IPV6_RECVHOPLIMIT = 51
+IPV6_RECVHOPOPTS = 53
+IPV6_RECVORIGDSTADDR = 74
+IPV6_RECVPATHMTU = 60
 IPV6_RECVPKTINFO = 49
+IPV6_RECVRTHDR = 56
+IPV6_RECVTCLASS = 66
 IPV6_ROUTER_ALERT = 22
 IPV6_RTHDR = 57
+IPV6_RTHDRDSTOPTS = 55
+IPV6_TCLASS = 67
+IPV6_TRANSPARENT = 75
 IPV6_UNICAST_HOPS = 16
+IPV6_UNICAST_IF = 76
 IPV6_V6ONLY = 26
+IPV6_XFRM_POLICY = 35
 IP_ADD_MEMBERSHIP = 35
 IP_ADD_SOURCE_MEMBERSHIP = 39
 IP_BIND_ADDRESS_NO_PORT = 24
@@ -71,8 +97,17 @@ IP_TOS = 1
 IP_TRANSPARENT = 19
 IP_TTL = 2
 IP_UNBLOCK_SOURCE = 37
+IP_UNICAST_IF = 50
+IP_XFRM_POLICY = 17
+MCAST_BLOCK_SOURCE = 43
 MCAST_EXCLUDE = 0
 MCAST_INCLUDE = 1
+MCAST_JOIN_GROUP = 42
+MCAST_JOIN_SOURCE_GROUP = 46
+MCAST_LEAVE_GROUP = 45
+MCAST_LEAVE_SOURCE_GROUP = 47
+MCAST_MSFILTER = 48
+MCAST_UNBLOCK_SOURCE = 44
 __NR_accept = 202
 __NR_accept4 = 242
 __NR_bind = 200
diff --git a/sys/socket_inet_ppc64le.const b/sys/socket_inet_ppc64le.const
index a2578caed..1e7594d5e 100644
--- a/sys/socket_inet_ppc64le.const
+++ b/sys/socket_inet_ppc64le.const
@@ -1,6 +1,9 @@
 # AUTOGENERATED FILE
 AF_INET = 2
 AF_INET6 = 10
+IP6T_SO_GET_REVISION_MATCH = 68
+IP6T_SO_GET_REVISION_TARGET = 69
+IP6T_SO_ORIGINAL_DST = 80
 IPPROTO_IP = 0
 IPPROTO_IPV6 = 41
 IPV6_2292DSTOPTS = 4
@@ -10,27 +13,50 @@ IPV6_2292PKTINFO = 2
 IPV6_2292PKTOPTIONS = 6
 IPV6_2292RTHDR = 5
 IPV6_ADDRFORM = 1
+IPV6_ADDR_PREFERENCES = 72
 IPV6_ADD_MEMBERSHIP = 20
 IPV6_AUTHHDR = 10
+IPV6_AUTOFLOWLABEL = 70
 IPV6_CHECKSUM = 7
+IPV6_DONTFRAG = 62
 IPV6_DROP_MEMBERSHIP = 21
 IPV6_DSTOPTS = 59
 IPV6_FLOWINFO = 11
+IPV6_FLOWINFO_SEND = 33
+IPV6_FLOWLABEL_MGR = 32
+IPV6_HDRINCL = 36
 IPV6_HOPLIMIT = 52
 IPV6_HOPOPTS = 54
+IPV6_IPSEC_POLICY = 34
 IPV6_JOIN_ANYCAST = 27
 IPV6_LEAVE_ANYCAST = 28
+IPV6_MINHOPCOUNT = 73
 IPV6_MTU = 24
 IPV6_MTU_DISCOVER = 23
 IPV6_MULTICAST_HOPS = 18
 IPV6_MULTICAST_IF = 17
 IPV6_MULTICAST_LOOP = 19
+IPV6_NEXTHOP = 9
+IPV6_PATHMTU = 61
+IPV6_PKTINFO = 50
+IPV6_RECVDSTOPTS = 58
 IPV6_RECVERR = 25
+IPV6_RECVHOPLIMIT = 51
+IPV6_RECVHOPOPTS = 53
+IPV6_RECVORIGDSTADDR = 74
+IPV6_RECVPATHMTU = 60
 IPV6_RECVPKTINFO = 49
+IPV6_RECVRTHDR = 56
+IPV6_RECVTCLASS = 66
 IPV6_ROUTER_ALERT = 22
 IPV6_RTHDR = 57
+IPV6_RTHDRDSTOPTS = 55
+IPV6_TCLASS = 67
+IPV6_TRANSPARENT = 75
 IPV6_UNICAST_HOPS = 16
+IPV6_UNICAST_IF = 76
 IPV6_V6ONLY = 26
+IPV6_XFRM_POLICY = 35
 IP_ADD_MEMBERSHIP = 35
 IP_ADD_SOURCE_MEMBERSHIP = 39
 IP_BIND_ADDRESS_NO_PORT = 24
@@ -71,8 +97,17 @@ IP_TOS = 1
 IP_TRANSPARENT = 19
 IP_TTL = 2
 IP_UNBLOCK_SOURCE = 37
+IP_UNICAST_IF = 50
+IP_XFRM_POLICY = 17
+MCAST_BLOCK_SOURCE = 43
 MCAST_EXCLUDE = 0
 MCAST_INCLUDE = 1
+MCAST_JOIN_GROUP = 42
+MCAST_JOIN_SOURCE_GROUP = 46
+MCAST_LEAVE_GROUP = 45
+MCAST_LEAVE_SOURCE_GROUP = 47
+MCAST_MSFILTER = 48
+MCAST_UNBLOCK_SOURCE = 44
 __NR_accept = 330
 __NR_accept4 = 344
 __NR_bind = 327