]> granicus.if.org Git - strace/blobdiff - net.c
tests: add a test for -yy option
[strace] / net.c
diff --git a/net.c b/net.c
index a466efe0519d87fbe6c638de83a10e5551e57a86..46c491f8f6d78763c90f8fdcf20842d418c1dbae 100644 (file)
--- a/net.c
+++ b/net.c
 # define PF_UNSPEC AF_UNSPEC
 #endif
 
-static const struct xlat domains[] = {
-#ifdef PF_UNSPEC
-       XLAT(PF_UNSPEC),
-#endif
-#ifdef PF_LOCAL
-       XLAT(PF_LOCAL),
-#endif
-#ifdef PF_UNIX
-       XLAT(PF_UNIX),
-#endif
-#ifdef PF_INET
-       XLAT(PF_INET),
-#endif
-#ifdef PF_AX25
-       XLAT(PF_AX25),
-#endif
-#ifdef PF_IPX
-       XLAT(PF_IPX),
-#endif
-#ifdef PF_APPLETALK
-       XLAT(PF_APPLETALK),
-#endif
-#ifdef PF_NETROM
-       XLAT(PF_NETROM),
-#endif
-#ifdef PF_BRIDGE
-       XLAT(PF_BRIDGE),
-#endif
-#ifdef PF_ATMPVC
-       XLAT(PF_ATMPVC),
-#endif
-#ifdef PF_X25
-       XLAT(PF_X25),
-#endif
-#ifdef PF_INET6
-       XLAT(PF_INET6),
-#endif
-#ifdef PF_ROSE
-       XLAT(PF_ROSE),
-#endif
-#ifdef PF_DECnet
-       XLAT(PF_DECnet),
-#endif
-#ifdef PF_NETBEUI
-       XLAT(PF_NETBEUI),
-#endif
-#ifdef PF_SECURITY
-       XLAT(PF_SECURITY),
-#endif
-#ifdef PF_KEY
-       XLAT(PF_KEY),
-#endif
-#ifdef PF_NETLINK
-       XLAT(PF_NETLINK),
-#endif
-#ifdef PF_ROUTE
-       XLAT(PF_ROUTE),
-#endif
-#ifdef PF_PACKET
-       XLAT(PF_PACKET),
-#endif
-#ifdef PF_ASH
-       XLAT(PF_ASH),
-#endif
-#ifdef PF_ECONET
-       XLAT(PF_ECONET),
-#endif
-#ifdef PF_ATMSVC
-       XLAT(PF_ATMSVC),
-#endif
-#ifdef PF_RDS
-       XLAT(PF_RDS),
-#endif
-#ifdef PF_SNA
-       XLAT(PF_SNA),
-#endif
-#ifdef PF_IRDA
-       XLAT(PF_IRDA),
-#endif
-#ifdef PF_PPPOX
-       XLAT(PF_PPPOX),
-#endif
-#ifdef PF_WANPIPE
-       XLAT(PF_WANPIPE),
-#endif
-#ifdef PF_LLC
-       XLAT(PF_LLC),
-#endif
-#ifdef PF_CAN
-       XLAT(PF_CAN),
-#endif
-#ifdef PF_TIPC
-       XLAT(PF_TIPC),
-#endif
-#ifdef PF_BLUETOOTH
-       XLAT(PF_BLUETOOTH),
-#endif
-#ifdef PF_IUCV
-       XLAT(PF_IUCV),
-#endif
-#ifdef PF_RXRPC
-       XLAT(PF_RXRPC),
-#endif
-#ifdef PF_ISDN
-       XLAT(PF_ISDN),
-#endif
-#ifdef PF_PHONET
-       XLAT(PF_PHONET),
-#endif
-#ifdef PF_IEEE802154
-       XLAT(PF_IEEE802154),
-#endif
-#ifdef PF_CAIF
-       XLAT(PF_CAIF),
-#endif
-#ifdef PF_ALG
-       XLAT(PF_ALG),
-#endif
-#ifdef PF_NFC
-       XLAT(PF_NFC),
-#endif
-#ifdef PF_VSOCK
-       XLAT(PF_VSOCK),
-#endif
-       XLAT_END
-};
-const struct xlat addrfams[] = {
-#ifdef AF_UNSPEC
-       XLAT(AF_UNSPEC),
-#endif
-#ifdef AF_LOCAL
-       XLAT(AF_LOCAL),
-#endif
-#ifdef AF_UNIX
-       XLAT(AF_UNIX),
-#endif
-#ifdef AF_INET
-       XLAT(AF_INET),
-#endif
-#ifdef AF_AX25
-       XLAT(AF_AX25),
-#endif
-#ifdef AF_IPX
-       XLAT(AF_IPX),
-#endif
-#ifdef AF_APPLETALK
-       XLAT(AF_APPLETALK),
-#endif
-#ifdef AF_NETROM
-       XLAT(AF_NETROM),
-#endif
-#ifdef AF_BRIDGE
-       XLAT(AF_BRIDGE),
-#endif
-#ifdef AF_ATMPVC
-       XLAT(AF_ATMPVC),
-#endif
-#ifdef AF_X25
-       XLAT(AF_X25),
-#endif
-#ifdef AF_INET6
-       XLAT(AF_INET6),
-#endif
-#ifdef AF_ROSE
-       XLAT(AF_ROSE),
-#endif
-#ifdef AF_DECnet
-       XLAT(AF_DECnet),
-#endif
-#ifdef AF_NETBEUI
-       XLAT(AF_NETBEUI),
-#endif
-#ifdef AF_SECURITY
-       XLAT(AF_SECURITY),
-#endif
-#ifdef AF_KEY
-       XLAT(AF_KEY),
-#endif
-#ifdef AF_NETLINK
-       XLAT(AF_NETLINK),
-#endif
-#ifdef AF_ROUTE
-       XLAT(AF_ROUTE),
-#endif
-#ifdef AF_PACKET
-       XLAT(AF_PACKET),
-#endif
-#ifdef AF_ASH
-       XLAT(AF_ASH),
-#endif
-#ifdef AF_ECONET
-       XLAT(AF_ECONET),
-#endif
-#ifdef AF_ATMSVC
-       XLAT(AF_ATMSVC),
-#endif
-#ifdef AF_RDS
-       XLAT(AF_RDS),
-#endif
-#ifdef AF_SNA
-       XLAT(AF_SNA),
-#endif
-#ifdef AF_IRDA
-       XLAT(AF_IRDA),
-#endif
-#ifdef AF_PPPOX
-       XLAT(AF_PPPOX),
-#endif
-#ifdef AF_WANPIPE
-       XLAT(AF_WANPIPE),
-#endif
-#ifdef AF_LLC
-       XLAT(AF_LLC),
-#endif
-#ifdef AF_CAN
-       XLAT(AF_CAN),
-#endif
-#ifdef AF_TIPC
-       XLAT(AF_TIPC),
-#endif
-#ifdef AF_BLUETOOTH
-       XLAT(AF_BLUETOOTH),
-#endif
-#ifdef AF_IUCV
-       XLAT(AF_IUCV),
-#endif
-#ifdef AF_RXRPC
-       XLAT(AF_RXRPC),
-#endif
-#ifdef AF_ISDN
-       XLAT(AF_ISDN),
-#endif
-#ifdef AF_PHONET
-       XLAT(AF_PHONET),
-#endif
-#ifdef AF_IEEE802154
-       XLAT(AF_IEEE802154),
-#endif
-#ifdef AF_CAIF
-       XLAT(AF_CAIF),
-#endif
-#ifdef AF_ALG
-       XLAT(AF_ALG),
-#endif
-#ifdef AF_NFC
-       XLAT(AF_NFC),
-#endif
-#ifdef AF_VSOCK
-       XLAT(AF_VSOCK),
-#endif
-       XLAT_END
-};
-static const struct xlat socktypes[] = {
-       XLAT(SOCK_STREAM),
-       XLAT(SOCK_DGRAM),
-#ifdef SOCK_RAW
-       XLAT(SOCK_RAW),
-#endif
-#ifdef SOCK_RDM
-       XLAT(SOCK_RDM),
-#endif
-#ifdef SOCK_SEQPACKET
-       XLAT(SOCK_SEQPACKET),
-#endif
-#ifdef SOCK_DCCP
-       XLAT(SOCK_DCCP),
-#endif
-#ifdef SOCK_PACKET
-       XLAT(SOCK_PACKET),
-#endif
-       XLAT_END
-};
-static const struct xlat sock_type_flags[] = {
-#ifdef SOCK_CLOEXEC
-       XLAT(SOCK_CLOEXEC),
-#endif
-#ifdef SOCK_NONBLOCK
-       XLAT(SOCK_NONBLOCK),
-#endif
-       XLAT_END
-};
+#include "xlat/domains.h"
+#include "xlat/addrfams.h"
+#include "xlat/socktypes.h"
+#include "xlat/sock_type_flags.h"
 #ifndef SOCK_TYPE_MASK
 # define SOCK_TYPE_MASK 0xf
 #endif
