sys: rearrange and improve socket.txt

16 files changed, 355 insertions, 173 deletions

diff --git a/sys/socket.txt b/sys/socket.txt
index 7da4f5442..c33fef0fe 100644
--- a/sys/socket.txt
+++ b/sys/socket.txt
@@ -3,9 +3,11 @@
 
 # TODO: due to autobind a socket can bind to port 0, that will result in a random port which is not reproducible
 
+include <linux/if_tun.h>
 include <linux/socket.h>
 include <linux/net.h>
 include <linux/net_tstamp.h>
+include <linux/route.h>
 include <uapi/linux/in.h>
 include <asm/ioctls.h>
 
@@ -13,41 +15,24 @@ 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])
-accept(fd sock, peer ptr[out, sockaddr, opt], peerlen ptr[inout, len[peer, int32]]) sock
-accept4(fd sock, peer ptr[out, sockaddr, opt], peerlen ptr[inout, len[peer, int32]], flags flags[accept_flags]) sock
-bind(fd sock, addr ptr[in, sockaddr], addrlen len[addr])
+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]])
+
 listen(fd sock, backlog int32)
-connect(fd sock, addr ptr[in, sockaddr], addrlen len[addr])
 shutdown(fd sock, how flags[shutdown_flags])
-sendto(fd sock, buf buffer[in], len len[buf], f flags[send_flags], addr ptr[in, sockaddr, opt], addrlen len[addr])
 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])
-recvfrom(fd sock, buf buffer[out], len len[buf], f flags[recv_flags], addr ptr[in, sockaddr, opt], addrlen len[addr])
 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])
-getsockname(fd sock, addr ptr[out, sockaddr], addrlen ptr[inout, len[addr, int32]])
-getpeername(fd sock, peer ptr[out, sockaddr], peerlen ptr[inout, len[peer, int32]])
+
 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])
-ioctl$SIOCOUTQ(fd sock, cmd const[SIOCOUTQ], arg ptr[out, int32])
-ioctl$SIOCINQ(fd sock, cmd const[SIOCINQ], arg ptr[out, int32])
-
-# SOL_SOCKET
-setsockopt$sock_void(fd sock, level const[SOL_SOCKET], optname flags[sockopt_opt_sock_void], optval const[0], optlen const[0])
-getsockopt$sock_int(fd sock, level const[SOL_SOCKET], optname flags[sockopt_opt_sock_int], optval ptr[out, int32], optlen ptr[inout, len[optval, int32]])
-setsockopt$sock_int(fd sock, level const[SOL_SOCKET], optname flags[sockopt_opt_sock_int], optval ptr[in, int32], optlen len[optval])
-setsockopt$sock_str(fd sock, level const[SOL_SOCKET], optname const[SO_BINDTODEVICE], optval ptr[in, string], optlen len[optval])
-getsockopt$sock_linger(fd sock, level const[SOL_SOCKET], optname const[SO_LINGER], optval ptr[out, linger], optlen ptr[inout, len[optval, int32]])
-setsockopt$sock_linger(fd sock, level const[SOL_SOCKET], optname const[SO_LINGER], optval ptr[in, linger], optlen len[optval])
-getsockopt$sock_cred(fd sock, level const[SOL_SOCKET], optname const[SO_PEERCRED], optval ptr[out, ucred], optlen ptr[inout, len[optval, int32]])
-setsockopt$sock_cred(fd sock, level const[SOL_SOCKET], optname const[SO_PEERCRED], optval ptr[in, ucred], optlen len[optval])
-getsockopt$sock_timeval(fd sock, level const[SOL_SOCKET], optname flags[sockopt_opt_sock_timeval], optval ptr[out, timeval], optlen ptr[inout, len[optval, int32]])
-setsockopt$sock_timeval(fd sock, level const[SOL_SOCKET], optname flags[sockopt_opt_sock_timeval], optval ptr[in, timeval], optlen len[optval])
-setsockopt$sock_attach_bpf(fd sock, level const[SOL_SOCKET], optname const[SO_ATTACH_BPF], optval ptr[in, fd_bpf_prog], optlen len[optval])
-setsockopt$SO_TIMESTAMPING(fd sock, level const[SOL_SOCKET], optname const[SO_TIMESTAMPING], optval ptr[in, flags[sockopt_so_timestamping, int32]], optlen len[optval])
-getsockopt$SO_TIMESTAMPING(fd sock, level const[SOL_SOCKET], optname const[SO_TIMESTAMPING], optval ptr[out, int32], optlen ptr[inout, len[optval, int32]])
-setsockopt$SO_ATTACH_FILTER(fd sock, level const[SOL_SOCKET], optname const[SO_ATTACH_FILTER], optval ptr[in, sock_fprog], optlen len[optval])
-getsockopt$sock_buf(fd sock, level const[SOL_SOCKET], optname flags[sockopt_opt_sock_buf], optval buffer[out], optlen ptr[inout, len[optval, int32]])
 
 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
