]> granicus.if.org Git - strace/blobdiff - net.c
xattr: change address argument type from unsigned long to kernel_ureg_t
[strace] / net.c
diff --git a/net.c b/net.c
index 58c54c875b867a5ea50a060e5b3dbdf5a1847a44..25a359bb07821205bcdfaa1399482c7fb2bc4afb 100644 (file)
--- a/net.c
+++ b/net.c
 #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(HAVE_LINUX_NETLINK_H)
-# include <linux/netlink.h>
+#if defined(HAVE_LINUX_IP_VS_H)
+# include <linux/ip_vs.h>
 #endif
-#if defined(HAVE_LINUX_IF_PACKET_H)
-# include <linux/if_packet.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_ICMP_H)
-# include <linux/icmp.h>
+#if defined(HAVE_LINUX_NETFILTER_BRIDGE_EBTABLES_H)
+# include <linux/netfilter_bridge/ebtables.h>
 #endif
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
-# include <bluetooth/bluetooth.h>
-# include <bluetooth/hci.h>
-# include <bluetooth/l2cap.h>
-# include <bluetooth/rfcomm.h>
-# include <bluetooth/sco.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
 
-#ifndef SOL_IP
-# define SOL_IP 0
-#endif
-#ifndef SOL_TCP
-# define SOL_TCP 6
-#endif
-#ifndef SOL_UDP
-# define SOL_UDP 17
-#endif
-#ifndef SOL_IPV6
-# define SOL_IPV6 41
-#endif
-#ifndef SOL_ICMPV6
-# define SOL_ICMPV6 58
-#endif
-#ifndef SOL_SCTP
-# define SOL_SCTP 132
-#endif
-#ifndef SOL_UDPLITE
-# define SOL_UDPLITE 136
-#endif
-#ifndef SOL_RAW
-# define SOL_RAW 255
-#endif
-#ifndef SOL_IPX
-# define SOL_IPX 256
-#endif
-#ifndef SOL_AX25
-# define SOL_AX25 257
-#endif
-#ifndef SOL_ATALK
-# define SOL_ATALK 258
-#endif
-#ifndef SOL_NETROM
-# define SOL_NETROM 259
-#endif
-#ifndef SOL_ROSE
-# define SOL_ROSE 260
-#endif
-#ifndef SOL_DECNET
-# define SOL_DECNET 261
-#endif
-#ifndef SOL_X25
-# define SOL_X25 262
-#endif
-#ifndef SOL_PACKET
-# define SOL_PACKET 263
-#endif
-#ifndef SOL_ATM
-# define SOL_ATM 264
-#endif
-#ifndef SOL_AAL
-# define SOL_AAL 265
-#endif
-#ifndef SOL_IRDA
-# define SOL_IRDA 266
-#endif
-#ifndef SOL_NETBEUI
-# define SOL_NETBEUI 267
-#endif
-#ifndef SOL_LLC
-# define SOL_LLC 268
-#endif
-#ifndef SOL_DCCP
-# define SOL_DCCP 269
-#endif
-#ifndef SOL_NETLINK
-# define SOL_NETLINK 270
-#endif
-#ifndef SOL_TIPC
-# define SOL_TIPC 271
-#endif
-#ifndef SOL_RXRPC
-# define SOL_RXRPC 272
-#endif
-#ifndef SOL_PPPOL2TP
-# define SOL_PPPOL2TP 273
-#endif
-#ifndef SOL_BLUETOOTH
-# define SOL_BLUETOOTH 274
-#endif
-#ifndef SOL_PNPIPE
-# define SOL_PNPIPE 275
-#endif
-#ifndef SOL_RDS
-# define SOL_RDS 276
-#endif
-#ifndef SOL_IUCV
-# define SOL_IUCV 277
-#endif
-#ifndef SOL_CAIF
-# define SOL_CAIF 278
-#endif
-#ifndef SOL_ALG
-# define SOL_ALG 279
-#endif
-#ifndef SOL_NFC
-# define SOL_NFC 280
-#endif
 #include "xlat/socketlayers.h"
 
 #include "xlat/inet_protocols.h"
+#include "xlat/netlink_protocols.h"
 
-#ifdef PF_NETLINK
-# if !defined NETLINK_SOCK_DIAG && defined NETLINK_INET_DIAG
-#  define NETLINK_SOCK_DIAG NETLINK_INET_DIAG
-# endif
-# include "xlat/netlink_protocols.h"
-#endif
-
-#if defined(HAVE_BLUETOOTH_BLUETOOTH_H)
+#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+# include <bluetooth/bluetooth.h>
 # include "xlat/bt_protocols.h"
 #endif
 
