]> granicus.if.org Git - strace/blobdiff - net.c
Fix decoding of getsockname, getpeername, accept, and accept4 syscalls
[strace] / net.c
diff --git a/net.c b/net.c
index f262f1bd9de46742db8ac7326364f87f6acc425e..86d93fc23c0fd6c31fa6b2845a339ede3569607a 100644 (file)
--- a/net.c
+++ b/net.c
  */
 
 #include "defs.h"
+#include "msghdr.h"
 #include <sys/stat.h>
 #include <sys/socket.h>
+#include <sys/uio.h>
 #include <sys/un.h>
-#if defined(HAVE_SIN6_SCOPE_ID_LINUX)
-# define in6_addr in6_addr_libc
-# define ipv6_mreq ipv6_mreq_libc
-# define sockaddr_in6 sockaddr_in6_libc
-#endif
 #include <netinet/in.h>
 #ifdef HAVE_NETINET_TCP_H
 # include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <asm/types.h>
-#if defined(__GLIBC__)
+#ifdef HAVE_NETIPX_IPX_H
 # include <netipx/ipx.h>
 #else
 # include <linux/ipx.h>
 #endif
 
-#if defined(__GLIBC__) && defined(HAVE_SIN6_SCOPE_ID_LINUX)
-# if defined(HAVE_LINUX_IN6_H)
-#  if defined(HAVE_SIN6_SCOPE_ID_LINUX)
-#   undef in6_addr
-#   undef ipv6_mreq
-#   undef sockaddr_in6
-#   define in6_addr in6_addr_kernel
-#   define ipv6_mreq ipv6_mreq_kernel
-#   define sockaddr_in6 sockaddr_in6_kernel
-#  endif
-#  include <linux/in6.h>
-#  if defined(HAVE_SIN6_SCOPE_ID_LINUX)
-#   undef in6_addr
-#   undef ipv6_mreq
-#   undef sockaddr_in6
-#   define in6_addr in6_addr_libc
-#   define ipv6_mreq ipv6_mreq_libc
-#   define sockaddr_in6 sockaddr_in6_kernel
-#  endif
-# endif
-#endif
-
-#if defined(HAVE_SYS_UIO_H)
-# include <sys/uio.h>
+#if defined(HAVE_LINUX_IP_VS_H)
+# include <linux/ip_vs.h>
 #endif
-#if defined(HAVE_LINUX_NETLINK_H)
-# include <linux/netlink.h>
+#include <linux/netlink.h>
+#if defined(HAVE_LINUX_NETFILTER_ARP_ARP_TABLES_H)
+# include <linux/netfilter_arp/arp_tables.h>
 #endif
-#if defined(HAVE_LINUX_IF_PACKET_H)
-# include <linux/if_packet.h>
+#if defined(HAVE_LINUX_NETFILTER_BRIDGE_EBTABLES_H)
+# include <linux/netfilter_bridge/ebtables.h>
 #endif
-#if defined(HAVE_LINUX_ICMP_H)
-# include <linux/icmp.h>
+#if defined(HAVE_LINUX_NETFILTER_IPV4_IP_TABLES_H)
+# include <linux/netfilter_ipv4/ip_tables.h>
 #endif
-#ifndef PF_UNSPEC
-# define PF_UNSPEC AF_UNSPEC
+#if defined(HAVE_LINUX_NETFILTER_IPV6_IP6_TABLES_H)
+# include <linux/netfilter_ipv6/ip6_tables.h>
 #endif
+#include <linux/if_packet.h>
+#include <linux/icmp.h>
 
-#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
-#include "xlat/socketlayers.h"
-/*** WARNING: DANGER WILL ROBINSON: NOTE "socketlayers" array above
-     falls into "inet_protocols" array below!!!!   This is intended!!! ***/
-#include "xlat/inet_protocols.h"
-
-#ifdef PF_NETLINK
-#include "xlat/netlink_protocols.h"
-#endif
-
-#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
-#include "xlat/sockipoptions.h"
-#endif /* SOL_IP */
 
-#ifdef SOL_IPV6
-#include "xlat/sockipv6options.h"
-#endif /* SOL_IPV6 */
-
-#ifdef SOL_IPX
-#include "xlat/sockipxoptions.h"
-#endif /* SOL_IPX */
-
-#ifdef SOL_RAW
-#include "xlat/sockrawoptions.h"
-#endif /* SOL_RAW */
+#include "xlat/socketlayers.h"
 
-#ifdef SOL_PACKET
-#include "xlat/sockpacketoptions.h"
-#endif /* SOL_PACKET */
+#include "xlat/inet_protocols.h"
 
-#ifdef SOL_SCTP
-#include "xlat/socksctpoptions.h"
+#if !defined NETLINK_SOCK_DIAG && defined NETLINK_INET_DIAG
+# define NETLINK_SOCK_DIAG NETLINK_INET_DIAG
 #endif
+#include "xlat/netlink_protocols.h"
 
-#if !defined(SOL_TCP) && defined(IPPROTO_TCP)
-#define SOL_TCP IPPROTO_TCP
+#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+# include <bluetooth/bluetooth.h>
+# include "xlat/bt_protocols.h"
 #endif
 
-#ifdef SOL_TCP
-#include "xlat/socktcpoptions.h"
-#endif /* SOL_TCP */
-
-#ifdef SOL_RAW
-#include "xlat/icmpfilterflags.h"
-#endif /* SOL_RAW */
-
-#if defined(AF_PACKET) /* from e.g. linux/if_packet.h */
-#include "xlat/af_packet_types.h"
-#endif /* defined(AF_PACKET) */
-
 void