-static const struct xlat socketlayers[] = {
-#if defined(SOL_IP)
-       XLAT(SOL_IP),
-#endif
-#if defined(SOL_ICMP)
-       XLAT(SOL_ICMP),
-#endif
-#if defined(SOL_TCP)
-       XLAT(SOL_TCP),
-#endif
-#if defined(SOL_UDP)
-       XLAT(SOL_UDP),
-#endif
-#if defined(SOL_IPV6)
-       XLAT(SOL_IPV6),
-#endif
-#if defined(SOL_ICMPV6)
-       XLAT(SOL_ICMPV6),
-#endif
-#if defined(SOL_SCTP)
-       XLAT(SOL_SCTP),
-#endif
-#if defined(SOL_UDPLITE)
-       XLAT(SOL_UDPLITE),
-#endif
-#if defined(SOL_RAW)
-       XLAT(SOL_RAW),
-#endif
-#if defined(SOL_IPX)
-       XLAT(SOL_IPX),
-#endif
-#if defined(SOL_AX25)
-       XLAT(SOL_AX25),
-#endif
-#if defined(SOL_ATALK)
-       XLAT(SOL_ATALK),
-#endif
-#if defined(SOL_NETROM)
-       XLAT(SOL_NETROM),
-#endif
-#if defined(SOL_ROSE)
-       XLAT(SOL_ROSE),
-#endif
-#if defined(SOL_DECNET)
-       XLAT(SOL_DECNET),
-#endif
-#if defined(SOL_X25)
-       XLAT(SOL_X25),
-#endif
-#if defined(SOL_PACKET)
-       XLAT(SOL_PACKET),
-#endif
-#if defined(SOL_ATM)
-       XLAT(SOL_ATM),
-#endif
-#if defined(SOL_AAL)
-       XLAT(SOL_AAL),
-#endif
-#if defined(SOL_IRDA)
-       XLAT(SOL_IRDA),
-#endif
-#if defined(SOL_NETBEUI)
-       XLAT(SOL_NETBEUI),
-#endif
-#if defined(SOL_LLC)
-       XLAT(SOL_LLC),
-#endif
-#if defined(SOL_DCCP)
-       XLAT(SOL_DCCP),
-#endif
-#if defined(SOL_NETLINK)
-       XLAT(SOL_NETLINK),
-#endif
-#if defined(SOL_TIPC)
-       XLAT(SOL_TIPC),
-#endif
-#if defined(SOL_RXRPC)
-       XLAT(SOL_RXRPC),
-#endif
-#if defined(SOL_PPPOL2TP)
-       XLAT(SOL_PPPOL2TP),
-#endif
-#if defined(SOL_BLUETOOTH)
-       XLAT(SOL_BLUETOOTH),
-#endif
-#if defined(SOL_PNPIPE)
-       XLAT(SOL_PNPIPE),
-#endif
-#if defined(SOL_RDS)
-       XLAT(SOL_RDS),
-#endif
-#if defined(SOL_IUVC)
-       XLAT(SOL_IUCV),
-#endif
-#if defined(SOL_CAIF)
-       XLAT(SOL_CAIF),
-#endif
-       XLAT(SOL_SOCKET),       /* Never used! */
-       /* The SOL_* array should remain not NULL-terminated. */
-};
+#include "xlat/socketlayers.h"
 /*** WARNING: DANGER WILL ROBINSON: NOTE "socketlayers" array above
      falls into "inet_protocols" array below!!!!   This is intended!!! ***/