@@ -55,31 +40,105 @@ 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
-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
-sockopt_opt_sock_timeval = SO_RCVTIMEO, SO_SNDTIMEO
-sockopt_opt_sock_buf = SO_BINDTODEVICE, SO_PEERCRED, SO_PEERNAME, SO_PEERSEC, SO_GET_FILTER
-sockopt_so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE, SOF_TIMESTAMPING_TX_SOFTWARE, SOF_TIMESTAMPING_RX_HARDWARE, SOF_TIMESTAMPING_RX_SOFTWARE, SOF_TIMESTAMPING_SOFTWARE, SOF_TIMESTAMPING_SYS_HARDWARE, SOF_TIMESTAMPING_RAW_HARDWARE, SOF_TIMESTAMPING_OPT_ID, SOF_TIMESTAMPING_TX_SCHED, SOF_TIMESTAMPING_TX_ACK, SOF_TIMESTAMPING_OPT_CMSG, SOF_TIMESTAMPING_OPT_TSONLY
 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
 
+# This sockaddr type corresponds to the struct sockaddr and is 16 bytes or less.
 sockaddr [
+# AF_UNIX sockaddr in bigger than 16 bytes
+	in		sockaddr_in
+	ax25		sockaddr_ax25
+	ipx		sockaddr_ipx
+# TODO: AF_APPLETALK
+# AF_NETROM sockaddr is the same as AF_AX25
+# TODO: AF_BRIDGE
+# TODO: AF_ATMPVC
+# TODO: AF_X25
+# AF_INET6 sockaddr is bigger than 16 bytes
+# TODO: AF_ROSE
+# TODO: AF_DECnet
+	nl		sockaddr_nl
+# AF_PACKET sockaddr is bigger than 16 bytes
+# TODO: AF_ATMSVC
+# TODO: AF_RDS
+# TODO: AF_IRDA
+# TODO: AF_PPPOX
+# TODO: AF_LLC
+# TODO: AF_IB
+# TODO: AF_MPLS
+# TODO: AF_CAN
+# TODO: AF_TIPC
+	sco		sockaddr_sco
+	l2		sockaddr_l2
+	hci		sockaddr_hci
+	rc		sockaddr_rc
+# TODO: AF_IUCV
+# TODO: AF_RXRPC
+# TODO: AF_ISDN
+# TODO: AF_PHONET
+# TODO: AF_IEEE802154
+# TODO: AF_CAIF
+# AF_ALG sockaddr is bigger than 16 bytes
+	nfc		sockaddr_nfc
+# TODO: AF_VSOCK
+# TODO: AF_QIPCRTR
+	generic		sockaddr_generic
+]
+
+# This sockaddr can be of arbitrary size and it's meant to be passed as a pointer.
+sockaddr_all [
 	un		sockaddr_un
 	in		sockaddr_in
+	ax25		sockaddr_ax25
+	ipx		sockaddr_ipx
+# TODO: AF_APPLETALK
+# AF_NETROM sockaddr is the same as AF_AX25
+# TODO: AF_BRIDGE
+# TODO: AF_ATMPVC
+# TODO: AF_X25
 	in6		sockaddr_in6
+# TODO: AF_ROSE
+# TODO: AF_DECnet
 	nl		sockaddr_nl
-	ax25		sockaddr_ax25
-	alg		sockaddr_alg
-	nfc		sockaddr_nfc
-	nfc_llcp	sockaddr_nfc_llcp
-	hci		sockaddr_hci
+# TODO: AF_PACKET
+# TODO: AF_ATMSVC
+# TODO: AF_RDS
+# TODO: AF_IRDA
+# TODO: AF_PPPOX
+# TODO: AF_LLC
+# TODO: AF_IB
+# TODO: AF_MPLS
+# TODO: AF_CAN
+# TODO: AF_TIPC
 	sco		sockaddr_sco
 	l2		sockaddr_l2
+	hci		sockaddr_hci
 	rc		sockaddr_rc
-# TODO: other kinds of sockaddrs
+# TODO: AF_IUCV
+# TODO: AF_RXRPC
+# TODO: AF_ISDN
+# TODO: AF_PHONET
+# TODO: AF_IEEE802154
+# TODO: AF_CAIF
+	alg		sockaddr_alg
+	nfc		sockaddr_nfc
+	nfc_llcp	sockaddr_nfc_llcp
+# TODO: AF_VSOCK
+# TODO: AF_QIPCRTR
+	generic		sockaddr_all_generic
 ] [varlen]
 