-#include "xlat/msg_flags.h"
-
-#if defined(AF_PACKET) /* from e.g. linux/if_packet.h */
-# include "xlat/af_packet_types.h"
-#endif
-
 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
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
-               struct sockaddr_hci hci;
-               struct sockaddr_l2 l2;
-               struct sockaddr_rc rc;
-               struct sockaddr_sco sco;
-#endif
-       } addrbuf;
-       char string_addr[100];
-
-       if (addr == 0) {
-               tprints("NULL");
-               return;
-       }
-       if (!verbose(tcp)) {
-               tprintf("%#lx", addr);
-               return;
-       }
-
-       if (addrlen < 2 || addrlen > (int) sizeof(addrbuf))
-               addrlen = sizeof(addrbuf);
+#ifdef HAVE_IF_INDEXTONAME
+       char buf[IFNAMSIZ + 1];
 
-       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=");
-                       print_quoted_string(addrbuf.sau.sun_path,
-                                           sizeof(addrbuf.sau.sun_path) + 1,
-                                           QUOTE_0_TERMINATED);
-               } else {
-                       tprints("sun_path=@");
-                       print_quoted_string(addrbuf.sau.sun_path + 1,
-                                           sizeof(addrbuf.sau.sun_path),
-                                           QUOTE_0_TERMINATED);
-               }
-               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 {
-                                       tprints(", sin6_scope_id=if_nametoindex(");
-                                       print_quoted_string(scopebuf,
-                                                           sizeof(scopebuf),
-                                                           QUOTE_0_TERMINATED);
-                                       tprints(")");
-                               }
-                       } 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 */
-#if defined(AF_BLUETOOTH) && defined(HAVE_BLUETOOTH_BLUETOOTH_H)
-       case AF_BLUETOOTH:
-               tprintf("{sco_bdaddr=%02X:%02X:%02X:%02X:%02X:%02X} or "
-                       "{rc_bdaddr=%02X:%02X:%02X:%02X:%02X:%02X, rc_channel=%d} or "
-                       "{l2_psm=htobs(%d), l2_bdaddr=%02X:%02X:%02X:%02X:%02X:%02X, l2_cid=htobs(%d)} or "
-                       "{hci_dev=htobs(%d)}",
-                       addrbuf.sco.sco_bdaddr.b[0], addrbuf.sco.sco_bdaddr.b[1],
-                       addrbuf.sco.sco_bdaddr.b[2], addrbuf.sco.sco_bdaddr.b[3],
-                       addrbuf.sco.sco_bdaddr.b[4], addrbuf.sco.sco_bdaddr.b[5],
-                       addrbuf.rc.rc_bdaddr.b[0], addrbuf.rc.rc_bdaddr.b[1],
-                       addrbuf.rc.rc_bdaddr.b[2], addrbuf.rc.rc_bdaddr.b[3],
-                       addrbuf.rc.rc_bdaddr.b[4], addrbuf.rc.rc_bdaddr.b[5],
-                       addrbuf.rc.rc_channel,
-                       btohs(addrbuf.l2.l2_psm), addrbuf.l2.l2_bdaddr.b[0],
-                       addrbuf.l2.l2_bdaddr.b[1], addrbuf.l2.l2_bdaddr.b[2],
-                       addrbuf.l2.l2_bdaddr.b[3], addrbuf.l2.l2_bdaddr.b[4],
-                       addrbuf.l2.l2_bdaddr.b[5], btohs(addrbuf.l2.l2_cid),
-                       btohs(addrbuf.hci.hci_dev));
-               break;
-#endif /* AF_BLUETOOTH && HAVE_BLUETOOTH_BLUETOOTH_H */
-       /* AF_AX25 AF_APPLETALK AF_NETROM AF_BRIDGE AF_AAL5
-       AF_X25 AF_ROSE etc. still need to be done */
-
-       default:
-               tprints("sa_data=");
-               print_quoted_string(addrbuf.sa.sa_data,
-                                   sizeof(addrbuf.sa.sa_data), 0);
-               break;
-       }
-       tprints("}");
-}
-
-#if HAVE_SENDMSG
-# ifndef SCM_SECURITY
-#  define SCM_SECURITY 0x03
-# endif
-# include "xlat/scmvals.h"
-
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-struct cmsghdr32 {
-       uint32_t cmsg_len;
-       int cmsg_level;
-       int cmsg_type;
-};
-#endif
-
-typedef union {
-       char *ptr;
-       struct cmsghdr *cmsg;
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-       struct cmsghdr32 *cmsg32;
-#endif
-} union_cmsghdr;
-
-static bool
-print_scm_rights(struct tcb *tcp, size_t cmsg_size, char *ptr, size_t cmsg_len)
-{
-       if (cmsg_size + sizeof(int) > cmsg_len)
-               return false;
-
-       int *fds = (int *) (ptr + cmsg_size);
-       bool seen = false;
-
-       tprints(", [");
-       while ((char *) fds < (ptr + cmsg_len)) {
-               if (seen)
-                       tprints(", ");
-               else
-                       seen = true;
-               printfd(tcp, *fds++);
-       }
-       tprints("]}");
-       return true;
-}
-
-static bool
-print_scm_creds(struct tcb *tcp, size_t cmsg_size, char *ptr, size_t cmsg_len)
-{
-       if (cmsg_size + sizeof(struct ucred) > cmsg_len)
-               return false;
-
-       const struct ucred *uc = (void *) (ptr + cmsg_size);
-
-       tprintf(", {pid=%u, uid=%u, gid=%u}}",
-               (unsigned) uc->pid, (unsigned) uc->uid, (unsigned) uc->gid);
-       return true;
-}
-
-static bool
-print_scm_security(struct tcb *tcp, size_t cmsg_size, char *ptr, size_t cmsg_len)
-{
-       if (cmsg_size + sizeof(char) > cmsg_len)
-               return false;
-
-       const char *label = (const char *) (ptr + cmsg_size);
-       const size_t label_len = cmsg_len - cmsg_size;
-
-       tprints(", ");
-       print_quoted_string(label, label_len, 0);
-       tprints("}");
-
-       return true;
+       tprintf("%u", ifindex);
 }
 
 static void