-static const struct xlat inet_protocols[] = {
-       XLAT(IPPROTO_IP),
-       XLAT(IPPROTO_ICMP),
-       XLAT(IPPROTO_TCP),
-       XLAT(IPPROTO_UDP),
-#ifdef IPPROTO_IGMP
-       XLAT(IPPROTO_IGMP),
-#endif
-#ifdef IPPROTO_GGP
-       XLAT(IPPROTO_GGP),
-#endif
-#ifdef IPPROTO_IPIP
-       XLAT(IPPROTO_IPIP),
-#endif
-#ifdef IPPROTO_EGP
-       XLAT(IPPROTO_EGP),
-#endif
-#ifdef IPPROTO_PUP
-       XLAT(IPPROTO_PUP),
-#endif
-#ifdef IPPROTO_IDP
-       XLAT(IPPROTO_IDP),
-#endif
-#ifdef IPPROTO_TP
-       XLAT(IPPROTO_TP),
-#endif
-#ifdef IPPROTO_DCCP
-       XLAT(IPPROTO_DCCP),
-#endif
-#ifdef IPPROTO_IPV6
-       XLAT(IPPROTO_IPV6),
-#endif
-#ifdef IPPROTO_ROUTING
-       XLAT(IPPROTO_ROUTING),
-#endif
-#ifdef IPPROTO_FRAGMENT
-       XLAT(IPPROTO_FRAGMENT),
-#endif
-#ifdef IPPROTO_RSVP
-       XLAT(IPPROTO_RSVP),
-#endif
-#ifdef IPPROTO_GRE
-       XLAT(IPPROTO_GRE),
-#endif
-#ifdef IPPROTO_ESP
-       XLAT(IPPROTO_ESP),
-#endif
-#ifdef IPPROTO_AH
-       XLAT(IPPROTO_AH),
-#endif
-#ifdef IPPROTO_ICMPV6
-       XLAT(IPPROTO_ICMPV6),
-#endif
-#ifdef IPPROTO_NONE
-       XLAT(IPPROTO_NONE),
-#endif
-#ifdef IPPROTO_DSTOPTS
-       XLAT(IPPROTO_DSTOPTS),
-#endif
-#ifdef IPPROTO_HELLO
-       XLAT(IPPROTO_HELLO),
-#endif
-#ifdef IPPROTO_ND
-       XLAT(IPPROTO_ND),
-#endif
-#ifdef IPPROTO_MTP
-       XLAT(IPPROTO_MTP),
-#endif
-#ifdef IPPROTO_ENCAP
-       XLAT(IPPROTO_ENCAP),
-#endif
-#ifdef IPPROTO_PIM
-       XLAT(IPPROTO_PIM),
-#endif
-#ifdef IPPROTO_COMP
-       XLAT(IPPROTO_COMP),
-#endif
-#ifdef IPPROTO_SCTP
-       XLAT(IPPROTO_SCTP),
-#endif
-#ifdef IPPROTO_UDPLITE
-       XLAT(IPPROTO_UDPLITE),
-#endif
-#ifdef IPPROTO_RAW
-       XLAT(IPPROTO_RAW),
-#endif
-#ifdef IPPROTO_MAX
-       XLAT(IPPROTO_MAX),
-#endif
-       XLAT_END
-};
+#include "xlat/inet_protocols.h"
 
 #ifdef PF_NETLINK
-static const struct xlat netlink_protocols[] = {
-#ifdef NETLINK_ROUTE
-       XLAT(NETLINK_ROUTE),
-#endif
-#ifdef NETLINK_UNUSED
-       XLAT(NETLINK_UNUSED),
-#endif
-#ifdef NETLINK_USERSOCK
-       XLAT(NETLINK_USERSOCK),
-#endif
-#ifdef NETLINK_FIREWALL
-       XLAT(NETLINK_FIREWALL),
-#endif
-#ifdef NETLINK_SOCK_DIAG
-       XLAT(NETLINK_SOCK_DIAG),
-#endif
-#ifdef NETLINK_NFLOG
-       XLAT(NETLINK_NFLOG),
-#endif
-#ifdef NETLINK_XFRM
-       XLAT(NETLINK_XFRM),
-#endif
-#ifdef NETLINK_SELINUX
-       XLAT(NETLINK_SELINUX),
-#endif
-#ifdef NETLINK_ISCSI
-       XLAT(NETLINK_ISCSI),
-#endif
-#ifdef NETLINK_AUDIT
-       XLAT(NETLINK_AUDIT),
-#endif
-#ifdef NETLINK_FIB_LOOKUP
-       XLAT(NETLINK_FIB_LOOKUP),
-#endif
-#ifdef NETLINK_CONNECTOR
-       XLAT(NETLINK_CONNECTOR),
-#endif
-#ifdef NETLINK_NETFILTER
-       XLAT(NETLINK_NETFILTER),
-#endif
-#ifdef NETLINK_IP6_FW
-       XLAT(NETLINK_IP6_FW),
-#endif
-#ifdef NETLINK_DNRTMSG
-       XLAT(NETLINK_DNRTMSG),
-#endif
-#ifdef NETLINK_KOBJECT_UEVENT
-       XLAT(NETLINK_KOBJECT_UEVENT),
-#endif
-#ifdef NETLINK_GENERIC
-       XLAT(NETLINK_GENERIC),
-#endif
-#ifdef NETLINK_SCSITRANSPORT
-       XLAT(NETLINK_SCSITRANSPORT),
-#endif
-#ifdef NETLINK_ECRYPTFS
-       XLAT(NETLINK_ECRYPTFS),
-#endif
-#ifdef NETLINK_RDMA
-       XLAT(NETLINK_RDMA),
-#endif
-#ifdef NETLINK_CRYPTO
-       XLAT(NETLINK_CRYPTO),
-#endif
-       XLAT_END
-};
+#include "xlat/netlink_protocols.h"
 #endif
 