+sockaddr_generic {
+	sa_family	flags[socket_domain, int16]
+	sa_data		array[int8, 14]
+}
+
+sockaddr_all_generic {
+	sa_family	flags[socket_domain, int16]
+	sa_data		array[int8, 126]
+}
+
 send_msghdr {
-	addr	ptr[in, sockaddr, opt]
+	addr	ptr[in, sockaddr_all, opt]
 	addrlen	len[addr, int32]
 	vec	ptr[in, array[iovec_in]]
 	vlen	len[vec, intptr]
@@ -89,7 +148,7 @@ send_msghdr {
 }
 
 recv_msghdr {
-	addr	ptr[out, sockaddr, opt]
+	addr	ptr[out, sockaddr_all, opt]
 	addrlen	len[addr, int32]
 	vec	ptr[in, array[iovec_out]]
 	vlen	len[vec, intptr]
@@ -104,3 +163,146 @@ cmsghdr {
 	type	int32
 	data	array[int8]
 } [align_ptr]
+
+# Generic socket options
+
+setsockopt$sock_void(fd sock, level const[SOL_SOCKET], optname flags[sockopt_opt_sock_void], optval const[0], optlen const[0])
+getsockopt$sock_int(fd sock, level const[SOL_SOCKET], optname flags[sockopt_opt_sock_int], optval ptr[out, int32], optlen ptr[inout, len[optval, int32]])
+setsockopt$sock_int(fd sock, level const[SOL_SOCKET], optname flags[sockopt_opt_sock_int], optval ptr[in, int32], optlen len[optval])
+setsockopt$sock_str(fd sock, level const[SOL_SOCKET], optname const[SO_BINDTODEVICE], optval ptr[in, string], optlen len[optval])
+getsockopt$sock_linger(fd sock, level const[SOL_SOCKET], optname const[SO_LINGER], optval ptr[out, linger], optlen ptr[inout, len[optval, int32]])
+setsockopt$sock_linger(fd sock, level const[SOL_SOCKET], optname const[SO_LINGER], optval ptr[in, linger], optlen len[optval])
+getsockopt$sock_cred(fd sock, level const[SOL_SOCKET], optname const[SO_PEERCRED], optval ptr[out, ucred], optlen ptr[inout, len[optval, int32]])
+setsockopt$sock_cred(fd sock, level const[SOL_SOCKET], optname const[SO_PEERCRED], optval ptr[in, ucred], optlen len[optval])
+getsockopt$sock_timeval(fd sock, level const[SOL_SOCKET], optname flags[sockopt_opt_sock_timeval], optval ptr[out, timeval], optlen ptr[inout, len[optval, int32]])
+setsockopt$sock_timeval(fd sock, level const[SOL_SOCKET], optname flags[sockopt_opt_sock_timeval], optval ptr[in, timeval], optlen len[optval])
+setsockopt$sock_attach_bpf(fd sock, level const[SOL_SOCKET], optname const[SO_ATTACH_BPF], optval ptr[in, fd_bpf_prog], optlen len[optval])
+setsockopt$SO_TIMESTAMPING(fd sock, level const[SOL_SOCKET], optname const[SO_TIMESTAMPING], optval ptr[in, flags[sockopt_so_timestamping, int32]], optlen len[optval])
+getsockopt$SO_TIMESTAMPING(fd sock, level const[SOL_SOCKET], optname const[SO_TIMESTAMPING], optval ptr[out, int32], optlen ptr[inout, len[optval, int32]])
+setsockopt$SO_ATTACH_FILTER(fd sock, level const[SOL_SOCKET], optname const[SO_ATTACH_FILTER], optval ptr[in, sock_fprog], optlen len[optval])
+getsockopt$sock_buf(fd sock, level const[SOL_SOCKET], optname flags[sockopt_opt_sock_buf], optval buffer[out], optlen ptr[inout, len[optval, int32]])
+
+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
+sockopt_opt_sock_timeval = SO_RCVTIMEO, SO_SNDTIMEO
+sockopt_opt_sock_buf = SO_BINDTODEVICE, SO_PEERCRED, SO_PEERNAME, SO_PEERSEC, SO_GET_FILTER
+sockopt_so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE, SOF_TIMESTAMPING_TX_SOFTWARE, SOF_TIMESTAMPING_RX_HARDWARE, SOF_TIMESTAMPING_RX_SOFTWARE, SOF_TIMESTAMPING_SOFTWARE, SOF_TIMESTAMPING_SYS_HARDWARE, SOF_TIMESTAMPING_RAW_HARDWARE, SOF_TIMESTAMPING_OPT_ID, SOF_TIMESTAMPING_TX_SCHED, SOF_TIMESTAMPING_TX_ACK, SOF_TIMESTAMPING_OPT_CMSG, SOF_TIMESTAMPING_OPT_TSONLY
+
+# Generic socket ioctls
+
+# http://lxr.free-electrons.com/source/include/uapi/linux/sockios.h
+
+ioctl$SIOCOUTQ(fd sock, cmd const[SIOCOUTQ], arg ptr[out, int32])
+ioctl$SIOCINQ(fd sock, cmd const[SIOCINQ], arg ptr[out, int32])
+ioctl$SIOCGIFNAME(fd sock, cmd const[SIOCGIFNAME], arg ptr[inout, ifreq])
+
+# SIOCSIFLINK not used
+
+ioctl$SIOCGIFCONF(fd sock, cmd const[SIOCGIFNAME], arg ptr[inout, ifconf])
+
+# TODO: more here
+
+ifreq {
+	ifr_ifrn	devname
+	ifr_ifru	ifr_ifru
+}
+
+# TODO: use strings
+devname {
+	devname         array[int8, IFNAMSIZ]
+}
+
+ifr_ifru [
+	ifru_addrs	sockaddr
+	ifru_flags	flags[ifru_flags, int16]
+	ifru_ivalue	int32
+	ifru_mtu	int32
+	ifru_map	ifmap
+	ifru_names	devname
+	ifru_data	ptr[in, array[int8, 32]]
+	ifru_settings	if_settings
+]
+
+ifru_flags = IFF_TUN, IFF_TAP, IFF_NO_PI, IFF_ONE_QUEUE, IFF_VNET_HDR, IFF_TUN_EXCL, IFF_MULTI_QUEUE, IFF_ATTACH_QUEUE, IFF_DETACH_QUEUE, IFF_PERSIST, IFF_NOFILTER
+
+ifmap {
+	mem_start	int64
+	mem_end		int64
+	base_addr	int16
+	irq		int8
+	dma		int8
+	port		int8
+}
+
+if_settings {
+	type		int32
+	size		int32
+	ifs_ifsu	ifs_ifsu
+}
+
+ifs_ifsu [
+	raw_hdlc	ptr[in, raw_hdlc_proto]
+	cisco		ptr[in, cisco_proto]
+	fr		ptr[in, fr_proto]
+	fr_pvc		ptr[in, fr_proto_pvc]
+	fr_pvc_info	ptr[in, fr_proto_pvc_info]
+	sync		ptr[in, sync_serial_settings]
+	te1		ptr[in, te1_settings]
+]
+
+raw_hdlc_proto {
+	encode		int16
+	parity		int16
+}
+
+cisco_proto {
+	val		int32
+	timeout		int32
+}
+
+fr_proto {
+	t391		int32
+	t392		int32
+	n391		int32
+	n392		int32
+	n393		int32
+	lmi		int16
+	dce		int16
+}
+
+fr_proto_pvc {
+	dlcl		int32
+}
+
+fr_proto_pvc_info {
+	dlci		int32
+	master		devname
+}
+
+sync_serial_settings {
+	rate		int32
+	type		int32
+	loop		int16
+}
+
+te1_settings {
+	rate		int32
+	type		int32
+	loop		int16
+	slot		int32
+}
+
+ifconf [
+	buf		ifconf_buf
+	req		ifconf_req
+]
+
+ifconf_buf {
+	ifc_len		len[ifcu_buf, int32]
+	ifcu_buf	ptr[inout, array[int8], opt]
+}
+
+ifconf_req {
+	ifc_len		len[ifcu_req, int32]
+	ifcu_req	ptr[inout, ifreq, opt]
+}
diff --git a/sys/socket_amd64.const b/sys/socket_amd64.const
index 0af36e1b4..2da848af5 100644
--- a/sys/socket_amd64.const
+++ b/sys/socket_amd64.const
@@ -9,6 +9,18 @@ AF_NETLINK = 16
 AF_PACKET = 17
 AF_UNIX = 1
 AF_X25 = 9
+IFF_ATTACH_QUEUE = 512
+IFF_DETACH_QUEUE = 1024
+IFF_MULTI_QUEUE = 256
+IFF_NOFILTER = 4096
+IFF_NO_PI = 4096
+IFF_ONE_QUEUE = 8192
+IFF_PERSIST = 2048
+IFF_TAP = 2
+IFF_TUN = 1
+IFF_TUN_EXCL = 32768
+IFF_VNET_HDR = 16384
+IFNAMSIZ = 16
 IPPROTO_ICMP = 1
 MSG_BATCH = 262144
 MSG_CMSG_CLOEXEC = 1073741824
@@ -28,6 +40,7 @@ MSG_WAITALL = 256
 MSG_WAITFORONE = 65536
 SHUT_RD = 0
 SHUT_WR = 1
+SIOCGIFNAME = 35088
 SIOCINQ = 21531
 SIOCOUTQ = 21521
 SOCK_CLOEXEC = 524288
diff --git a/sys/socket_arm64.const b/sys/socket_arm64.const
index 5dc6b5daf..aef08d7a2 100644
--- a/sys/socket_arm64.const
+++ b/sys/socket_arm64.const
@@ -9,6 +9,18 @@ AF_NETLINK = 16
 AF_PACKET = 17
 AF_UNIX = 1
 AF_X25 = 9
+IFF_ATTACH_QUEUE = 512
+IFF_DETACH_QUEUE = 1024
+IFF_MULTI_QUEUE = 256
+IFF_NOFILTER = 4096
+IFF_NO_PI = 4096
+IFF_ONE_QUEUE = 8192
+IFF_PERSIST = 2048
+IFF_TAP = 2
+IFF_TUN = 1
+IFF_TUN_EXCL = 32768
+IFF_VNET_HDR = 16384
+IFNAMSIZ = 16
 IPPROTO_ICMP = 1
 MSG_BATCH = 262144
 MSG_CMSG_CLOEXEC = 1073741824
@@ -28,6 +40,7 @@ MSG_WAITALL = 256
 MSG_WAITFORONE = 65536
 SHUT_RD = 0
 SHUT_WR = 1
+SIOCGIFNAME = 35088
 SIOCINQ = 21531
 SIOCOUTQ = 21521
 SOCK_CLOEXEC = 524288
diff --git a/sys/socket_inet.txt b/sys/socket_inet.txt
index 5e1815ac1..0d73c286b 100644
--- a/sys/socket_inet.txt
+++ b/sys/socket_inet.txt
@@ -3,6 +3,7 @@
 
 include <linux/ip.h>
 include <linux/ipv6.h>
+include <linux/route.h>
 include <uapi/linux/netfilter_ipv6/ip6_tables.h>
 
 # IP sockets
@@ -267,3 +268,33 @@ ipv6_mreq {
 	multi	in6_addr
 	ifindex	int32
 }
+
+# IP ioctls
+
+# http://lxr.free-electrons.com/source/include/uapi/linux/sockios.h
+
+ioctl$inet_SIOCADDRT(fd sock_in, cmd const[SIOCADDRT], arg ptr[in, rtentry_in])
+ioctl$inet_SIOCDELRT(fd sock_in, cmd const[SIOCDELRT], arg ptr[in, rtentry_in])
+ioctl$inet_SIOCRTMSG(fd sock_in, cmd const[SIOCRTMSG], arg ptr[in, rtentry_in])
+
+# TODO: more here
+
+rtentry_in {
+	rt_pad1		int64
+	rt_dst		sockaddr_in
+	rt_gateway	sockaddr_in
+	rt_genmask	sockaddr_in
+	rt_flags	flags[rt_flags, int16]
+	rt_pad2		int16
+	rt_pad3		int64
+	rt_pad4		intptr
+	rt_metric	int16
+	rt_dev		ptr[in, devname, opt]
+	rt_mtu		int64
+	rt_window	int64
+	rt_irtt		int16
+}
+
+rt_flags = RTF_UP, RTF_GATEWAY, RTF_HOST, RTF_REINSTATE, RTF_DYNAMIC, RTF_MODIFIED, RTF_MTU, RTF_WINDOW, RTF_IRTT, RTF_REJECT
+
+# TODO: ipv6 ioctls
diff --git a/sys/socket_inet_amd64.const b/sys/socket_inet_amd64.const
index 1f1bc8f70..27e8f1c2c 100644
--- a/sys/socket_inet_amd64.const
+++ b/sys/socket_inet_amd64.const
@@ -108,6 +108,19 @@ MCAST_LEAVE_GROUP = 45
 MCAST_LEAVE_SOURCE_GROUP = 47
 MCAST_MSFILTER = 48
 MCAST_UNBLOCK_SOURCE = 44
+RTF_DYNAMIC = 16
+RTF_GATEWAY = 2
+RTF_HOST = 4
+RTF_IRTT = 256
+RTF_MODIFIED = 32
+RTF_MTU = 64
+RTF_REINSTATE = 8
+RTF_REJECT = 512
+RTF_UP = 1
+RTF_WINDOW = 128
+SIOCADDRT = 35083
+SIOCDELRT = 35084
+SIOCRTMSG = 35085
 __NR_accept = 43
 __NR_accept4 = 288
 __NR_bind = 49
@@ -115,6 +128,7 @@ __NR_connect = 42
 __NR_getpeername = 52
 __NR_getsockname = 51
 __NR_getsockopt = 55
+__NR_ioctl = 16
 __NR_recvfrom = 45
 __NR_sendto = 44
 __NR_setsockopt = 54
diff --git a/sys/socket_inet_arm64.const b/sys/socket_inet_arm64.const
index 4981542ea..ff57ab6e0 100644
--- a/sys/socket_inet_arm64.const
+++ b/sys/socket_inet_arm64.const
@@ -108,6 +108,19 @@ MCAST_LEAVE_GROUP = 45
 MCAST_LEAVE_SOURCE_GROUP = 47
 MCAST_MSFILTER = 48
 MCAST_UNBLOCK_SOURCE = 44
+RTF_DYNAMIC = 16
+RTF_GATEWAY = 2
+RTF_HOST = 4
+RTF_IRTT = 256
+RTF_MODIFIED = 32
+RTF_MTU = 64
+RTF_REINSTATE = 8
+RTF_REJECT = 512
+RTF_UP = 1
+RTF_WINDOW = 128
+SIOCADDRT = 35083
+SIOCDELRT = 35084
+SIOCRTMSG = 35085
 __NR_accept = 202
 __NR_accept4 = 242
 __NR_bind = 200
@@ -115,6 +128,7 @@ __NR_connect = 203
 __NR_getpeername = 205
 __NR_getsockname = 204
 __NR_getsockopt = 209
+__NR_ioctl = 29
 __NR_recvfrom = 207
 __NR_sendto = 206
 __NR_setsockopt = 208
diff --git a/sys/socket_inet_ppc64le.const b/sys/socket_inet_ppc64le.const
index 1e7594d5e..2ac853db0 100644
--- a/sys/socket_inet_ppc64le.const
+++ b/sys/socket_inet_ppc64le.const
@@ -108,6 +108,19 @@ MCAST_LEAVE_GROUP = 45
 MCAST_LEAVE_SOURCE_GROUP = 47
 MCAST_MSFILTER = 48
 MCAST_UNBLOCK_SOURCE = 44
+RTF_DYNAMIC = 16
+RTF_GATEWAY = 2
+RTF_HOST = 4
+RTF_IRTT = 256
+RTF_MODIFIED = 32
+RTF_MTU = 64
+RTF_REINSTATE = 8
+RTF_REJECT = 512
+RTF_UP = 1
+RTF_WINDOW = 128
+SIOCADDRT = 35083
+SIOCDELRT = 35084
+SIOCRTMSG = 35085
 __NR_accept = 330
 __NR_accept4 = 344
 __NR_bind = 327
@@ -115,6 +128,7 @@ __NR_connect = 328
 __NR_getpeername = 332
 __NR_getsockname = 331
 __NR_getsockopt = 340
+__NR_ioctl = 54
 __NR_recvfrom = 337
 __NR_sendto = 335
 __NR_setsockopt = 339
diff --git a/sys/socket_netrom.txt b/sys/socket_netrom.txt
index d346e85d0..37d709761 100755
--- a/sys/socket_netrom.txt
+++ b/sys/socket_netrom.txt
@@ -29,27 +29,13 @@ getsockopt$NETROM_N2(fd sock_netrom, level const[SOL_NETROM], opt const[NETROM_N
 getsockopt$NETROM_T4(fd sock_netrom, level const[SOL_NETROM], opt const[NETROM_T4], arg ptr[in, int32], arglen ptr[inout, len[arg, int32]])
 getsockopt$NETROM_IDLE(fd sock_netrom, level const[SOL_NETROM], opt const[NETROM_IDLE], arg ptr[in, int32], arglen ptr[inout, len[arg, int32]])
 
+# TODO: make these more generic
 ioctl$NETROM_TIOCOUTQ(fd sock_netrom, cmd const[TIOCOUTQ], arg ptr[out, int32])
 ioctl$NETROM_TIOCINQ(fd sock_netrom, cmd const[TIOCINQ], arg ptr[out, int32])
 ioctl$NETROM_SIOCGSTAMP(fd sock_netrom, cmd const[SIOCGSTAMP], arg ptr[out, int32])
 ioctl$NETROM_SIOCGSTAMPNS(fd sock_netrom, cmd const[SIOCGSTAMPNS], arg ptr[out, int32])
 ioctl$NETROM_SIOCADDRT(fd sock_netrom, cmd const[SIOCADDRT], arg ptr[out, int32])
 
-ax25_address {
-	call	array[int8, 7]
-}
-
-sockaddr_ax25 {
-	family	const[AF_NETROM, int16]
-	call	ax25_address
-	ndigis	int32
-}
-
-full_sockaddr_ax25 {
-	ax25	sockaddr_ax25
-	dig	array[ax25_address, AX25_MAX_DIGIS]
-}
-
 sockaddr_netrom [
 	ax25	sockaddr_ax25
 	full	full_sockaddr_ax25
diff --git a/sys/socket_netrom_amd64.const b/sys/socket_netrom_amd64.const
index 2474fe63f..6580d78cf 100644
--- a/sys/socket_netrom_amd64.const
+++ b/sys/socket_netrom_amd64.const
@@ -1,6 +1,5 @@
 # AUTOGENERATED FILE
 AF_NETROM = 6
-AX25_MAX_DIGIS = 8
 NETROM_IDLE = 7
 NETROM_N2 = 3
 NETROM_T1 = 1
diff --git a/sys/socket_netrom_arm64.const b/sys/socket_netrom_arm64.const
index 1ecee7cdc..1e8f9a5c4 100644
--- a/sys/socket_netrom_arm64.const
+++ b/sys/socket_netrom_arm64.const
@@ -1,6 +1,5 @@
 # AUTOGENERATED FILE
 AF_NETROM = 6
-AX25_MAX_DIGIS = 8
 NETROM_IDLE = 7
 NETROM_N2 = 3
 NETROM_T1 = 1
diff --git a/sys/socket_netrom_ppc64le.const b/sys/socket_netrom_ppc64le.const
index 322abdf38..29eb98987 100644
--- a/sys/socket_netrom_ppc64le.const
+++ b/sys/socket_netrom_ppc64le.const
@@ -1,6 +1,5 @@
 # AUTOGENERATED FILE
 AF_NETROM = 6
-AX25_MAX_DIGIS = 8
 NETROM_IDLE = 7
 NETROM_N2 = 3
 NETROM_T1 = 1
diff --git a/sys/socket_ppc64le.const b/sys/socket_ppc64le.const
index ac4d19c90..d4243b037 100644
--- a/sys/socket_ppc64le.const
+++ b/sys/socket_ppc64le.const
@@ -9,6 +9,18 @@ AF_NETLINK = 16
 AF_PACKET = 17
 AF_UNIX = 1
 AF_X25 = 9
+IFF_ATTACH_QUEUE = 512
+IFF_DETACH_QUEUE = 1024
+IFF_MULTI_QUEUE = 256
+IFF_NOFILTER = 4096
+IFF_NO_PI = 4096
+IFF_ONE_QUEUE = 8192
+IFF_PERSIST = 2048
+IFF_TAP = 2
+IFF_TUN = 1
+IFF_TUN_EXCL = 32768
+IFF_VNET_HDR = 16384
+IFNAMSIZ = 16
 IPPROTO_ICMP = 1
 MSG_BATCH = 262144
 MSG_CMSG_CLOEXEC = 1073741824
@@ -28,6 +40,7 @@ MSG_WAITALL = 256
 MSG_WAITFORONE = 65536
 SHUT_RD = 0
 SHUT_WR = 1
+SIOCGIFNAME = 35088
 SIOCINQ = 1074030207
 SIOCOUTQ = 1074033779
 SOCK_CLOEXEC = 524288
diff --git a/sys/tun.txt b/sys/tun.txt
index a730ed86a..0e1f07e85 100755
--- a/sys/tun.txt
+++ b/sys/tun.txt
@@ -57,87 +57,5 @@ tun_filter {
 	addr	ptr[in, array[int8, 6]]
 }
 
-ifreq {
-	name	array[int8, 16]
-	u	ifr_ifru
-}
-
-ifr_ifru [
-	addr	sockaddr_storage
-	flags	flags[ifru_flags, int16]
-	mtu	int32
-	map	ifmap
-	data	array[int8, 16]
-	setting	if_settings
-]
-
-ifmap {
-	start	int32
-	end	int32
-	base	int16
-	irq	int8
-	dma	int8
-	port	int8
-}
-
-if_settings {
-	type	int32
-	size	int32
-	u	ifs_ifsu
-}
-
-ifs_ifsu [
-	hdlc	ptr[in, raw_hdlc_proto]
-	cisco	ptr[in, cisco_proto]
-	fr	ptr[in, fr_proto]
-	pvc	ptr[in, fr_proto_pvc]
-	pvcinfo	ptr[in, fr_proto_pvc_info]
-	sync	ptr[in, sync_serial_settings]
-	tel	ptr[in, te1_settings]
-]
-
-raw_hdlc_proto {
-	encode	int16
-	parity	int16
-}
-
-cisco_proto{
-	val	int32
-	timeout	int32
-}
-
-fr_proto {
-	t391	int32
-	t392	int32
-	n391	int32
-	n392	int32
-	n393	int32
-	lmi	int16
-	dce	int16
-}
-
-fr_proto_pvc {
-	dlcl	int32
-}
-
-fr_proto_pvc_info {
-	dlci	int32
-	master	array[int8, 16]
-}
-
-sync_serial_settings {
-	rate	int32
-	type	int32
-	loop	int16
-}
-
-te1_settings {
-	rate	int32
-	type	int32
-	loop	int16
-	slot	int16
-}
-
 virtio_net_flags = VIRTIO_NET_HDR_F_NEEDS_CSUM, VIRTIO_NET_HDR_F_DATA_VALID
 virtio_net_types = VIRTIO_NET_HDR_GSO_NONE, VIRTIO_NET_HDR_GSO_TCPV4, VIRTIO_NET_HDR_GSO_UDP, VIRTIO_NET_HDR_GSO_TCPV6, VIRTIO_NET_HDR_GSO_ECN
-ifru_flags = IFF_TUN, IFF_TAP, IFF_NO_PI, IFF_ONE_QUEUE, IFF_VNET_HDR, IFF_TUN_EXCL, IFF_MULTI_QUEUE, IFF_ATTACH_QUEUE, IFF_DETACH_QUEUE, IFF_PERSIST, IFF_NOFILTER
diff --git a/sys/tun_amd64.const b/sys/tun_amd64.const
index 39a710df7..70a4892c2 100644
--- a/sys/tun_amd64.const
+++ b/sys/tun_amd64.const
@@ -1,15 +1,4 @@
 # AUTOGENERATED FILE
-IFF_ATTACH_QUEUE = 512
-IFF_DETACH_QUEUE = 1024
-IFF_MULTI_QUEUE = 256
-IFF_NOFILTER = 4096
-IFF_NO_PI = 4096
-IFF_ONE_QUEUE = 8192
-IFF_PERSIST = 2048
-IFF_TAP = 2
-IFF_TUN = 1
-IFF_TUN_EXCL = 32768
-IFF_VNET_HDR = 16384
 SIOCGIFHWADDR = 35111
 SIOCSIFHWADDR = 35108
 TUNATTACHFILTER = 1074812117
diff --git a/sys/tun_arm64.const b/sys/tun_arm64.const
index 0aab839b9..c9d7a4966 100644
--- a/sys/tun_arm64.const
+++ b/sys/tun_arm64.const
@@ -1,15 +1,4 @@
 # AUTOGENERATED FILE
-IFF_ATTACH_QUEUE = 512
-IFF_DETACH_QUEUE = 1024
-IFF_MULTI_QUEUE = 256
-IFF_NOFILTER = 4096
-IFF_NO_PI = 4096
-IFF_ONE_QUEUE = 8192
-IFF_PERSIST = 2048
-IFF_TAP = 2
-IFF_TUN = 1
-IFF_TUN_EXCL = 32768
-IFF_VNET_HDR = 16384
 SIOCGIFHWADDR = 35111
 SIOCSIFHWADDR = 35108
 TUNATTACHFILTER = 1074812117
diff --git a/sys/tun_ppc64le.const b/sys/tun_ppc64le.const
index 8ddb410a6..92beeee98 100644
--- a/sys/tun_ppc64le.const
+++ b/sys/tun_ppc64le.const
@@ -1,15 +1,4 @@
 # AUTOGENERATED FILE
-IFF_ATTACH_QUEUE = 512
-IFF_DETACH_QUEUE = 1024
-IFF_MULTI_QUEUE = 256
-IFF_NOFILTER = 4096
-IFF_NO_PI = 4096
-IFF_ONE_QUEUE = 8192
-IFF_PERSIST = 2048
-IFF_TAP = 2
-IFF_TUN = 1
-IFF_TUN_EXCL = 32768
-IFF_VNET_HDR = 16384
 SIOCGIFHWADDR = 35111
 SIOCSIFHWADDR = 35108
 TUNATTACHFILTER = 2148553941