-printsock(struct tcb *tcp, long addr, int addrlen)
+print_ifindex(unsigned int ifindex)
 {
-       union {
-               char pad[128];
-               struct sockaddr sa;
-               struct sockaddr_in sin;
-               struct sockaddr_un sau;
-#ifdef HAVE_INET_NTOP
-               struct sockaddr_in6 sa6;
-#endif
-#if defined(AF_IPX)
-               struct sockaddr_ipx sipx;
-#endif
-#ifdef AF_PACKET
-               struct sockaddr_ll ll;
-#endif
-#ifdef AF_NETLINK
-               struct sockaddr_nl nl;
-#endif
-       } addrbuf;
-       char string_addr[100];
-
-       if (addr == 0) {
-               tprints("NULL");
-               return;
-       }
-       if (!verbose(tcp)) {
-               tprintf("%#lx", addr);
-               return;
-       }
+#ifdef HAVE_IF_INDEXTONAME
+       char buf[IFNAMSIZ + 1];
 
-       if (addrlen < 2 || addrlen > sizeof(addrbuf))
-               addrlen = sizeof(addrbuf);
-
-       memset(&addrbuf, 0, sizeof(addrbuf));
-       if (umoven(tcp, addr, addrlen, addrbuf.pad) < 0) {
-               tprints("{...}");
+       if (if_indextoname(ifindex, buf)) {
+               tprints("if_nametoindex(");
+               print_quoted_string(buf, sizeof(buf), QUOTE_0_TERMINATED);
+               tprints(")");
                return;
        }
-       addrbuf.pad[sizeof(addrbuf.pad) - 1] = '\0';
-
-       tprints("{sa_family=");
-       printxval(addrfams, addrbuf.sa.sa_family, "AF_???");
-       tprints(", ");
-
-       switch (addrbuf.sa.sa_family) {
-       case AF_UNIX:
-               if (addrlen == 2) {
-                       tprints("NULL");
-               } else if (addrbuf.sau.sun_path[0]) {
-                       tprints("sun_path=");
-                       printpathn(tcp, addr + 2, strlen(addrbuf.sau.sun_path));
-               } else {
-                       tprints("sun_path=@");
-                       printpathn(tcp, addr + 3, strlen(addrbuf.sau.sun_path + 1));
-               }
-               break;
-       case AF_INET:
-               tprintf("sin_port=htons(%u), sin_addr=inet_addr(\"%s\")",
-                       ntohs(addrbuf.sin.sin_port), inet_ntoa(addrbuf.sin.sin_addr));
-               break;
-#ifdef HAVE_INET_NTOP
-       case AF_INET6:
-               inet_ntop(AF_INET6, &addrbuf.sa6.sin6_addr, string_addr, sizeof(string_addr));
-               tprintf("sin6_port=htons(%u), inet_pton(AF_INET6, \"%s\", &sin6_addr), sin6_flowinfo=%u",
-                               ntohs(addrbuf.sa6.sin6_port), string_addr,
-                               addrbuf.sa6.sin6_flowinfo);
-#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
-               {
-#if defined(HAVE_IF_INDEXTONAME) && defined(IN6_IS_ADDR_LINKLOCAL) && defined(IN6_IS_ADDR_MC_LINKLOCAL)
-                       int numericscope = 0;
-                       if (IN6_IS_ADDR_LINKLOCAL(&addrbuf.sa6.sin6_addr)
-                           || IN6_IS_ADDR_MC_LINKLOCAL(&addrbuf.sa6.sin6_addr)) {
-                               char scopebuf[IFNAMSIZ + 1];
-
-                               if (if_indextoname(addrbuf.sa6.sin6_scope_id, scopebuf) == NULL)
-                                       numericscope++;
-                               else
-                                       tprintf(", sin6_scope_id=if_nametoindex(\"%s\")", scopebuf);
-                       } else
-                               numericscope++;
-
-                       if (numericscope)
-#endif
-                               tprintf(", sin6_scope_id=%u", addrbuf.sa6.sin6_scope_id);
-               }
 #endif
-               break;
-#endif
-#if defined(AF_IPX)
-       case AF_IPX:
-               {
-                       int i;
-                       tprintf("sipx_port=htons(%u), ",
-                                       ntohs(addrbuf.sipx.sipx_port));
-                       /* Yes, I know, this does not look too
-                        * strace-ish, but otherwise the IPX
-                        * addresses just look monstrous...
-                        * Anyways, feel free if you don't like
-                        * this way.. :)
-                        */
-                       tprintf("%08lx:", (unsigned long)ntohl(addrbuf.sipx.sipx_network));
-                       for (i = 0; i < IPX_NODE_LEN; i++)
-                               tprintf("%02x", addrbuf.sipx.sipx_node[i]);
-                       tprintf("/[%02x]", addrbuf.sipx.sipx_type);
-               }
-               break;
-#endif /* AF_IPX */
-#ifdef AF_PACKET
-       case AF_PACKET:
-               {
-                       int i;
-                       tprintf("proto=%#04x, if%d, pkttype=",
-                                       ntohs(addrbuf.ll.sll_protocol),
-                                       addrbuf.ll.sll_ifindex);
-                       printxval(af_packet_types, addrbuf.ll.sll_pkttype, "PACKET_???");
-                       tprintf(", addr(%d)={%d, ",
-                                       addrbuf.ll.sll_halen,
-                                       addrbuf.ll.sll_hatype);
-                       for (i = 0; i < addrbuf.ll.sll_halen; i++)
-                               tprintf("%02x", addrbuf.ll.sll_addr[i]);
-               }
-               break;
-
-#endif /* AF_PACKET */
-#ifdef AF_NETLINK
-       case AF_NETLINK:
-               tprintf("pid=%d, groups=%08x", addrbuf.nl.nl_pid, addrbuf.nl.nl_groups);
-               break;
-#endif /* AF_NETLINK */
-       /* AF_AX25 AF_APPLETALK AF_NETROM AF_BRIDGE AF_AAL5
-       AF_X25 AF_ROSE etc. still need to be done */
-
-       default:
-               tprints("sa_data=");
-               printstr(tcp, (long) &((struct sockaddr *) addr)->sa_data,
-                       sizeof addrbuf.sa.sa_data);
-               break;
-       }
-       tprints("}");
+       tprintf("%u", ifindex);
 }
 
-#if HAVE_SENDMSG
-#include "xlat/scmvals.h"
-
 static void
-printcmsghdr(struct tcb *tcp, unsigned long addr, unsigned long len)
+decode_sockbuf(struct tcb *tcp, int fd, long addr, long addrlen)
 {
-       struct cmsghdr *cmsg = len < sizeof(struct cmsghdr) ?
-                              NULL : malloc(len);
-       if (cmsg == NULL || umoven(tcp, addr, len, (char *) cmsg) < 0) {
-               tprintf(", msg_control=%#lx", addr);
-               free(cmsg);
-               return;
-       }
-
-       tprintf(", {cmsg_len=%u, cmsg_level=", (unsigned) cmsg->cmsg_len);
-       printxval(socketlayers, cmsg->cmsg_level, "SOL_???");
-       tprints(", cmsg_type=");
-
-       if (cmsg->cmsg_level == SOL_SOCKET) {
-               unsigned long cmsg_len;
-
-               printxval(scmvals, cmsg->cmsg_type, "SCM_???");
-               cmsg_len = (len < cmsg->cmsg_len) ? len : cmsg->cmsg_len;
-
-               if (cmsg->cmsg_type == SCM_RIGHTS
-                   && CMSG_LEN(sizeof(int)) <= cmsg_len) {
-                       int *fds = (int *) CMSG_DATA(cmsg);
-                       int first = 1;
-
-                       tprints(", {");
-                       while ((char *) fds < ((char *) cmsg + cmsg_len)) {
-                               if (!first)
-                                       tprints(", ");
-                               printfd(tcp, *fds++);
-                               first = 0;
-                       }
-                       tprints("}}");
-                       free(cmsg);
-                       return;
-               }
-               if (cmsg->cmsg_type == SCM_CREDENTIALS
-                   && CMSG_LEN(sizeof(struct ucred)) <= cmsg_len) {
-                       struct ucred *uc = (struct ucred *) CMSG_DATA(cmsg);
-
-                       tprintf("{pid=%ld, uid=%ld, gid=%ld}}",
-                               (long)uc->pid, (long)uc->uid, (long)uc->gid);
-                       free(cmsg);
-                       return;
-               }
-       }
-       free(cmsg);
-       tprints(", ...}");
-}
 
-static void
-do_msghdr(struct tcb *tcp, struct msghdr *msg, unsigned long data_size)
-{
-       tprintf("{msg_name(%d)=", msg->msg_namelen);
-       printsock(tcp, (long)msg->msg_name, msg->msg_namelen);
-
-       tprintf(", msg_iov(%lu)=", (unsigned long)msg->msg_iovlen);
-       tprint_iov_upto(tcp, (unsigned long)msg->msg_iovlen,
-                  (unsigned long)msg->msg_iov, 1, data_size);
-
-#ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
-       tprintf(", msg_controllen=%lu", (unsigned long)msg->msg_controllen);
-       if (msg->msg_controllen)
-               printcmsghdr(tcp, (unsigned long) msg->msg_control,
-                            msg->msg_controllen);
-       tprints(", msg_flags=");
-       printflags(msg_flags, msg->msg_flags, "MSG_???");
-#else /* !HAVE_STRUCT_MSGHDR_MSG_CONTROL */
-       tprintf("msg_accrights=%#lx, msg_accrightslen=%u",
-               (unsigned long) msg->msg_accrights, msg->msg_accrightslen);
-#endif /* !HAVE_STRUCT_MSGHDR_MSG_CONTROL */
-       tprints("}");
-}
-
-struct msghdr32 {
-       uint32_t /* void* */    msg_name;
-       uint32_t /* socklen_t */msg_namelen;
-       uint32_t /* iovec* */   msg_iov;
-       uint32_t /* size_t */   msg_iovlen;
-       uint32_t /* void* */    msg_control;
-       uint32_t /* size_t */   msg_controllen;
-       uint32_t /* int */      msg_flags;
-};
-struct mmsghdr32 {
-       struct msghdr32         msg_hdr;
-       uint32_t /* unsigned */ msg_len;
-};
-
-static void
-printmsghdr(struct tcb *tcp, long addr, unsigned long data_size)
-{
-       struct msghdr msg;
-
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-       if (current_wordsize == 4) {
-               struct msghdr32 msg32;
-
-               if (umove(tcp, addr, &msg32) < 0) {
-                       tprintf("%#lx", addr);
-                       return;
-               }
-               msg.msg_name       = (void*)(long)msg32.msg_name;
-               msg.msg_namelen    =              msg32.msg_namelen;
-               msg.msg_iov        = (void*)(long)msg32.msg_iov;
-               msg.msg_iovlen     =              msg32.msg_iovlen;
-               msg.msg_control    = (void*)(long)msg32.msg_control;
-               msg.msg_controllen =              msg32.msg_controllen;
-               msg.msg_flags      =              msg32.msg_flags;
-       } else
-#endif
-       if (umove(tcp, addr, &msg) < 0) {
-               tprintf("%#lx", addr);
-               return;
-       }
-       do_msghdr(tcp, &msg, data_size);
-}
-
-static void
-printmmsghdr(struct tcb *tcp, long addr, unsigned int idx, unsigned long msg_len)
-{
-       struct mmsghdr {
-               struct msghdr msg_hdr;
-               unsigned msg_len;
-       } mmsg;
-
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-       if (current_wordsize == 4) {
-               struct mmsghdr32 mmsg32;
-
-               addr += sizeof(mmsg32) * idx;
-               if (umove(tcp, addr, &mmsg32) < 0) {
-                       tprintf("%#lx", addr);
-                       return;
-               }
-               mmsg.msg_hdr.msg_name       = (void*)(long)mmsg32.msg_hdr.msg_name;
-               mmsg.msg_hdr.msg_namelen    =              mmsg32.msg_hdr.msg_namelen;
-               mmsg.msg_hdr.msg_iov        = (void*)(long)mmsg32.msg_hdr.msg_iov;
-               mmsg.msg_hdr.msg_iovlen     =              mmsg32.msg_hdr.msg_iovlen;
-               mmsg.msg_hdr.msg_control    = (void*)(long)mmsg32.msg_hdr.msg_control;
-               mmsg.msg_hdr.msg_controllen =              mmsg32.msg_hdr.msg_controllen;
-               mmsg.msg_hdr.msg_flags      =              mmsg32.msg_hdr.msg_flags;
-               mmsg.msg_len                =              mmsg32.msg_len;
-       } else
-#endif
-       {
-               addr += sizeof(mmsg) * idx;
-               if (umove(tcp, addr, &mmsg) < 0) {
-                       tprintf("%#lx", addr);
-                       return;
-               }
-       }
-       tprints("{");
-       do_msghdr(tcp, &mmsg.msg_hdr, msg_len ? msg_len : mmsg.msg_len);
-       tprintf(", %u}", mmsg.msg_len);
-}
-
-static void
-decode_mmsg(struct tcb *tcp, unsigned long msg_len)
-{
-       /* mmsgvec */
-       if (syserror(tcp)) {
-               tprintf("%#lx", tcp->u_arg[1]);
-       } else {
-               unsigned int len = tcp->u_rval;
-               unsigned int i;
-
-               tprints("{");
-               for (i = 0; i < len; ++i) {
-                       if (i)
-                               tprints(", ");
-                       printmmsghdr(tcp, tcp->u_arg[1], i, msg_len);
-               }
-               tprints("}");
+       switch (verbose(tcp) ? getfdproto(tcp, fd) : SOCK_PROTO_UNKNOWN) {
+       case SOCK_PROTO_NETLINK:
+               decode_netlink(tcp, addr, addrlen);
+               break;
+       default:
+               printstr(tcp, addr, addrlen);
        }
-       /* vlen */
-       tprintf(", %u, ", (unsigned int) tcp->u_arg[2]);
-       /* flags */
-       printflags(msg_flags, tcp->u_arg[3], "MSG_???");
 }
 
-#endif /* HAVE_SENDMSG */
-
 /*
  * low bits of the socket type define real socket type,
  * other bits are socket type flags.
  */
 static void
-tprint_sock_type(struct tcb *tcp, int flags)
+tprint_sock_type(unsigned int flags)
 {
        const char *str = xlookup(socktypes, flags & SOCK_TYPE_MASK);
 
@@ -505,195 +140,191 @@ tprint_sock_type(struct tcb *tcp, int flags)
        printflags(sock_type_flags, flags, "SOCK_???");
 }
 
-int
-sys_socket(struct tcb *tcp)
+SYS_FUNC(socket)
 {
-       if (entering(tcp)) {
-               printxval(domains, tcp->u_arg[0], "PF_???");
-               tprints(", ");
-               tprint_sock_type(tcp, tcp->u_arg[1]);
-               tprints(", ");
-               switch (tcp->u_arg[0]) {
-               case PF_INET:
-#ifdef PF_INET6
-               case PF_INET6:
-#endif
-                       printxval(inet_protocols, tcp->u_arg[2], "IPPROTO_???");
-                       break;
-#ifdef PF_IPX
-               case PF_IPX:
-                       /* BTW: I don't believe this.. */
-                       tprints("[");
-                       printxval(domains, tcp->u_arg[2], "PF_???");
-                       tprints("]");
-                       break;
-#endif /* PF_IPX */
-#ifdef PF_NETLINK
-               case PF_NETLINK:
-                       printxval(netlink_protocols, tcp->u_arg[2], "NETLINK_???");
-                       break;
+       printxval(addrfams, tcp->u_arg[0], "AF_???");
+       tprints(", ");
+       tprint_sock_type(tcp->u_arg[1]);
+       tprints(", ");
+       switch (tcp->u_arg[0]) {
+       case AF_INET:
+       case AF_INET6:
+               printxval(inet_protocols, tcp->u_arg[2], "IPPROTO_???");
+               break;
+
+       case AF_NETLINK:
+               printxval(netlink_protocols, tcp->u_arg[2], "NETLINK_???");
+               break;
+
+#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+       case AF_BLUETOOTH:
+               printxval(bt_protocols, tcp->u_arg[2], "BTPROTO_???");
+               break;
 #endif
-               default:
-                       tprintf("%lu", tcp->u_arg[2]);
-                       break;
-               }
+
+       default:
+               tprintf("%lu", tcp->u_arg[2]);
+               break;
        }
-       return 0;
+
+       return RVAL_DECODED | RVAL_FD;
 }
 
-int
-sys_bind(struct tcb *tcp)
+SYS_FUNC(bind)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printsock(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu", tcp->u_arg[2]);
-       }
-       return 0;
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       decode_sockaddr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+       tprintf(", %lu", tcp->u_arg[2]);
+
+       return RVAL_DECODED;
 }
 
-int
-sys_connect(struct tcb *tcp)
+SYS_FUNC(listen)
 {
-       return sys_bind(tcp);
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       tprintf("%lu", tcp->u_arg[1]);
+
+       return RVAL_DECODED;
 }
 
-int
-sys_listen(struct tcb *tcp)
+static bool
+fetch_socklen(struct tcb *tcp, int *plen,
+             const unsigned long sockaddr, const unsigned long socklen)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               tprintf("%lu", tcp->u_arg[1]);
-       }
-       return 0;
+       return verbose(tcp) && sockaddr && socklen
+              && umove(tcp, socklen, plen) == 0;
 }
 
 static int