-static const struct xlat msg_flags[] = {
-       XLAT(MSG_OOB),
-#ifdef MSG_PEEK
-       XLAT(MSG_PEEK),
-#endif
-#ifdef MSG_DONTROUTE
-       XLAT(MSG_DONTROUTE),
-#endif
-#ifdef MSG_CTRUNC
-       XLAT(MSG_CTRUNC),
-#endif
-#ifdef MSG_PROBE
-       XLAT(MSG_PROBE),
-#endif
-#ifdef MSG_TRUNC
-       XLAT(MSG_TRUNC),
-#endif
-#ifdef MSG_DONTWAIT
-       XLAT(MSG_DONTWAIT),
-#endif
-#ifdef MSG_EOR
-       XLAT(MSG_EOR),
-#endif
-#ifdef MSG_WAITALL
-       XLAT(MSG_WAITALL),
-#endif
-#ifdef MSG_FIN
-       XLAT(MSG_FIN),
-#endif
-#ifdef MSG_SYN
-       XLAT(MSG_SYN),
-#endif
-#ifdef MSG_CONFIRM
-       XLAT(MSG_CONFIRM),
-#endif
-#ifdef MSG_RST
-       XLAT(MSG_RST),
-#endif
-#ifdef MSG_ERRQUEUE
-       XLAT(MSG_ERRQUEUE),
-#endif
-#ifdef MSG_NOSIGNAL
-       XLAT(MSG_NOSIGNAL),
-#endif
-#ifdef MSG_MORE
-       XLAT(MSG_MORE),
-#endif
-#ifdef MSG_WAITFORONE
-       XLAT(MSG_WAITFORONE),
-#endif
-#ifdef MSG_EOF
-       XLAT(MSG_EOF),
-#endif
-#ifdef MSG_FASTOPEN
-       XLAT(MSG_FASTOPEN),
-#endif
-#ifdef MSG_CMSG_CLOEXEC
-       XLAT(MSG_CMSG_CLOEXEC),
-#endif
-       XLAT_END
-};
-
-static const struct xlat sockoptions[] = {
-#ifdef SO_ACCEPTCONN
-       XLAT(SO_ACCEPTCONN),
-#endif
-#ifdef SO_ALLRAW
-       XLAT(SO_ALLRAW),
-#endif
-#ifdef SO_ATTACH_FILTER
-       XLAT(SO_ATTACH_FILTER),
-#endif
-#ifdef SO_BINDTODEVICE
-       XLAT(SO_BINDTODEVICE),
-#endif
-#ifdef SO_BROADCAST
-       XLAT(SO_BROADCAST),
-#endif
-#ifdef SO_BSDCOMPAT
-       XLAT(SO_BSDCOMPAT),
-#endif
-#ifdef SO_DEBUG
-       XLAT(SO_DEBUG),
-#endif
-#ifdef SO_DETACH_FILTER
-       XLAT(SO_DETACH_FILTER),
-#endif
-#ifdef SO_DONTROUTE
-       XLAT(SO_DONTROUTE),
-#endif
-#ifdef SO_ERROR
-       XLAT(SO_ERROR),
-#endif
-#ifdef SO_ICS
-       XLAT(SO_ICS),
-#endif
-#ifdef SO_IMASOCKET
-       XLAT(SO_IMASOCKET),
-#endif
-#ifdef SO_KEEPALIVE
-       XLAT(SO_KEEPALIVE),
-#endif
-#ifdef SO_LINGER
-       XLAT(SO_LINGER),
-#endif
-#ifdef SO_LISTENING
-       XLAT(SO_LISTENING),
-#endif
-#ifdef SO_MGMT
-       XLAT(SO_MGMT),
-#endif
-#ifdef SO_NO_CHECK
-       XLAT(SO_NO_CHECK),
-#endif
-#ifdef SO_OOBINLINE
-       XLAT(SO_OOBINLINE),
-#endif
-#ifdef SO_ORDREL
-       XLAT(SO_ORDREL),
-#endif
-#ifdef SO_PARALLELSVR
-       XLAT(SO_PARALLELSVR),
-#endif
-#ifdef SO_PASSCRED
-       XLAT(SO_PASSCRED),
-#endif
-#ifdef SO_PEERCRED
-       XLAT(SO_PEERCRED),
-#endif
-#ifdef SO_PEERNAME
-       XLAT(SO_PEERNAME),
-#endif
-#ifdef SO_PEERSEC
-       XLAT(SO_PEERSEC),
-#endif
-#ifdef SO_PRIORITY
-       XLAT(SO_PRIORITY),
-#endif
-#ifdef SO_PROTOTYPE
-       XLAT(SO_PROTOTYPE),
-#endif
-#ifdef SO_RCVBUF
-       XLAT(SO_RCVBUF),
-#endif
-#ifdef SO_RCVLOWAT
-       XLAT(SO_RCVLOWAT),
-#endif
-#ifdef SO_RCVTIMEO
-       XLAT(SO_RCVTIMEO),
-#endif
-#ifdef SO_RDWR
-       XLAT(SO_RDWR),
-#endif
-#ifdef SO_REUSEADDR
-       XLAT(SO_REUSEADDR),
-#endif
-#ifdef SO_REUSEPORT
-       XLAT(SO_REUSEPORT),
-#endif
-#ifdef SO_SECURITY_AUTHENTICATION
-       XLAT(SO_SECURITY_AUTHENTICATION),
-#endif
-#ifdef SO_SECURITY_ENCRYPTION_NETWORK
-       XLAT(SO_SECURITY_ENCRYPTION_NETWORK),
-#endif
-#ifdef SO_SECURITY_ENCRYPTION_TRANSPORT
-       XLAT(SO_SECURITY_ENCRYPTION_TRANSPORT),
-#endif
-#ifdef SO_SEMA
-       XLAT(SO_SEMA),
-#endif
-#ifdef SO_SNDBUF
-       XLAT(SO_SNDBUF),
-#endif
-#ifdef SO_SNDLOWAT
-       XLAT(SO_SNDLOWAT),
-#endif
-#ifdef SO_SNDTIMEO
-       XLAT(SO_SNDTIMEO),
-#endif
-#ifdef SO_TIMESTAMP
-       XLAT(SO_TIMESTAMP),
-#endif
-#ifdef SO_TYPE
-       XLAT(SO_TYPE),
-#endif
-#ifdef SO_USELOOPBACK
-       XLAT(SO_USELOOPBACK),
-#endif
-       XLAT_END
-};
+#include "xlat/msg_flags.h"
+#include "xlat/sockoptions.h"
 
 #if !defined(SOL_IP) && defined(IPPROTO_IP)
 #define SOL_IP IPPROTO_IP
 #endif
 
 #ifdef SOL_IP