-printcmsghdr(struct tcb *tcp, unsigned long addr, size_t len)
+decode_sockbuf(struct tcb *tcp, int fd, long addr, long addrlen)
 {
-       const size_t cmsg_size =
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-               (current_wordsize < sizeof(long)) ? sizeof(struct cmsghdr32) :
-#endif
-                       sizeof(struct cmsghdr);
-
-       char *buf = len < cmsg_size ? NULL : malloc(len);
-       if (!buf || umoven(tcp, addr, len, buf) < 0) {
-               tprintf(", msg_control=%#lx", addr);
-               free(buf);
-               return;
-       }
 
-       union_cmsghdr u = { .ptr = buf };
-
-       tprints(", [");
-       while (len >= cmsg_size) {
-               size_t cmsg_len =
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-                       (current_wordsize < sizeof(long)) ? u.cmsg32->cmsg_len :
-#endif
-                               u.cmsg->cmsg_len;
-               int cmsg_level =
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-                       (current_wordsize < sizeof(long)) ? u.cmsg32->cmsg_level :
-#endif
-                               u.cmsg->cmsg_level;
-               int cmsg_type =
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-                       (current_wordsize < sizeof(long)) ? u.cmsg32->cmsg_type :
-#endif
-                               u.cmsg->cmsg_type;
-
-               if (u.ptr != buf)
-                       tprints(", ");
-               tprintf("{cmsg_len=%lu, cmsg_level=", (unsigned long) cmsg_len);
-               printxval(socketlayers, cmsg_level, "SOL_???");
-               tprints(", cmsg_type=");
-
-               if (cmsg_len > len)
-                       cmsg_len = len;
-
-               if (cmsg_level == SOL_SOCKET) {
-                       printxval(scmvals, cmsg_type, "SCM_???");
-                       switch (cmsg_type) {
-                       case SCM_RIGHTS:
-                               if (print_scm_rights(tcp, cmsg_size, u.ptr, cmsg_len))
-                                       goto next_cmsg;
-                               break;
-                       case SCM_CREDENTIALS:
-                               if (print_scm_creds(tcp, cmsg_size, u.ptr, cmsg_len))
-                                       goto next_cmsg;
-                               break;
-                       case SCM_SECURITY:
-                               if (print_scm_security(tcp, cmsg_size, u.ptr, cmsg_len))
-                                       goto next_cmsg;
-                               break;
-                       }
-               } else {
-                       tprintf("%u", cmsg_type);
-               }
-               tprints(", ...}");
-next_cmsg:
-               if (cmsg_len < cmsg_size) {
-                       len -= cmsg_size;
-                       break;
-               }
-               cmsg_len = (cmsg_len + current_wordsize - 1) &
-                       (size_t) ~(current_wordsize - 1);
-               if (cmsg_len >= len) {
-                       len = 0;
-                       break;
-               }
-               u.ptr += cmsg_len;
-               len -= cmsg_len;
-       }
-       if (len)
-               tprints(", ...");
-       tprints("]");
-       free(buf);
-}
-
-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;
-};
-
-#ifndef HAVE_STRUCT_MMSGHDR
-struct mmsghdr {
-       struct msghdr msg_hdr;
-       unsigned msg_len;
-};
-#endif
-
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-static void
-copy_from_msghdr32(struct msghdr *to_msg, struct msghdr32 *from_msg32)
-{
-       to_msg->msg_name       = (void*)(long)from_msg32->msg_name;
-       to_msg->msg_namelen    =              from_msg32->msg_namelen;
-       to_msg->msg_iov        = (void*)(long)from_msg32->msg_iov;
-       to_msg->msg_iovlen     =              from_msg32->msg_iovlen;
-       to_msg->msg_control    = (void*)(long)from_msg32->msg_control;
-       to_msg->msg_controllen =              from_msg32->msg_controllen;
-       to_msg->msg_flags      =              from_msg32->msg_flags;
-}
-#endif
-
-static bool
-extractmsghdr(struct tcb *tcp, long addr, struct msghdr *msg)
-{
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-       if (current_wordsize == 4) {
-               struct msghdr32 msg32;
-
-               if (umove(tcp, addr, &msg32) < 0)
-                       return false;
-               copy_from_msghdr32(msg, &msg32);
-       } else
-#endif
-       if (umove(tcp, addr, msg) < 0)
-               return false;
-       return true;
-}
-
-static bool
-extractmmsghdr(struct tcb *tcp, long addr, unsigned int idx, struct mmsghdr *mmsg)
-{
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-       if (current_wordsize == 4) {
-               struct mmsghdr32 mmsg32;
-
-               addr += sizeof(struct mmsghdr32) * idx;
-               if (umove(tcp, addr, &mmsg32) < 0)
-                       return false;
-
-               copy_from_msghdr32(&mmsg->msg_hdr, &mmsg32.msg_hdr);
-               mmsg->msg_len = mmsg32.msg_len;
-       } else
-#endif
-       {
-               addr += sizeof(*mmsg) * idx;
-               if (umove(tcp, addr, mmsg) < 0)
-                       return false;
-       }
-       return true;
-}
-
-static void
-printmsghdr(struct tcb *tcp, long addr, unsigned long data_size)
-{
-       struct msghdr msg;
-
-       if (verbose(tcp) && extractmsghdr(tcp, addr, &msg))
-               do_msghdr(tcp, &msg, data_size);
-       else
-               tprintf("%#lx", addr);
-}
-
-void
-dumpiov_in_msghdr(struct tcb *tcp, long addr)
-{
-       struct msghdr msg;
-
-       if (extractmsghdr(tcp, addr, &msg))
-               dumpiov(tcp, msg.msg_iovlen, (long)msg.msg_iov);
-}
-
-static void
-printmmsghdr(struct tcb *tcp, long addr, unsigned int idx, unsigned long msg_len)
-{
-       struct mmsghdr mmsg;
-
-       if (extractmmsghdr(tcp, addr, idx, &mmsg)) {
-               tprints("{");
-               do_msghdr(tcp, &mmsg.msg_hdr, msg_len ? msg_len : mmsg.msg_len);
-               tprintf(", %u}", mmsg.msg_len);
-       }
-       else
-               tprintf("%#lx", addr);
-}
-
-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("}");
-       }
-       /* vlen */
-       tprintf(", %u, ", (unsigned int) tcp->u_arg[2]);
-       /* flags */
-       printflags(msg_flags, tcp->u_arg[3], "MSG_???");
-}
-
-void
-dumpiov_in_mmsghdr(struct tcb *tcp, long addr)
-{
-       unsigned int len = tcp->u_rval;
-       unsigned int i;
-       struct mmsghdr mmsg;
-
-       for (i = 0; i < len; ++i) {
-               if (extractmmsghdr(tcp, addr, i, &mmsg)) {
-                       tprintf(" = %lu buffers in vector %u\n",
-                               (unsigned long)mmsg.msg_hdr.msg_iovlen, i);
-                       dumpiov(tcp, mmsg.msg_hdr.msg_iovlen,
-                               (long)mmsg.msg_hdr.msg_iov);
-               }
+       switch (verbose(tcp) ? getfdproto(tcp, fd) : SOCK_PROTO_UNKNOWN) {
+       case SOCK_PROTO_NETLINK:
+               decode_netlink(tcp, addr, addrlen);
+               break;
+       default:
+               printstr(tcp, addr, addrlen);
        }
 }
-#endif /* HAVE_SENDMSG */
 
 /*
  * low bits of the socket type define real socket type,
  * other bits are socket type flags.
  */
 static void
-tprint_sock_type(int flags)
+tprint_sock_type(unsigned int flags)
 {
        const char *str = xlookup(socktypes, flags & SOCK_TYPE_MASK);
 
@@ -729,200 +135,158 @@ tprint_sock_type(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->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;
-#endif
-#if defined(PF_BLUETOOTH) && defined(HAVE_BLUETOOTH_BLUETOOTH_H)
-               case PF_BLUETOOTH:
-                       printxval(bt_protocols, tcp->u_arg[2], "BTPROTO_???");
-                       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(", ");
+       const int addrlen = tcp->u_arg[2];
+       decode_sockaddr(tcp, tcp->u_arg[1], addrlen);
+       tprintf(", %d", addrlen);
+
+       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])) {
+                       set_tcb_priv_ulong(tcp, 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 = get_tcb_priv_ulong(tcp);
+
+       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);
+               if (ulen != rlen)
+                       tprintf(", [%d->%d]", ulen, rlen);
+               else
+                       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]);
-               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_???");
-       }
-       return 0;
-}
+       int rc = decode_sockname(tcp);
 