-do_sockname(struct tcb *tcp, int flags_arg)
+decode_sockname(struct tcb *tcp)
 {
+       int ulen, rlen;
+
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
-               return 0;
-       }
-       if (!tcp->u_arg[2])
-               tprintf("%#lx, NULL", tcp->u_arg[1]);
-       else {
-               int len;
-               if (tcp->u_arg[1] == 0 || syserror(tcp)
-                   || umove(tcp, tcp->u_arg[2], &len) < 0) {
-                       tprintf("%#lx", tcp->u_arg[1]);
+               if (fetch_socklen(tcp, &ulen, tcp->u_arg[1], tcp->u_arg[2])) {
+                       /* abuse of auxstr to retain state */
+                       tcp->auxstr = (void *) (long) ulen;
+                       return 0;
                } else {
-                       printsock(tcp, tcp->u_arg[1], len);
+                       printaddr(tcp->u_arg[1]);
+                       tprints(", ");
+                       printaddr(tcp->u_arg[2]);
+                       return RVAL_DECODED;
                }
-               tprints(", ");
-               printnum_int(tcp, tcp->u_arg[2], "%u");
        }
-       if (flags_arg >= 0) {
-               tprints(", ");
-               printflags(sock_type_flags, tcp->u_arg[flags_arg],
-                          "SOCK_???");
+
+       ulen = (long) tcp->auxstr;
+       tcp->auxstr = NULL;
+
+       if (syserror(tcp) || umove(tcp, tcp->u_arg[2], &rlen) < 0) {
+               printaddr(tcp->u_arg[1]);
+               tprintf(", [%d]", ulen);
+       } else {
+               decode_sockaddr(tcp, tcp->u_arg[1], ulen > rlen ? rlen : ulen);
+               tprintf(", [%d]", rlen);
        }
-       return 0;
-}
 
-int
-sys_accept(struct tcb *tcp)
-{
-       do_sockname(tcp, -1);
-       return RVAL_FD;
+       return RVAL_DECODED;
 }
 
-int
-sys_accept4(struct tcb *tcp)
+SYS_FUNC(accept)
 {
-       do_sockname(tcp, 3);
-       return RVAL_FD;
+       return decode_sockname(tcp) | RVAL_FD;
 }
 
-int
-sys_send(struct tcb *tcp)
+SYS_FUNC(accept4)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
+       int rc = decode_sockname(tcp);
+
+       if (rc & RVAL_DECODED) {
                tprints(", ");
-               printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu, ", tcp->u_arg[2]);
-               /* flags */
-               printflags(msg_flags, tcp->u_arg[3], "MSG_???");
+               printflags(sock_type_flags, tcp->u_arg[3], "SOCK_???");
        }
-       return 0;
+
+       return rc | RVAL_FD;
 }
 