-static const struct xlat sockipoptions[] = {
-#ifdef IP_TOS
-       XLAT(IP_TOS),
-#endif
-#ifdef IP_TTL
-       XLAT(IP_TTL),
-#endif
-#ifdef IP_HDRINCL
-       XLAT(IP_HDRINCL),
-#endif
-#ifdef IP_OPTIONS
-       XLAT(IP_OPTIONS),
-#endif
-#ifdef IP_ROUTER_ALERT
-       XLAT(IP_ROUTER_ALERT),
-#endif
-#ifdef IP_RECVOPTIONS
-       XLAT(IP_RECVOPTIONS),
-#endif
-#ifdef IP_RECVOPTS
-       XLAT(IP_RECVOPTS),
-#endif
-#ifdef IP_RECVRETOPTS
-       XLAT(IP_RECVRETOPTS),
-#endif
-#ifdef IP_RECVDSTADDR
-       XLAT(IP_RECVDSTADDR),
-#endif
-#ifdef IP_RETOPTS
-       XLAT(IP_RETOPTS),
-#endif
-#ifdef IP_PKTINFO
-       XLAT(IP_PKTINFO),
-#endif
-#ifdef IP_PKTOPTIONS
-       XLAT(IP_PKTOPTIONS),
-#endif
-#ifdef IP_MTU_DISCOVER
-       XLAT(IP_MTU_DISCOVER),
-#endif
-#ifdef IP_RECVERR
-       XLAT(IP_RECVERR),
-#endif
-#ifdef IP_RECVTTL
-       XLAT(IP_RECVTTL),
-#endif
-#ifdef IP_RECVTOS
-       XLAT(IP_RECVTOS),
-#endif
-#ifdef IP_MTU
-       XLAT(IP_MTU),
-#endif
-#ifdef IP_MULTICAST_IF
-       XLAT(IP_MULTICAST_IF),
-#endif
-#ifdef IP_MULTICAST_TTL
-       XLAT(IP_MULTICAST_TTL),
-#endif
-#ifdef IP_MULTICAST_LOOP
-       XLAT(IP_MULTICAST_LOOP),
-#endif
-#ifdef IP_ADD_MEMBERSHIP
-       XLAT(IP_ADD_MEMBERSHIP),
-#endif
-#ifdef IP_DROP_MEMBERSHIP
-       XLAT(IP_DROP_MEMBERSHIP),
-#endif
-#ifdef IP_BROADCAST_IF
-       XLAT(IP_BROADCAST_IF),
-#endif
-#ifdef IP_RECVIFINDEX
-       XLAT(IP_RECVIFINDEX),
-#endif
-#ifdef IP_MSFILTER
-       XLAT(IP_MSFILTER),
-#endif
-#ifdef MCAST_MSFILTER
-       XLAT(MCAST_MSFILTER),
-#endif
-#ifdef IP_FREEBIND
-       XLAT(IP_FREEBIND),
-#endif
-#ifdef IP_IPSEC_POLICY
-       XLAT(IP_IPSEC_POLICY),
-#endif
-#ifdef IP_XFRM_POLICY
-       XLAT(IP_XFRM_POLICY),
-#endif
-#ifdef IP_PASSSEC
-       XLAT(IP_PASSSEC),
-#endif
-#ifdef IP_TRANSPARENT
-       XLAT(IP_TRANSPARENT),
-#endif
-#ifdef IP_ORIGDSTADDR
-       XLAT(IP_ORIGDSTADDR),
-#endif
-#ifdef IP_RECVORIGDSTADDR
-       XLAT(IP_RECVORIGDSTADDR),
-#endif
-#ifdef IP_MINTTL
-       XLAT(IP_MINTTL),
-#endif
-#ifdef IP_NODEFRAG
-       XLAT(IP_NODEFRAG),
-#endif
-#ifdef IP_UNBLOCK_SOURCE
-       XLAT(IP_UNBLOCK_SOURCE),
-#endif
-#ifdef IP_BLOCK_SOURCE
-       XLAT(IP_BLOCK_SOURCE),
-#endif
-#ifdef IP_ADD_SOURCE_MEMBERSHIP
-       XLAT(IP_ADD_SOURCE_MEMBERSHIP),
-#endif
-#ifdef IP_DROP_SOURCE_MEMBERSHIP
-       XLAT(IP_DROP_SOURCE_MEMBERSHIP),
-#endif
-#ifdef MCAST_JOIN_GROUP
-       XLAT(MCAST_JOIN_GROUP),
-#endif
-#ifdef MCAST_BLOCK_SOURCE
-       XLAT(MCAST_BLOCK_SOURCE),
-#endif
-#ifdef MCAST_UNBLOCK_SOURCE
-       XLAT(MCAST_UNBLOCK_SOURCE),
-#endif
-#ifdef MCAST_LEAVE_GROUP
-       XLAT(MCAST_LEAVE_GROUP),
-#endif
-#ifdef MCAST_JOIN_SOURCE_GROUP
-       XLAT(MCAST_JOIN_SOURCE_GROUP),
-#endif
-#ifdef MCAST_LEAVE_SOURCE_GROUP
-       XLAT(MCAST_LEAVE_SOURCE_GROUP),
-#endif
-#ifdef IP_MULTICAST_ALL
-       XLAT(IP_MULTICAST_ALL),
-#endif
-#ifdef IP_UNICAST_IF
-       XLAT(IP_UNICAST_IF),
-#endif
-       XLAT_END
-};
+#include "xlat/sockipoptions.h"
 #endif /* SOL_IP */
 
 #ifdef SOL_IPV6
-static const struct xlat sockipv6options[] = {
-#ifdef IPV6_ADDRFORM
-       XLAT(IPV6_ADDRFORM),
-#endif
-#ifdef MCAST_FILTER
-       XLAT(MCAST_FILTER),
-#endif
-#ifdef IPV6_PKTOPTIONS
-       XLAT(IPV6_PKTOPTIONS),
-#endif
-#ifdef IPV6_MTU
-       XLAT(IPV6_MTU),
-#endif
-#ifdef IPV6_V6ONLY
-       XLAT(IPV6_V6ONLY),
-#endif
-#ifdef IPV6_PKTINFO
-       XLAT(IPV6_PKTINFO),
-#endif
-#ifdef IPV6_HOPLIMIT
-       XLAT(IPV6_HOPLIMIT),
-#endif
-#ifdef IPV6_RTHDR
-       XLAT(IPV6_RTHDR),
-#endif
-#ifdef IPV6_HOPOPTS
-       XLAT(IPV6_HOPOPTS),
-#endif
-#ifdef IPV6_DSTOPTS
-       XLAT(IPV6_DSTOPTS),
-#endif
-#ifdef IPV6_FLOWINFO
-       XLAT(IPV6_FLOWINFO),
-#endif
-#ifdef IPV6_UNICAST_HOPS
-       XLAT(IPV6_UNICAST_HOPS),
-#endif
-#ifdef IPV6_MULTICAST_HOPS
-       XLAT(IPV6_MULTICAST_HOPS),
-#endif
-#ifdef IPV6_MULTICAST_LOOP
-       XLAT(IPV6_MULTICAST_LOOP),
-#endif
-#ifdef IPV6_MULTICAST_IF
-       XLAT(IPV6_MULTICAST_IF),
-#endif
-#ifdef IPV6_MTU_DISCOVER
-       XLAT(IPV6_MTU_DISCOVER),
-#endif
-#ifdef IPV6_RECVERR
-       XLAT(IPV6_RECVERR),
-#endif
-#ifdef IPV6_FLOWINFO_SEND
-       XLAT(IPV6_FLOWINFO_SEND),
-#endif
-#ifdef IPV6_ADD_MEMBERSHIP
-       XLAT(IPV6_ADD_MEMBERSHIP),
-#endif
-#ifdef IPV6_DROP_MEMBERSHIP
-       XLAT(IPV6_DROP_MEMBERSHIP),
-#endif
-#ifdef IPV6_ROUTER_ALERT
-       XLAT(IPV6_ROUTER_ALERT),
-#endif
-       XLAT_END
-};
+#include "xlat/sockipv6options.h"
 #endif /* SOL_IPV6 */
 
 #ifdef SOL_IPX