-int
-sys_sendto(struct tcb *tcp)
-{
-       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 */
+       if (rc & RVAL_DECODED) {
                tprints(", ");
-               printsock(tcp, tcp->u_arg[4], tcp->u_arg[5]);
-               /* to length */
-               tprintf(", %lu", tcp->u_arg[5]);
+               printflags(sock_type_flags, tcp->u_arg[3], "SOCK_???");
        }
-       return 0;
-}
 
-#ifdef HAVE_SENDMSG
+       return rc | RVAL_FD;
+}
 
-int
-sys_sendmsg(struct tcb *tcp)
+SYS_FUNC(send)
 {
-       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_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;
 }
 
-int
-sys_sendmmsg(struct tcb *tcp)
+SYS_FUNC(sendto)
 {
-       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]);
-                       printflags(msg_flags, tcp->u_arg[3], "MSG_???");
-               }
-       } else {
-               if (verbose(tcp))
-                       decode_mmsg(tcp, (unsigned long) -1L);
-       }
-       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_???");
+       /* to address */
+       const int addrlen = tcp->u_arg[5];
+       tprints(", ");
+       decode_sockaddr(tcp, tcp->u_arg[4], addrlen);
+       /* to length */
+       tprintf(", %d", addrlen);
 
-#endif /* HAVE_SENDMSG */
+       return RVAL_DECODED;
+}
 