-int
-sys_sendto(struct tcb *tcp)
+SYS_FUNC(send)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu, ", tcp->u_arg[2]);
-               /* flags */
-               printflags(msg_flags, tcp->u_arg[3], "MSG_???");
-               /* to address */
-               tprints(", ");
-               printsock(tcp, tcp->u_arg[4], tcp->u_arg[5]);
-               /* to length */
-               tprintf(", %lu", tcp->u_arg[5]);
-       }
-       return 0;
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       decode_sockbuf(tcp, tcp->u_arg[0], tcp->u_arg[1], tcp->u_arg[2]);
+       tprintf(", %lu, ", tcp->u_arg[2]);
+       /* flags */
+       printflags(msg_flags, tcp->u_arg[3], "MSG_???");
+
+       return RVAL_DECODED;
 }
 
-#ifdef HAVE_SENDMSG
+SYS_FUNC(sendto)
+{
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       decode_sockbuf(tcp, tcp->u_arg[0], tcp->u_arg[1], tcp->u_arg[2]);
+       tprintf(", %lu, ", tcp->u_arg[2]);
+       /* flags */
+       printflags(msg_flags, tcp->u_arg[3], "MSG_???");
+       /* to address */
+       tprints(", ");
+       decode_sockaddr(tcp, tcp->u_arg[4], tcp->u_arg[5]);
+       /* to length */
+       tprintf(", %lu", tcp->u_arg[5]);
+
+       return RVAL_DECODED;
+}
 
-int
-sys_sendmsg(struct tcb *tcp)
+SYS_FUNC(sendmsg)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printmsghdr(tcp, tcp->u_arg[1], (unsigned long) -1L);
-               /* flags */
-               tprints(", ");
-               printflags(msg_flags, tcp->u_arg[2], "MSG_???");
-       }
-       return 0;
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       decode_msghdr(tcp, tcp->u_arg[1], (unsigned long) -1L);
+       /* flags */
+       tprints(", ");
+       printflags(msg_flags, tcp->u_arg[2], "MSG_???");
+
+       return RVAL_DECODED;
 }
 
-int
-sys_sendmmsg(struct tcb *tcp)
+SYS_FUNC(sendmmsg)
 {
        if (entering(tcp)) {
                /* sockfd */
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
                if (!verbose(tcp)) {
-                       tprintf("%#lx, %u, ",
-                               tcp->u_arg[1], (unsigned int) tcp->u_arg[2]);
+                       printaddr(tcp->u_arg[1]);
+                       /* vlen */
+                       tprintf(", %u, ", (unsigned int) tcp->u_arg[2]);
+                       /* flags */
                        printflags(msg_flags, tcp->u_arg[3], "MSG_???");
+                       return RVAL_DECODED;
                }
        } else {
-               if (verbose(tcp))
-                       decode_mmsg(tcp, (unsigned long) -1L);
+               decode_mmsgvec(tcp, tcp->u_arg[1], tcp->u_rval, false);
+               /* vlen */
+               tprintf(", %u, ", (unsigned int) tcp->u_arg[2]);
+               /* flags */
+               printflags(msg_flags, tcp->u_arg[3], "MSG_???");
        }
        return 0;
 }
 
-#endif /* HAVE_SENDMSG */
-
-int
-sys_recv(struct tcb *tcp)
+SYS_FUNC(recv)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
        } else {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
-               else
-                       printstr(tcp, tcp->u_arg[1], tcp->u_rval);
+               if (syserror(tcp)) {
+                       printaddr(tcp->u_arg[1]);
+               } else {
+                       decode_sockbuf(tcp, tcp->u_arg[0], tcp->u_arg[1],
+                                    tcp->u_rval);
+               }
 
                tprintf(", %lu, ", tcp->u_arg[2]);
                printflags(msg_flags, tcp->u_arg[3], "MSG_???");
@@ -701,8 +332,7 @@ sys_recv(struct tcb *tcp)
        return 0;
 }
 