-static const struct xlat sockipxoptions[] = {
-       XLAT(IPX_TYPE),
-       XLAT_END
-};
+#include "xlat/sockipxoptions.h"
 #endif /* SOL_IPX */
 
 #ifdef SOL_RAW
-static const struct xlat sockrawoptions[] = {
-#if defined(ICMP_FILTER)
-       XLAT(ICMP_FILTER),
-#endif
-       XLAT_END
-};
+#include "xlat/sockrawoptions.h"
 #endif /* SOL_RAW */
 
 #ifdef SOL_PACKET
-static const struct xlat sockpacketoptions[] = {
-#ifdef PACKET_ADD_MEMBERSHIP
-       XLAT(PACKET_ADD_MEMBERSHIP),
-#endif
-#ifdef PACKET_DROP_MEMBERSHIP
-       XLAT(PACKET_DROP_MEMBERSHIP),
-#endif
-#if defined(PACKET_RECV_OUTPUT)
-       XLAT(PACKET_RECV_OUTPUT),
-#endif
-#if defined(PACKET_RX_RING)
-       XLAT(PACKET_RX_RING),
-#endif
-#if defined(PACKET_STATISTICS)
-       XLAT(PACKET_STATISTICS),
-#endif
-#if defined(PACKET_COPY_THRESH)
-       XLAT(PACKET_COPY_THRESH),
-#endif
-#if defined(PACKET_AUXDATA)
-       XLAT(PACKET_AUXDATA),
-#endif
-#if defined(PACKET_ORIGDEV)
-       XLAT(PACKET_ORIGDEV),
-#endif
-#if defined(PACKET_VERSION)
-       XLAT(PACKET_VERSION),
-#endif
-#if defined(PACKET_HDRLEN)
-       XLAT(PACKET_HDRLEN),
-#endif
-#if defined(PACKET_RESERVE)
-       XLAT(PACKET_RESERVE),
-#endif
-#if defined(PACKET_TX_RING)
-       XLAT(PACKET_TX_RING),
-#endif
-#if defined(PACKET_LOSS)
-       XLAT(PACKET_LOSS),
-#endif
-       XLAT_END
-};
+#include "xlat/sockpacketoptions.h"
 #endif /* SOL_PACKET */
 
 #ifdef SOL_SCTP
-static const struct xlat socksctpoptions[] = {
-#if defined(SCTP_RTOINFO)
-       XLAT(SCTP_RTOINFO),
-#endif
-#if defined(SCTP_ASSOCINFO)
-       XLAT(SCTP_ASSOCINFO),
-#endif
-#if defined(SCTP_INITMSG)
-       XLAT(SCTP_INITMSG),
-#endif
-#if defined(SCTP_NODELAY)
-       XLAT(SCTP_NODELAY),
-#endif
-#if defined(SCTP_AUTOCLOSE)
-       XLAT(SCTP_AUTOCLOSE),
-#endif
-#if defined(SCTP_SET_PEER_PRIMARY_ADDR)
-       XLAT(SCTP_SET_PEER_PRIMARY_ADDR),
-#endif
-#if defined(SCTP_PRIMARY_ADDR)
-       XLAT(SCTP_PRIMARY_ADDR),
-#endif
-#if defined(SCTP_ADAPTATION_LAYER)
-       XLAT(SCTP_ADAPTATION_LAYER),
-#endif
-#if defined(SCTP_DISABLE_FRAGMENTS)
-       XLAT(SCTP_DISABLE_FRAGMENTS),
-#endif
-#if defined(SCTP_PEER_ADDR_PARAMS)
-       XLAT(SCTP_PEER_ADDR_PARAMS),
-#endif
-#if defined(SCTP_DEFAULT_SEND_PARAM)
-       XLAT(SCTP_DEFAULT_SEND_PARAM),
-#endif
-#if defined(SCTP_EVENTS)
-       XLAT(SCTP_EVENTS),
-#endif
-#if defined(SCTP_I_WANT_MAPPED_V4_ADDR)
-       XLAT(SCTP_I_WANT_MAPPED_V4_ADDR),
-#endif
-#if defined(SCTP_MAXSEG)
-       XLAT(SCTP_MAXSEG),
-#endif
-#if defined(SCTP_STATUS)
-       XLAT(SCTP_STATUS),
-#endif
-#if defined(SCTP_GET_PEER_ADDR_INFO)
-       XLAT(SCTP_GET_PEER_ADDR_INFO),
-#endif
-#if defined(SCTP_DELAYED_ACK)
-       XLAT(SCTP_DELAYED_ACK),
-#endif
-#if defined(SCTP_CONTEXT)
-       XLAT(SCTP_CONTEXT),
-#endif
-#if defined(SCTP_FRAGMENT_INTERLEAVE)
-       XLAT(SCTP_FRAGMENT_INTERLEAVE),
-#endif
-#if defined(SCTP_PARTIAL_DELIVERY_POINT)
-       XLAT(SCTP_PARTIAL_DELIVERY_POINT),
-#endif
-#if defined(SCTP_MAX_BURST)
-       XLAT(SCTP_MAX_BURST),
-#endif
-#if defined(SCTP_AUTH_CHUNK)
-       XLAT(SCTP_AUTH_CHUNK),
-#endif
-#if defined(SCTP_HMAC_IDENT)
-       XLAT(SCTP_HMAC_IDENT),
-#endif
-#if defined(SCTP_AUTH_KEY)
-       XLAT(SCTP_AUTH_KEY),
-#endif
-#if defined(SCTP_AUTH_ACTIVE_KEY)
-       XLAT(SCTP_AUTH_ACTIVE_KEY),
-#endif
-#if defined(SCTP_AUTH_DELETE_KEY)
-       XLAT(SCTP_AUTH_DELETE_KEY),
-#endif
-#if defined(SCTP_PEER_AUTH_CHUNKS)
-       XLAT(SCTP_PEER_AUTH_CHUNKS),
-#endif
-#if defined(SCTP_LOCAL_AUTH_CHUNKS)
-       XLAT(SCTP_LOCAL_AUTH_CHUNKS),
-#endif
-#if defined(SCTP_GET_ASSOC_NUMBER)
-       XLAT(SCTP_GET_ASSOC_NUMBER),
-#endif
-
-       /* linux specific things */
-#if defined(SCTP_SOCKOPT_BINDX_ADD)
-       XLAT(SCTP_SOCKOPT_BINDX_ADD),
-#endif
-#if defined(SCTP_SOCKOPT_BINDX_REM)
-       XLAT(SCTP_SOCKOPT_BINDX_REM),
-#endif
-#if defined(SCTP_SOCKOPT_PEELOFF)
-       XLAT(SCTP_SOCKOPT_PEELOFF),
-#endif
-#if defined(SCTP_GET_PEER_ADDRS_NUM_OLD)
-       XLAT(SCTP_GET_PEER_ADDRS_NUM_OLD),
-#endif
-#if defined(SCTP_GET_PEER_ADDRS_OLD)
-       XLAT(SCTP_GET_PEER_ADDRS_OLD),
-#endif
-#if defined(SCTP_GET_LOCAL_ADDRS_NUM_OLD)
-       XLAT(SCTP_GET_LOCAL_ADDRS_NUM_OLD),
-#endif
-#if defined(SCTP_GET_LOCAL_ADDRS_OLD)
-       XLAT(SCTP_GET_LOCAL_ADDRS_OLD),
-#endif
-#if defined(SCTP_SOCKOPT_CONNECTX_OLD)
-       XLAT(SCTP_SOCKOPT_CONNECTX_OLD),
-#endif
-#if defined(SCTP_GET_PEER_ADDRS)
-       XLAT(SCTP_GET_PEER_ADDRS),
-#endif
-#if defined(SCTP_GET_LOCAL_ADDRS)
-       XLAT(SCTP_GET_LOCAL_ADDRS),
-#endif
-
-       XLAT_END
-};
+#include "xlat/socksctpoptions.h"
 #endif
 
 #if !defined(SOL_TCP) && defined(IPPROTO_TCP)