-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_???");
@@ -930,158 +294,100 @@ sys_recv(struct tcb *tcp)
        return 0;
 }
 
-int
-sys_recvfrom(struct tcb *tcp)
+SYS_FUNC(recvfrom)
 {
-       int fromlen;
+       int ulen, rlen;
 
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
+               if (fetch_socklen(tcp, &ulen, tcp->u_arg[4], tcp->u_arg[5])) {
+                       set_tcb_priv_ulong(tcp, ulen);
+               }
        } 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 */
+               /* size */
                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]);
+               tprints(", ");
+
+               ulen = get_tcb_priv_ulong(tcp);
+
+               if (!fetch_socklen(tcp, &rlen, tcp->u_arg[4], tcp->u_arg[5])) {
+                       /* from address */
+                       printaddr(tcp->u_arg[4]);
+                       tprints(", ");
+                       /* from length */
+                       printaddr(tcp->u_arg[5]);
                        return 0;
                }
-               if (umove(tcp, tcp->u_arg[5], &fromlen) < 0) {
-                       tprints(", {...}, [?]");
+               if (syserror(tcp)) {
+                       /* from address */
+                       printaddr(tcp->u_arg[4]);
+                       /* from length */
+                       tprintf(", [%d]", ulen);
                        return 0;
                }
-               tprints(", ");
-               printsock(tcp, tcp->u_arg[4], tcp->u_arg[5]);
+               /* from address */
+               decode_sockaddr(tcp, tcp->u_arg[4], ulen > rlen ? rlen : ulen);
                /* from length */
-               tprintf(", [%u]", fromlen);
+               if (ulen != rlen)
+                       tprintf(", [%d->%d]", ulen, rlen);
+               else
+                       tprintf(", [%d]", rlen);
        }
        return 0;
 }
 
-#ifdef HAVE_SENDMSG
+#include "xlat/shutdown_modes.h"
 
-int
-sys_recvmsg(struct tcb *tcp)
+SYS_FUNC(shutdown)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
-               else
-                       printmsghdr(tcp, tcp->u_arg[1], tcp->u_rval);
-               /* flags */
-               tprints(", ");
-               printflags(msg_flags, tcp->u_arg[2], "MSG_???");
-       }
-       return 0;
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       printxval(shutdown_modes, tcp->u_arg[1], "SHUT_???");
+
+       return RVAL_DECODED;
 }
 