-int
-sys_recvfrom(struct tcb *tcp)
+SYS_FUNC(recvfrom)
 {
        int fromlen;
 
@@ -710,55 +340,44 @@ sys_recvfrom(struct tcb *tcp)
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
        } else {
+               /* buf */
                if (syserror(tcp)) {
-                       tprintf("%#lx, %lu, %lu, %#lx, %#lx",
-                               tcp->u_arg[1], tcp->u_arg[2], tcp->u_arg[3],
-                               tcp->u_arg[4], tcp->u_arg[5]);
-                       return 0;
+                       printaddr(tcp->u_arg[1]);
+               } else {
+                       decode_sockbuf(tcp, tcp->u_arg[0], tcp->u_arg[1],
+                                    tcp->u_rval);
                }
-               /* buf */
-               printstr(tcp, tcp->u_arg[1], tcp->u_rval);
                /* len */
                tprintf(", %lu, ", tcp->u_arg[2]);
                /* flags */
                printflags(msg_flags, tcp->u_arg[3], "MSG_???");
-               /* from address, len */
-               if (!tcp->u_arg[4] || !tcp->u_arg[5]) {
-                       if (tcp->u_arg[4] == 0)
-                               tprints(", NULL");
-                       else
-                               tprintf(", %#lx", tcp->u_arg[4]);
-                       if (tcp->u_arg[5] == 0)
-                               tprints(", NULL");
-                       else
-                               tprintf(", %#lx", tcp->u_arg[5]);
-                       return 0;
-               }
-               if (umove(tcp, tcp->u_arg[5], &fromlen) < 0) {
-                       tprints(", {...}, [?]");
+               tprints(", ");
+               if (syserror(tcp) || !tcp->u_arg[4] || !tcp->u_arg[5] ||
+                   umove(tcp, tcp->u_arg[5], &fromlen) < 0) {
+                       /* from address, len */
+                       printaddr(tcp->u_arg[4]);
+                       tprints(", ");
+                       printaddr(tcp->u_arg[5]);
                        return 0;
                }
-               tprints(", ");
-               printsock(tcp, tcp->u_arg[4], tcp->u_arg[5]);
+               /* from address */
+               decode_sockaddr(tcp, tcp->u_arg[4], fromlen);
                /* from length */
                tprintf(", [%u]", fromlen);
        }
        return 0;
 }
 
-#ifdef HAVE_SENDMSG
-
-int
-sys_recvmsg(struct tcb *tcp)
+SYS_FUNC(recvmsg)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
        } else {
-               if (syserror(tcp) || !verbose(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
+               if (syserror(tcp))
+                       printaddr(tcp->u_arg[1]);
                else
-                       printmsghdr(tcp, tcp->u_arg[1], tcp->u_rval);
+                       decode_msghdr(tcp, tcp->u_arg[1], tcp->u_rval);
                /* flags */
                tprints(", ");
                printflags(msg_flags, tcp->u_arg[2], "MSG_???");
@@ -766,23 +385,23 @@ sys_recvmsg(struct tcb *tcp)
        return 0;
 }
 
-int
-sys_recvmmsg(struct tcb *tcp)
+SYS_FUNC(recvmmsg)
 {
-       /* +5 chars are for "left " prefix */
-       static char str[5 + TIMESPEC_TEXT_BUFSIZE];
+       static char str[sizeof("left") + TIMESPEC_TEXT_BUFSIZE];
 
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
                if (verbose(tcp)) {
-                       sprint_timespec(str, tcp, tcp->u_arg[4]);
                        /* Abusing tcp->auxstr as temp storage.
-                        * Will be used and freed on syscall exit.
+                        * Will be used and cleared on syscall exit.
                         */
-                       tcp->auxstr = strdup(str);
+                       tcp->auxstr = sprint_timespec(tcp, tcp->u_arg[4]);
                } else {
-                       tprintf("%#lx, %ld, ", tcp->u_arg[1], tcp->u_arg[2]);
+                       printaddr(tcp->u_arg[1]);
+                       /* vlen */
+                       tprintf(", %u, ", (unsigned int) tcp->u_arg[2]);
+                       /* flags */
                        printflags(msg_flags, tcp->u_arg[3], "MSG_???");
                        tprints(", ");
                        print_timespec(tcp, tcp->u_arg[4]);
@@ -790,10 +409,14 @@ sys_recvmmsg(struct tcb *tcp)
                return 0;
        } else {
                if (verbose(tcp)) {
-                       decode_mmsg(tcp, 0);
+                       decode_mmsgvec(tcp, tcp->u_arg[1], tcp->u_rval, true);
+                       /* vlen */
+                       tprintf(", %u, ", (unsigned int) tcp->u_arg[2]);
+                       /* flags */
+                       printflags(msg_flags, tcp->u_arg[3], "MSG_???");
+                       tprints(", ");
                        /* timeout on entrance */
-                       tprintf(", %s", tcp->auxstr ? tcp->auxstr : "{...}");
-                       free((void *) tcp->auxstr);
+                       tprints(tcp->auxstr);
                        tcp->auxstr = NULL;
                }
                if (syserror(tcp))
@@ -805,59 +428,55 @@ sys_recvmmsg(struct tcb *tcp)
                if (!verbose(tcp))
                        return 0;
                /* timeout on exit */
-               sprint_timespec(stpcpy(str, "left "), tcp, tcp->u_arg[4]);
+               snprintf(str, sizeof(str), "left %s",
+                        sprint_timespec(tcp, tcp->u_arg[4]));
                tcp->auxstr = str;
                return RVAL_STR;
        }
 }
 
-#endif /* HAVE_SENDMSG */
-
 #include "xlat/shutdown_modes.h"
 
-int
-sys_shutdown(struct tcb *tcp)
+SYS_FUNC(shutdown)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printxval(shutdown_modes, tcp->u_arg[1], "SHUT_???");
-       }
-       return 0;
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       printxval(shutdown_modes, tcp->u_arg[1], "SHUT_???");
+
+       return RVAL_DECODED;
 }
 
-int
-sys_getsockname(struct tcb *tcp)
+SYS_FUNC(getsockname)
 {
-       return do_sockname(tcp, -1);
+       return decode_sockname(tcp);
 }
 