@@ -1245,149 +146,15 @@ static const struct xlat socksctpoptions[] = {
 #endif
 
 #ifdef SOL_TCP
-static const struct xlat socktcpoptions[] = {
-       XLAT(TCP_NODELAY),
-       XLAT(TCP_MAXSEG),
-#ifdef TCP_CORK
-       XLAT(TCP_CORK),
-#endif
-#ifdef TCP_KEEPIDLE
-       XLAT(TCP_KEEPIDLE),
-#endif
-#ifdef TCP_KEEPINTVL
-       XLAT(TCP_KEEPINTVL),
-#endif
-#ifdef TCP_KEEPCNT
-       XLAT(TCP_KEEPCNT),
-#endif
-#ifdef TCP_SYNCNT
-       XLAT(TCP_SYNCNT),
-#endif
-#ifdef TCP_LINGER2
-       XLAT(TCP_LINGER2),
-#endif
-#ifdef TCP_DEFER_ACCEPT
-       XLAT(TCP_DEFER_ACCEPT),
-#endif
-#ifdef TCP_WINDOW_CLAMP
-       XLAT(TCP_WINDOW_CLAMP),
-#endif
-#ifdef TCP_INFO
-       XLAT(TCP_INFO),
-#endif
-#ifdef TCP_QUICKACK
-       XLAT(TCP_QUICKACK),
-#endif
-#ifdef TCP_CONGESTION
-       XLAT(TCP_CONGESTION),
-#endif
-#ifdef TCP_MD5SIG
-       XLAT(TCP_MD5SIG),
-#endif
-#ifdef TCP_COOKIE_TRANSACTIONS
-       XLAT(TCP_COOKIE_TRANSACTIONS),
-#endif
-#ifdef TCP_THIN_LINEAR_TIMEOUTS
-       XLAT(TCP_THIN_LINEAR_TIMEOUTS),
-#endif
-#ifdef TCP_THIN_DUPACK
-       XLAT(TCP_THIN_DUPACK),
-#endif
-#ifdef TCP_USER_TIMEOUT
-       XLAT(TCP_USER_TIMEOUT),
-#endif
-#ifdef TCP_REPAIR
-       XLAT(TCP_REPAIR),
-#endif
-#ifdef TCP_REPAIR_QUEUE
-       XLAT(TCP_REPAIR_QUEUE),
-#endif
-#ifdef TCP_QUEUE_SEQ
-       XLAT(TCP_QUEUE_SEQ),
-#endif
-#ifdef TCP_REPAIR_OPTIONS
-       XLAT(TCP_REPAIR_OPTIONS),
-#endif
-#ifdef TCP_FASTOPEN
-       XLAT(TCP_FASTOPEN),
-#endif
-#ifdef TCP_TIMESTAMP
-       XLAT(TCP_TIMESTAMP),
-#endif
-       XLAT_END
-};
+#include "xlat/socktcpoptions.h"
 #endif /* SOL_TCP */
 
 #ifdef SOL_RAW
-static const struct xlat icmpfilterflags[] = {
-#if defined(ICMP_ECHOREPLY)
-       { (1<<ICMP_ECHOREPLY),          "ICMP_ECHOREPLY"        },
-#endif
-#if defined(ICMP_DEST_UNREACH)
-       { (1<<ICMP_DEST_UNREACH),       "ICMP_DEST_UNREACH"     },
-#endif
-#if defined(ICMP_SOURCE_QUENCH)
-       { (1<<ICMP_SOURCE_QUENCH),      "ICMP_SOURCE_QUENCH"    },
-#endif
-#if defined(ICMP_REDIRECT)
-       { (1<<ICMP_REDIRECT),           "ICMP_REDIRECT"         },
-#endif
-#if defined(ICMP_ECHO)
-       { (1<<ICMP_ECHO),               "ICMP_ECHO"             },
-#endif
-#if defined(ICMP_TIME_EXCEEDED)
-       { (1<<ICMP_TIME_EXCEEDED),      "ICMP_TIME_EXCEEDED"    },
-#endif
-#if defined(ICMP_PARAMETERPROB)
-       { (1<<ICMP_PARAMETERPROB),      "ICMP_PARAMETERPROB"    },
-#endif
-#if defined(ICMP_TIMESTAMP)
-       { (1<<ICMP_TIMESTAMP),          "ICMP_TIMESTAMP"        },
-#endif
-#if defined(ICMP_TIMESTAMPREPLY)
-       { (1<<ICMP_TIMESTAMPREPLY),     "ICMP_TIMESTAMPREPLY"   },
-#endif
-#if defined(ICMP_INFO_REQUEST)
-       { (1<<ICMP_INFO_REQUEST),       "ICMP_INFO_REQUEST"     },
-#endif
-#if defined(ICMP_INFO_REPLY)
-       { (1<<ICMP_INFO_REPLY),         "ICMP_INFO_REPLY"       },
-#endif
-#if defined(ICMP_ADDRESS)
-       { (1<<ICMP_ADDRESS),            "ICMP_ADDRESS"          },
-#endif
-#if defined(ICMP_ADDRESSREPLY)
-       { (1<<ICMP_ADDRESSREPLY),       "ICMP_ADDRESSREPLY"     },
-#endif
-       XLAT_END
-};
+#include "xlat/icmpfilterflags.h"
 #endif /* SOL_RAW */
 
 #if defined(AF_PACKET) /* from e.g. linux/if_packet.h */
-static const struct xlat af_packet_types[] = {
-#if defined(PACKET_HOST)
-       XLAT(PACKET_HOST),
-#endif
-#if defined(PACKET_BROADCAST)
-       XLAT(PACKET_BROADCAST),
-#endif
-#if defined(PACKET_MULTICAST)
-       XLAT(PACKET_MULTICAST),
-#endif
-#if defined(PACKET_OTHERHOST)
-       XLAT(PACKET_OTHERHOST),
-#endif
-#if defined(PACKET_OUTGOING)
-       XLAT(PACKET_OUTGOING),
-#endif
-#if defined(PACKET_LOOPBACK)
-       XLAT(PACKET_LOOPBACK),
-#endif
-#if defined(PACKET_FASTROUTE)
-       XLAT(PACKET_FASTROUTE),
-#endif
-       XLAT_END
-};
+#include "xlat/af_packet_types.h"
 #endif /* defined(AF_PACKET) */
 
 void
@@ -1422,7 +189,7 @@ printsock(struct tcb *tcp, long addr, int addrlen)
                return;
        }
 