-int
-sys_recvmmsg(struct tcb *tcp)
+SYS_FUNC(getsockname)
 {
-       /* +5 chars are for "left " prefix */
-       static char str[5 + 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.
-                        */
-                       tcp->auxstr = strdup(str);
-               } else {
-                       tprintf("%#lx, %ld, ", tcp->u_arg[1], tcp->u_arg[2]);
-                       printflags(msg_flags, tcp->u_arg[3], "MSG_???");
-                       tprints(", ");
-                       print_timespec(tcp, tcp->u_arg[4]);
-               }
-               return 0;
-       } else {
-               if (verbose(tcp)) {
-                       decode_mmsg(tcp, 0);
-                       /* timeout on entrance */
-                       tprintf(", %s", tcp->auxstr ? tcp->auxstr : "{...}");
-                       free((void *) tcp->auxstr);
-                       tcp->auxstr = NULL;
-               }
-               if (syserror(tcp))
-                       return 0;
-               if (tcp->u_rval == 0) {
-                       tcp->auxstr = "Timeout";
-                       return RVAL_STR;
-               }
-               if (!verbose(tcp))
-                       return 0;
-               /* timeout on exit */
-               sprint_timespec(stpcpy(str, "left "), tcp, tcp->u_arg[4]);
-               tcp->auxstr = str;
-               return RVAL_STR;
-       }
+       return decode_sockname(tcp);
 }
 
-#endif /* HAVE_SENDMSG */
-
-#include "xlat/shutdown_modes.h"
-
-int
-sys_shutdown(struct tcb *tcp)
+static void
+printpair_fd(struct tcb *tcp, const int i0, const int i1)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printxval(shutdown_modes, tcp->u_arg[1], "SHUT_???");
-       }
-       return 0;
+       tprints("[");
+       printfd(tcp, i0);
+       tprints(", ");
+       printfd(tcp, i1);
+       tprints("]");
 }
 
-int
-sys_getsockname(struct tcb *tcp)
+static void
+decode_pair_fd(struct tcb *tcp, const long addr)
 {
-       return do_sockname(tcp, -1);
+       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 {
-#ifdef HAVE_GETRVAL2
-                       if (flags_arg < 0) {
-                               tprintf("[%lu, %lu]", tcp->u_rval, getrval2(tcp));
-                       } else
-#endif
-                       {
-                               int fds[2];
-
-                               if (umove(tcp, tcp->u_arg[0], &fds) < 0)
-                                       tprintf("%#lx", tcp->u_arg[0]);
-                               else
-                                       tprintf("[%u, %u]", fds[0], fds[1]);
-                       }
-               }
+               decode_pair_fd(tcp, tcp->u_arg[0]);
                if (flags_arg >= 0) {
                        tprints(", ");
                        printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
@@ -1090,44 +396,43 @@ 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->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, fds) < 0)
-                       tprints(", [...]");
-               else
-                       tprintf(", [%u, %u]", fds[0], fds[1]);
+               tprints(", ");
+               decode_pair_fd(tcp, tcp->u_arg[3]);
        }
        return 0;
 }
 
 #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"
@@ -1135,7 +440,8 @@ sys_socketpair(struct tcb *tcp)
 #include "xlat/socktcpoptions.h"
 
 static void
-print_sockopt_fd_level_name(struct tcb *tcp, int fd, int level, int name)
+print_sockopt_fd_level_name(struct tcb *tcp, int fd, unsigned int level,
+                           unsigned int name, bool is_getsockopt)
 {
        printfd(tcp, fd);
        tprints(", ");
@@ -1147,10 +453,12 @@ print_sockopt_fd_level_name(struct tcb *tcp, int fd, int level, int name)
                printxval(sockoptions, name, "SO_???");
                break;
        case SOL_IP:
-               printxval(sockipoptions, name, "IP_???");
+               printxvals(name, "IP_???", sockipoptions,
+                       is_getsockopt ? getsockipoptions : setsockipoptions, NULL);
                break;
        case SOL_IPV6:
-               printxval(sockipv6options, name, "IPV6_???");
+               printxvals(name, "IPV6_???", sockipv6options,
+                       is_getsockopt ? getsockipv6options : setsockipv6options, NULL);
                break;
        case SOL_IPX:
                printxval(sockipxoptions, name, "IPX_???");
@@ -1177,7 +485,6 @@ print_sockopt_fd_level_name(struct tcb *tcp, int fd, int level, int name)
        tprints(", ");
 }
 