-int
-sys_getpeername(struct tcb *tcp)
+static void
+printpair_fd(struct tcb *tcp, const int i0, const int i1)
 {
-       return do_sockname(tcp, -1);
+       tprints("[");
+       printfd(tcp, i0);
+       tprints(", ");
+       printfd(tcp, i1);
+       tprints("]");
+}
+
+static void
+decode_pair_fd(struct tcb *tcp, const long addr)
+{
+       int pair[2];
+
+       if (umove_or_printaddr(tcp, addr, &pair))
+               return;
+
+       printpair_fd(tcp, pair[0], pair[1]);
 }
 
 static int
 do_pipe(struct tcb *tcp, int flags_arg)
 {
        if (exiting(tcp)) {
-               if (syserror(tcp)) {
-                       tprintf("%#lx", tcp->u_arg[0]);
-               } else {
-#if !defined(SPARC) && !defined(SPARC64) && !defined(SH) && !defined(IA64)
-                       int fds[2];
-
-                       if (umoven(tcp, tcp->u_arg[0], sizeof fds, (char *) fds) < 0)
-                               tprints("[...]");
-                       else
-                               tprintf("[%u, %u]", fds[0], fds[1]);
-#elif defined(SPARC) || defined(SPARC64) || defined(SH) || defined(IA64)
-                       tprintf("[%lu, %lu]", tcp->u_rval, getrval2(tcp));
-#else
-                       tprintf("%#lx", tcp->u_arg[0]);
-#endif
-               }
+               decode_pair_fd(tcp, tcp->u_arg[0]);
                if (flags_arg >= 0) {
                        tprints(", ");
                        printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
@@ -866,317 +485,456 @@ do_pipe(struct tcb *tcp, int flags_arg)
        return 0;
 }
 
-int
-sys_pipe(struct tcb *tcp)
+SYS_FUNC(pipe)
 {
+#ifdef HAVE_GETRVAL2
+       if (exiting(tcp) && !syserror(tcp))
+               printpair_fd(tcp, tcp->u_rval, getrval2(tcp));
+       return 0;
+#else
        return do_pipe(tcp, -1);
+#endif
 }
 
-int
-sys_pipe2(struct tcb *tcp)
+SYS_FUNC(pipe2)
 {
        return do_pipe(tcp, 1);
 }
 
-int
-sys_socketpair(struct tcb *tcp)
+SYS_FUNC(socketpair)
 {
-       int fds[2];
-
        if (entering(tcp)) {
-               printxval(domains, tcp->u_arg[0], "PF_???");
+               printxval(addrfams, tcp->u_arg[0], "AF_???");
                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)) {
-                       tprintf(", %#lx", tcp->u_arg[3]);
-                       return 0;
-               }
-               if (umoven(tcp, tcp->u_arg[3], sizeof fds, (char *) fds) < 0)
-                       tprints(", [...]");
-               else
-                       tprintf(", [%u, %u]", fds[0], fds[1]);
+               tprints(", ");
+               decode_pair_fd(tcp, tcp->u_arg[3]);
        }
        return 0;
 }
 
-int
-sys_getsockopt(struct tcb *tcp)
+#include "xlat/sockoptions.h"
+#include "xlat/sockipoptions.h"
+#include "xlat/getsockipoptions.h"
+#include "xlat/setsockipoptions.h"
+#include "xlat/sockipv6options.h"
+#include "xlat/getsockipv6options.h"
+#include "xlat/setsockipv6options.h"
+#include "xlat/sockipxoptions.h"
+#include "xlat/sockrawoptions.h"
+#include "xlat/sockpacketoptions.h"
+#include "xlat/socksctpoptions.h"
+#include "xlat/socktcpoptions.h"
+
+static void
+print_sockopt_fd_level_name(struct tcb *tcp, int fd, unsigned int level,
+                           unsigned int name, bool is_getsockopt)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printxval(socketlayers, tcp->u_arg[1], "SOL_???");
-               tprints(", ");
-               switch (tcp->u_arg[1]) {
-               case SOL_SOCKET:
-                       printxval(sockoptions, tcp->u_arg[2], "SO_???");
-                       break;
-#ifdef SOL_IP
-               case SOL_IP:
-                       printxval(sockipoptions, tcp->u_arg[2], "IP_???");
-                       break;
-#endif
-#ifdef SOL_IPV6
-               case SOL_IPV6:
-                       printxval(sockipv6options, tcp->u_arg[2], "IPV6_???");
-                       break;
-#endif
-#ifdef SOL_IPX
-               case SOL_IPX:
-                       printxval(sockipxoptions, tcp->u_arg[2], "IPX_???");
-                       break;
-#endif
-#ifdef SOL_PACKET
-               case SOL_PACKET:
-                       printxval(sockpacketoptions, tcp->u_arg[2], "PACKET_???");
-                       break;
-#endif
-#ifdef SOL_TCP
-               case SOL_TCP:
-                       printxval(socktcpoptions, tcp->u_arg[2], "TCP_???");
-                       break;
-#endif
-#ifdef SOL_SCTP
-               case SOL_SCTP:
-                       printxval(socksctpoptions, tcp->u_arg[2], "SCTP_???");
-                       break;
-#endif
+       printfd(tcp, fd);
+       tprints(", ");
+       printxval(socketlayers, level, "SOL_??");
+       tprints(", ");
 
-               /* SOL_AX25 SOL_ROSE SOL_ATALK SOL_NETROM SOL_UDP SOL_DECNET SOL_X25
-                * etc. still need work */
-               default:
-                       tprintf("%lu", tcp->u_arg[2]);
-                       break;
-               }
-               tprints(", ");
+       switch (level) {
+       case SOL_SOCKET:
+               printxval(sockoptions, name, "SO_???");
+               break;
+       case SOL_IP:
+               printxvals(name, "IP_???", sockipoptions,
+                       is_getsockopt ? getsockipoptions : setsockipoptions, NULL);
+               break;
+       case SOL_IPV6:
+               printxvals(name, "IPV6_???", sockipv6options,
+                       is_getsockopt ? getsockipv6options : setsockipv6options, NULL);
+               break;
+       case SOL_IPX:
+               printxval(sockipxoptions, name, "IPX_???");
+               break;
+       case SOL_PACKET:
+               printxval(sockpacketoptions, name, "PACKET_???");
+               break;
+       case SOL_TCP:
+               printxval(socktcpoptions, name, "TCP_???");
+               break;
+       case SOL_SCTP:
+               printxval(socksctpoptions, name, "SCTP_???");
+               break;
+       case SOL_RAW:
+               printxval(sockrawoptions, name, "RAW_???");
+               break;
+
+               /* Other SOL_* protocol levels still need work. */
+
+       default:
+               tprintf("%u", name);
+       }
+
+       tprints(", ");
+}
+
+static void
+print_linger(struct tcb *tcp, long addr, int len)
+{
+       struct linger linger;
+
+       if (len != sizeof(linger) ||
+           umove(tcp, addr, &linger) < 0) {
+               printaddr(addr);
+               return;
+       }
+
+       tprintf("{onoff=%d, linger=%d}",
+               linger.l_onoff,
+               linger.l_linger);
+}
+
+#ifdef SO_PEERCRED
+static void
+print_ucred(struct tcb *tcp, long addr, int len)
+{
+       struct ucred uc;
+
+       if (len != sizeof(uc) ||
+           umove(tcp, addr, &uc) < 0) {
+               printaddr(addr);
        } else {
-               int len;
-               if (syserror(tcp) || umove(tcp, tcp->u_arg[4], &len) < 0) {
-                       tprintf("%#lx, %#lx",
-                               tcp->u_arg[3], tcp->u_arg[4]);
-                       return 0;
-               }
+               tprintf("{pid=%u, uid=%u, gid=%u}",
+                       (unsigned) uc.pid,
+                       (unsigned) uc.uid,
+                       (unsigned) uc.gid);
+       }
+}
+#endif /* SO_PEERCRED */
 