-       if (addrlen < 2 || addrlen > sizeof(addrbuf))
+       if (addrlen < 2 || addrlen > (int) sizeof(addrbuf))
                addrlen = sizeof(addrbuf);
 
        memset(&addrbuf, 0, sizeof(addrbuf));
@@ -1506,7 +273,7 @@ printsock(struct tcb *tcp, long addr, int addrlen)
                        tprintf("proto=%#04x, if%d, pkttype=",
                                        ntohs(addrbuf.ll.sll_protocol),
                                        addrbuf.ll.sll_ifindex);
-                       printxval(af_packet_types, addrbuf.ll.sll_pkttype, "?");
+                       printxval(af_packet_types, addrbuf.ll.sll_pkttype, "PACKET_???");
                        tprintf(", addr(%d)={%d, ",
                                        addrbuf.ll.sll_halen,
                                        addrbuf.ll.sll_hatype);
@@ -1534,15 +301,7 @@ printsock(struct tcb *tcp, long addr, int addrlen)
 }
 
 #if HAVE_SENDMSG
-static const struct xlat scmvals[] = {
-#ifdef SCM_RIGHTS
-       XLAT(SCM_RIGHTS),
-#endif
-#ifdef SCM_CREDENTIALS
-       XLAT(SCM_CREDENTIALS),
-#endif
-       XLAT_END
-};
+#include "xlat/scmvals.h"
 
 static void
 printcmsghdr(struct tcb *tcp, unsigned long addr, unsigned long len)
@@ -1574,7 +333,7 @@ printcmsghdr(struct tcb *tcp, unsigned long addr, unsigned long len)
                        while ((char *) fds < ((char *) cmsg + cmsg_len)) {
                                if (!first)
                                        tprints(", ");
-                               tprintf("%d", *fds++);
+                               printfd(tcp, *fds++);
                                first = 0;
                        }
                        tprints("}}");
@@ -1732,7 +491,7 @@ decode_mmsg(struct tcb *tcp, unsigned long msg_len)
  * other bits are socket type flags.
  */
 static void
-tprint_sock_type(struct tcb *tcp, int flags)
+tprint_sock_type(int flags)
 {
        const char *str = xlookup(socktypes, flags & SOCK_TYPE_MASK);
 
@@ -1752,7 +511,7 @@ sys_socket(struct tcb *tcp)
        if (entering(tcp)) {
                printxval(domains, tcp->u_arg[0], "PF_???");
                tprints(", ");
-               tprint_sock_type(tcp, tcp->u_arg[1]);
+               tprint_sock_type(tcp->u_arg[1]);
                tprints(", ");
                switch (tcp->u_arg[0]) {
                case PF_INET:
@@ -1812,7 +571,7 @@ sys_listen(struct tcb *tcp)
 }
 
 static int
-do_accept(struct tcb *tcp, int flags_arg)
+do_sockname(struct tcb *tcp, int flags_arg)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
@@ -1843,13 +602,15 @@ do_accept(struct tcb *tcp, int flags_arg)
 int
 sys_accept(struct tcb *tcp)
 {
-       return do_accept(tcp, -1);
+       do_sockname(tcp, -1);
+       return RVAL_FD;
 }
 
 int
 sys_accept4(struct tcb *tcp)
 {
-       return do_accept(tcp, 3);
+       do_sockname(tcp, 3);
+       return RVAL_FD;
 }
 
 int
@@ -2052,12 +813,7 @@ sys_recvmmsg(struct tcb *tcp)
 
 #endif /* HAVE_SENDMSG */
 
-static const struct xlat shutdown_modes[] = {
-       { 0,    "SHUT_RD"       },
-       { 1,    "SHUT_WR"       },
-       { 2,    "SHUT_RDWR"     },
-       XLAT_END
-};
+#include "xlat/shutdown_modes.h"
 
 int
 sys_shutdown(struct tcb *tcp)
@@ -2073,13 +829,13 @@ sys_shutdown(struct tcb *tcp)
 int
 sys_getsockname(struct tcb *tcp)
 {
-       return sys_accept(tcp);
+       return do_sockname(tcp, -1);
 }
 
 int
 sys_getpeername(struct tcb *tcp)
 {
-       return sys_accept(tcp);
+       return do_sockname(tcp, -1);
 }
 
 static int
@@ -2130,7 +886,7 @@ sys_socketpair(struct tcb *tcp)
        if (entering(tcp)) {
                printxval(domains, tcp->u_arg[0], "PF_???");
                tprints(", ");
-               tprint_sock_type(tcp, tcp->u_arg[1]);
+               tprint_sock_type(tcp->u_arg[1]);
                tprintf(", %lu", tcp->u_arg[2]);
        } else {
                if (syserror(tcp)) {