-#ifdef SO_LINGER
 static void
 print_linger(struct tcb *tcp, long addr, int len)
 {
@@ -1185,7 +492,7 @@ print_linger(struct tcb *tcp, long addr, int len)
 
        if (len != sizeof(linger) ||
            umove(tcp, addr, &linger) < 0) {
-               tprintf("%#lx", addr);
+               printaddr(addr);
                return;
        }
 
@@ -1193,7 +500,6 @@ print_linger(struct tcb *tcp, long addr, int len)
                linger.l_onoff,
                linger.l_linger);
 }
-#endif /* SO_LINGER */
 
 #ifdef SO_PEERCRED
 static void
@@ -1203,7 +509,7 @@ print_ucred(struct tcb *tcp, long addr, int len)
 
        if (len != sizeof(uc) ||
            umove(tcp, addr, &uc) < 0) {
-               tprintf("%#lx", addr);
+               printaddr(addr);
        } else {
                tprintf("{pid=%u, uid=%u, gid=%u}",
                        (unsigned) uc.pid,
@@ -1221,7 +527,7 @@ print_tpacket_stats(struct tcb *tcp, long addr, int len)
 
        if (len != sizeof(stats) ||
            umove(tcp, addr, &stats) < 0) {
-               tprintf("%#lx", addr);
+               printaddr(addr);
        } else {
                tprintf("{packets=%u, drops=%u}",
                        stats.tp_packets,
@@ -1230,38 +536,39 @@ print_tpacket_stats(struct tcb *tcp, long addr, int len)
 }
 #endif /* PACKET_STATISTICS */
 
-#ifdef ICMP_FILTER
-# include "xlat/icmpfilterflags.h"
+#include "xlat/icmpfilterflags.h"
 
 static void
-print_icmp_filter(struct tcb *tcp, long addr, int len)
+print_icmp_filter(struct tcb *tcp, const long addr, int len)
 {
-       struct icmp_filter      filter;
+       struct icmp_filter filter = {};
 
-       if (len != sizeof(filter) ||
-           umove(tcp, addr, &filter) < 0) {
-               tprintf("%#lx", addr);
+       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(")");
 }
-#endif /* ICMP_FILTER */
 
 static void
-print_getsockopt(struct tcb *tcp, int level, int name, long addr, int len)
+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) {
-#ifdef SO_LINGER
                case SO_LINGER:
                        print_linger(tcp, addr, len);
                        goto done;
-#endif
 #ifdef SO_PEERCRED
                case SO_PEERCRED:
                        print_ucred(tcp, addr, len);
@@ -1282,11 +589,9 @@ print_getsockopt(struct tcb *tcp, int level, int name, long addr, int len)
 
        case SOL_RAW:
                switch (name) {
-#ifdef ICMP_FILTER
                case ICMP_FILTER:
                        print_icmp_filter(tcp, addr, len);
                        goto done;
-#endif
                }
                break;
        }
@@ -1300,24 +605,24 @@ print_getsockopt(struct tcb *tcp, int level, int name, long addr, int len)
                        printstr(tcp, addr, len);
                }
        } else {
-               tprintf("%#lx", addr);
+               printaddr(addr);
        }
 done:
        tprintf(", [%d]", len);
 }
 
-int
-sys_getsockopt(struct tcb *tcp)
+SYS_FUNC(getsockopt)
 {
        if (entering(tcp)) {
                print_sockopt_fd_level_name(tcp, tcp->u_arg[0],
-                                           tcp->u_arg[1], tcp->u_arg[2]);
+                                           tcp->u_arg[1], tcp->u_arg[2], true);
        } 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]);
+                       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);
@@ -1326,52 +631,74 @@ sys_getsockopt(struct tcb *tcp)
        return 0;
 }
 
-#ifdef MCAST_JOIN_GROUP
+#ifdef IP_ADD_MEMBERSHIP
 static void