-               switch (tcp->u_arg[1]) {
-               case SOL_SOCKET:
-                       switch (tcp->u_arg[2]) {
-#ifdef SO_LINGER
-                       case SO_LINGER:
-                               if (len == sizeof(struct linger)) {
-                                       struct linger linger;
-                                       if (umove(tcp,
-                                                  tcp->u_arg[3],
-                                                  &linger) < 0)
-                                               break;
-                                       tprintf("{onoff=%d, linger=%d}, "
-                                               "[%d]",
-                                               linger.l_onoff,
-                                               linger.l_linger,
-                                               len);
-                                       return 0;
-                               }
-                               break;
-#endif
+#ifdef PACKET_STATISTICS
+static void
+print_tpacket_stats(struct tcb *tcp, long addr, int len)
+{
+       struct tpacket_stats stats;
+
+       if (len != sizeof(stats) ||
+           umove(tcp, addr, &stats) < 0) {
+               printaddr(addr);
+       } else {
+               tprintf("{packets=%u, drops=%u}",
+                       stats.tp_packets,
+                       stats.tp_drops);
+       }
+}
+#endif /* PACKET_STATISTICS */
+
+#include "xlat/icmpfilterflags.h"
+
+static void
+print_icmp_filter(struct tcb *tcp, const long addr, int len)
+{
+       struct icmp_filter filter = {};
+
+       if (len > (int) sizeof(filter))
+               len = sizeof(filter);
+       else if (len <= 0) {
+               printaddr(addr);
+               return;
+       }
+
+       if (umoven_or_printaddr(tcp, addr, len, &filter))
+               return;
+
+       tprints("~(");
+       printflags(icmpfilterflags, ~filter.data, "ICMP_???");
+       tprints(")");
+}
+
+static void
+print_getsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
+                long addr, int len)
+{
+       if (addr && verbose(tcp))
+       switch (level) {
+       case SOL_SOCKET:
+               switch (name) {
+               case SO_LINGER:
+                       print_linger(tcp, addr, len);
+                       goto done;
 #ifdef SO_PEERCRED
-                       case SO_PEERCRED:
-                               if (len == sizeof(struct ucred)) {
-                                       struct ucred uc;
-                                       if (umove(tcp,
-                                                  tcp->u_arg[3],
-                                                  &uc) < 0)
-                                               break;
-                                       tprintf("{pid=%ld, uid=%ld, gid=%ld}, "
-                                               "[%d]",
-                                               (long)uc.pid,
-                                               (long)uc.uid,
-                                               (long)uc.gid,
-                                               len);
-                                       return 0;
-                               }
-                               break;
+               case SO_PEERCRED:
+                       print_ucred(tcp, addr, len);
+                       goto done;
 #endif
-                       }
-                       break;
-               case SOL_PACKET:
-                       switch (tcp->u_arg[2]) {
+               }
+               break;
+
+       case SOL_PACKET:
+               switch (name) {
 #ifdef PACKET_STATISTICS
-                       case PACKET_STATISTICS:
-                               if (len == sizeof(struct tpacket_stats)) {
-                                       struct tpacket_stats stats;
-                                       if (umove(tcp,
-                                                  tcp->u_arg[3],
-                                                  &stats) < 0)
-                                               break;
-                                       tprintf("{packets=%u, drops=%u}, "
-                                               "[%d]",
-                                               stats.tp_packets,
-                                               stats.tp_drops,
-                                               len);
-                                       return 0;
-                               }
-                               break;
+               case PACKET_STATISTICS:
+                       print_tpacket_stats(tcp, addr, len);
+                       goto done;
 #endif
-                       }
-                       break;
                }
+               break;
 
+       case SOL_RAW:
+               switch (name) {
+               case ICMP_FILTER:
+                       print_icmp_filter(tcp, addr, len);
+                       goto done;
+               }
+               break;
+       }
+
+       /* default arg printing */
+
+       if (verbose(tcp)) {
                if (len == sizeof(int)) {
-                       printnum_int(tcp, tcp->u_arg[3], "%d");
+                       printnum_int(tcp, addr, "%d");
+               } else {
+                       printstr(tcp, addr, len);
                }
-               else {
-                       printstr(tcp, tcp->u_arg[3], len);
+       } else {
+               printaddr(addr);
+       }
+done:
+       tprintf(", [%d]", len);
+}
+
+SYS_FUNC(getsockopt)
+{
+       if (entering(tcp)) {
+               print_sockopt_fd_level_name(tcp, tcp->u_arg[0],
+                                           tcp->u_arg[1], tcp->u_arg[2], true);
+       } else {
+               int len;
+
+               if (syserror(tcp) || umove(tcp, tcp->u_arg[4], &len) < 0) {
+                       printaddr(tcp->u_arg[3]);
+                       tprints(", ");
+                       printaddr(tcp->u_arg[4]);
+               } else {
+                       print_getsockopt(tcp, tcp->u_arg[1], tcp->u_arg[2],
+                                        tcp->u_arg[3], len);
                }
-               tprintf(", [%d]", len);
        }
        return 0;
 }
 
-#if defined(ICMP_FILTER)
-static void printicmpfilter(struct tcb *tcp, long addr)
+#ifdef IP_ADD_MEMBERSHIP
+static void
+print_mreq(struct tcb *tcp, long addr, unsigned int len)
 {
-       struct icmp_filter      filter;
+       struct ip_mreq mreq;
 
-       if (!addr) {
-               tprints("NULL");
+       if (len < sizeof(mreq)) {
+               printstr(tcp, addr, len);
                return;
        }
-       if (syserror(tcp) || !verbose(tcp)) {
-               tprintf("%#lx", addr);
+       if (umove_or_printaddr(tcp, addr, &mreq))
                return;
-       }
-       if (umove(tcp, addr, &filter) < 0) {
-               tprints("{...}");
+
+       tprints("{imr_multiaddr=inet_addr(");
+       print_quoted_string(inet_ntoa(mreq.imr_multiaddr),
+                           16, QUOTE_0_TERMINATED);
+       tprints("), imr_interface=inet_addr(");
+       print_quoted_string(inet_ntoa(mreq.imr_interface),
+                           16, QUOTE_0_TERMINATED);
+       tprints(")}");
+}
+#endif /* IP_ADD_MEMBERSHIP */
+
+#ifdef IPV6_ADD_MEMBERSHIP
+static void
+print_mreq6(struct tcb *tcp, long addr, unsigned int len)
+{
+       struct ipv6_mreq mreq;
+
+       if (len < sizeof(mreq))
+               goto fail;
+
+       if (umove_or_printaddr(tcp, addr, &mreq))
+               return;
+
+       const struct in6_addr *in6 = &mreq.ipv6mr_multiaddr;
+       char address[INET6_ADDRSTRLEN];
+
+       if (!inet_ntop(AF_INET6, in6, address, sizeof(address)))
+               goto fail;
+
+       tprints("{ipv6mr_multiaddr=inet_pton(");
+       print_quoted_string(address, sizeof(address), QUOTE_0_TERMINATED);
+       tprints("), ipv6mr_interface=");
+       print_ifindex(mreq.ipv6mr_interface);
+       tprints("}");
+       return;
+
+fail:
+       printstr(tcp, addr, len);
+}
+#endif /* IPV6_ADD_MEMBERSHIP */
+
+#ifdef MCAST_JOIN_GROUP
+static void
+print_group_req(struct tcb *tcp, long addr, int len)
+{
+       struct group_req greq;
+
+       if (len != sizeof(greq) ||
+           umove(tcp, addr, &greq) < 0) {
+               printaddr(addr);
                return;
        }
 
-       tprints("~(");
-       printflags(icmpfilterflags, ~filter.data, "ICMP_???");
-       tprints(")");
+       tprintf("{gr_interface=%u, gr_group=", greq.gr_interface);
+       print_sockaddr(tcp, &greq.gr_group, sizeof(greq.gr_group));
+       tprintf("}");
+
 }
-#endif /* ICMP_FILTER */
+#endif /* MCAST_JOIN_GROUP */
 
-static int
-printsockopt(struct tcb *tcp, int level, int name, long addr, int len)
+#ifdef PACKET_RX_RING
+static void
+print_tpacket_req(struct tcb *tcp, long addr, int len)
 {
-       printxval(socketlayers, level, "SOL_??");
-       tprints(", ");
+       struct tpacket_req req;
+
+       if (len != sizeof(req) ||
+           umove(tcp, addr, &req) < 0) {
+               printaddr(addr);
+       } else {
+               tprintf("{block_size=%u, block_nr=%u, "
+                       "frame_size=%u, frame_nr=%u}",
+                       req.tp_block_size,
+                       req.tp_block_nr,
+                       req.tp_frame_size,
+                       req.tp_frame_nr);
+       }
+}
+#endif /* PACKET_RX_RING */
+
+#ifdef PACKET_ADD_MEMBERSHIP
+# include "xlat/packet_mreq_type.h"
+
+static void
+print_packet_mreq(struct tcb *tcp, long addr, int len)
+{
+       struct packet_mreq mreq;
+
+       if (len != sizeof(mreq) ||
+           umove(tcp, addr, &mreq) < 0) {
+               printaddr(addr);
+       } else {
+               unsigned int i;
+
+               tprintf("{mr_ifindex=%u, mr_type=", mreq.mr_ifindex);
+               printxval(packet_mreq_type, mreq.mr_type, "PACKET_MR_???");
+               tprintf(", mr_alen=%u, mr_address=", mreq.mr_alen);
+               if (mreq.mr_alen > ARRAY_SIZE(mreq.mr_address))
+                       mreq.mr_alen = ARRAY_SIZE(mreq.mr_address);
+               for (i = 0; i < mreq.mr_alen; ++i)
+                       tprintf("%02x", mreq.mr_address[i]);
+               tprints("}");
+       }
+}
+#endif /* PACKET_ADD_MEMBERSHIP */
+
+static void
+print_setsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
+                long addr, int len)
+{
+       if (addr && verbose(tcp))
        switch (level) {
        case SOL_SOCKET:
-               printxval(sockoptions, name, "SO_???");
                switch (name) {
-#if defined(SO_LINGER)
                case SO_LINGER:
-                       if (len == sizeof(struct linger)) {
-                               struct linger linger;
-                               if (umove(tcp, addr, &linger) < 0)
-                                       break;
-                               tprintf(", {onoff=%d, linger=%d}",
-                                       linger.l_onoff,
-                                       linger.l_linger);
-                               return 0;
-                       }
-                       break;
-#endif
+                       print_linger(tcp, addr, len);
+                       goto done;
                }
                break;
-#ifdef SOL_IP
+
        case SOL_IP:
-               printxval(sockipoptions, name, "IP_???");
+               switch (name) {
+#ifdef IP_ADD_MEMBERSHIP
+               case IP_ADD_MEMBERSHIP:
+               case IP_DROP_MEMBERSHIP:
+                       print_mreq(tcp, addr, len);
+                       goto done;
+#endif /* IP_ADD_MEMBERSHIP */
+#ifdef MCAST_JOIN_GROUP
+               case MCAST_JOIN_GROUP:
+               case MCAST_LEAVE_GROUP:
+                       print_group_req(tcp, addr, len);
+                       goto done;
+#endif /* MCAST_JOIN_GROUP */
+               }
                break;
-#endif
-#ifdef SOL_IPV6
+
        case SOL_IPV6:
-               printxval(sockipv6options, name, "IPV6_???");
-               break;
-#endif
-#ifdef SOL_IPX
-       case SOL_IPX:
-               printxval(sockipxoptions, name, "IPX_???");
+               switch (name) {
+#ifdef IPV6_ADD_MEMBERSHIP
+               case IPV6_ADD_MEMBERSHIP:
+               case IPV6_DROP_MEMBERSHIP:
+# ifdef IPV6_JOIN_ANYCAST
+               case IPV6_JOIN_ANYCAST:
+# endif
+# ifdef IPV6_LEAVE_ANYCAST
+               case IPV6_LEAVE_ANYCAST:
+# endif
+                       print_mreq6(tcp, addr, len);
+                       goto done;
+#endif /* IPV6_ADD_MEMBERSHIP */
+               }
                break;
-#endif
-#ifdef SOL_PACKET
+
        case SOL_PACKET:
-               printxval(sockpacketoptions, name, "PACKET_???");
-               /* TODO: decode packate_mreq for PACKET_*_MEMBERSHIP */
                switch (name) {
 #ifdef PACKET_RX_RING
                case PACKET_RX_RING:
-#endif
-#ifdef PACKET_TX_RING
+# ifdef PACKET_TX_RING
                case PACKET_TX_RING:
-#endif
-#if defined(PACKET_RX_RING) || defined(PACKET_TX_RING)
-                       if (len == sizeof(struct tpacket_req)) {
-                               struct tpacket_req req;
-                               if (umove(tcp, addr, &req) < 0)
-                                       break;
-                               tprintf(", {block_size=%u, block_nr=%u, frame_size=%u, frame_nr=%u}",
-                                       req.tp_block_size,
-                                       req.tp_block_nr,
-                                       req.tp_frame_size,
-                                       req.tp_frame_nr);
-                               return 0;
-                       }
-                       break;
-#endif /* PACKET_RX_RING || PACKET_TX_RING */
+# endif
+                       print_tpacket_req(tcp, addr, len);
+                       goto done;
+#endif /* PACKET_RX_RING */
+#ifdef PACKET_ADD_MEMBERSHIP
+               case PACKET_ADD_MEMBERSHIP:
+               case PACKET_DROP_MEMBERSHIP:
+                       print_packet_mreq(tcp, addr, len);
+                       goto done;
+#endif /* PACKET_ADD_MEMBERSHIP */
                }
                break;
-#endif
-#ifdef SOL_TCP
-       case SOL_TCP:
-               printxval(socktcpoptions, name, "TCP_???");
-               break;
-#endif
-#ifdef SOL_SCTP
-       case SOL_SCTP:
-               printxval(socksctpoptions, name, "SCTP_???");
-               break;
-#endif
-#ifdef SOL_RAW
+
        case SOL_RAW:
-               printxval(sockrawoptions, name, "RAW_???");
                switch (name) {
-#if defined(ICMP_FILTER)
-                       case ICMP_FILTER:
-                               tprints(", ");
-                               printicmpfilter(tcp, addr);
-                               return 0;
-#endif
+               case ICMP_FILTER:
+                       print_icmp_filter(tcp, addr, len);
+                       goto done;
                }
                break;
-#endif
-
-               /* SOL_AX25 SOL_ATALK SOL_NETROM SOL_UDP SOL_DECNET SOL_X25
-                * etc. still need work  */
-
-       default:
-               tprintf("%u", name);
        }
 
        /* default arg printing */
 
-       tprints(", ");
-
-       if (len == sizeof(int)) {
-               printnum_int(tcp, addr, "%d");
-       }
-       else {
-               printstr(tcp, addr, len);
+       if (verbose(tcp)) {
+               if (len == sizeof(int)) {
+                       printnum_int(tcp, addr, "%d");
+               } else {
+                       printstr(tcp, addr, len);
+               }
+       } else {
+               printaddr(addr);
        }
-       return 0;
+done:
+       tprintf(", %d", len);
 }
 
-int
-sys_setsockopt(struct tcb *tcp)
+SYS_FUNC(setsockopt)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printsockopt(tcp, tcp->u_arg[1], tcp->u_arg[2],
-                             tcp->u_arg[3], tcp->u_arg[4]);
-               tprintf(", %lu", tcp->u_arg[4]);
-       }
-       return 0;
+       print_sockopt_fd_level_name(tcp, tcp->u_arg[0],
+                                   tcp->u_arg[1], tcp->u_arg[2], false);
+       print_setsockopt(tcp, tcp->u_arg[1], tcp->u_arg[2],
+                        tcp->u_arg[3], tcp->u_arg[4]);
+
+       return RVAL_DECODED;
 }