-print_group_req(struct tcb *tcp, long addr, int len)
+print_mreq(struct tcb *tcp, long addr, unsigned int len)
 {
-       struct group_req greq;
+       struct ip_mreq mreq;
 
-       if (len != sizeof(greq) ||
-           umove(tcp, addr, &greq) < 0) {
-               tprintf("%#lx", addr);
+       if (len < sizeof(mreq)) {
+               printstr(tcp, addr, len);
                return;
        }
+       if (umove_or_printaddr(tcp, addr, &mreq))
+               return;
 
-       union {
-               struct sockaddr *sa;
-               struct sockaddr_in *sin;
-#ifdef HAVE_INET_NTOP
-               struct sockaddr_in6 *sin6;
-#endif
-       } a = { .sa = (struct sockaddr *) &greq.gr_group };
-#ifdef HAVE_INET_NTOP
-       char str[INET6_ADDRSTRLEN];
-#endif
+       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 */
 
-       tprintf("{gr_interface=%u, gr_group={sa_family=", greq.gr_interface);
-       printxval(addrfams, a.sa->sa_family, "AF_???");
+#ifdef IPV6_ADD_MEMBERSHIP
+static void
+print_mreq6(struct tcb *tcp, long addr, unsigned int len)
+{
+       struct ipv6_mreq mreq;
 
-       switch (a.sa->sa_family) {
-       case AF_INET:
-               tprintf(", sin_port=htons(%u), sin_addr=inet_addr(\"%s\")}}",
-                       ntohs(a.sin->sin_port),
-                       inet_ntoa(a.sin->sin_addr));
+       if (len < sizeof(mreq))
+               goto fail;
+
+       if (umove_or_printaddr(tcp, addr, &mreq))
                return;
-#ifdef HAVE_INET_NTOP
-       case AF_INET6:
-               if (!inet_ntop(AF_INET6, &a.sin6->sin6_addr, str, sizeof(str)))
-                       break;
-               tprintf(", sin6_port=htons(%u)"
-                       ", inet_pton(AF_INET6, \"%s\", &sin6_addr)}}",
-                       ntohs(a.sin6->sin6_port), str);
+
+       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;
-#endif /* HAVE_INET_NTOP */
        }
 
-       tprints(", sa_data=");
-       print_quoted_string(a.sa->sa_data, sizeof(a.sa->sa_data), 0);
-       tprintf("}}");
+       tprintf("{gr_interface=%u, gr_group=", greq.gr_interface);
+       print_sockaddr(tcp, &greq.gr_group, sizeof(greq.gr_group));
+       tprints("}");
 
 }
 #endif /* MCAST_JOIN_GROUP */
@@ -1384,7 +711,7 @@ print_tpacket_req(struct tcb *tcp, long addr, int len)
 
        if (len != sizeof(req) ||
            umove(tcp, addr, &req) < 0) {
-               tprintf("%#lx", addr);
+               printaddr(addr);
        } else {
                tprintf("{block_size=%u, block_nr=%u, "
                        "frame_size=%u, frame_nr=%u}",
@@ -1406,7 +733,7 @@ print_packet_mreq(struct tcb *tcp, long addr, int len)
 
        if (len != sizeof(mreq) ||
            umove(tcp, addr, &mreq) < 0) {
-               tprintf("%#lx", addr);
+               printaddr(addr);
        } else {
                unsigned int i;
 
@@ -1423,22 +750,27 @@ print_packet_mreq(struct tcb *tcp, long addr, int len)
 #endif /* PACKET_ADD_MEMBERSHIP */
 
 static void
-print_setsockopt(struct tcb *tcp, int level, int name, long addr, int len)
+print_setsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
+                long addr, int len)
 {
        if (addr && verbose(tcp))
        switch (level) {
        case SOL_SOCKET:
                switch (name) {
-#ifdef SO_LINGER
                case SO_LINGER:
                        print_linger(tcp, addr, len);
                        goto done;
-#endif
                }
                break;
 
        case SOL_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:
@@ -1448,6 +780,23 @@ print_setsockopt(struct tcb *tcp, int level, int name, long addr, int len)
                }
                break;
 
+       case SOL_IPV6:
+               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;
+
        case SOL_PACKET:
                switch (name) {
 #ifdef PACKET_RX_RING
@@ -1469,11 +818,9 @@ print_setsockopt(struct tcb *tcp, int level, int name, long addr, int len)
 
        case SOL_RAW:
                switch (name) {
-#ifdef ICMP_FILTER
                case ICMP_FILTER:
                        print_icmp_filter(tcp, addr, len);
                        goto done;
-#endif
                }
                break;
        }
@@ -1487,20 +834,18 @@ print_setsockopt(struct tcb *tcp, int level, int name, long addr, int len)
                        printstr(tcp, addr, len);
                }
        } else {
-               tprintf("%#lx", addr);
+               printaddr(addr);
        }
 done:
        tprintf(", %d", len);
 }
 
-int
-sys_setsockopt(struct tcb *tcp)
+SYS_FUNC(setsockopt)
 {
-       if (entering(tcp)) {
-               print_sockopt_fd_level_name(tcp, tcp->u_arg[0],
-                                           tcp->u_arg[1], tcp->u_arg[2]);
-               print_setsockopt(tcp, tcp->u_arg[1], tcp->u_arg[2],
-                                tcp->u_arg[3], 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;
 }