]> granicus.if.org Git - strace/blobdiff - net.c
mips n32: fix preadv/pwritev offset decoding
[strace] / net.c
diff --git a/net.c b/net.c
index 46c491f8f6d78763c90f8fdcf20842d418c1dbae..cb29faad6204de8e5a6f56f8e889b34376a5a9bc 100644 (file)
--- a/net.c
+++ b/net.c
 #include "defs.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 <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>
-#endif
 #if defined(HAVE_LINUX_NETLINK_H)
 # include <linux/netlink.h>
 #endif
 #if defined(HAVE_LINUX_ICMP_H)
 # include <linux/icmp.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>
+#endif
 #ifndef PF_UNSPEC
 # define PF_UNSPEC AF_UNSPEC
 #endif
 #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"
+#ifndef SOL_IP
+# define SOL_IP 0
 #endif
-
-#include "xlat/msg_flags.h"
-#include "xlat/sockoptions.h"
-
-#if !defined(SOL_IP) && defined(IPPROTO_IP)
-#define SOL_IP IPPROTO_IP
+#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"
 
-#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 */
-
-#ifdef SOL_PACKET
-#include "xlat/sockpacketoptions.h"
-#endif /* SOL_PACKET */
+#include "xlat/inet_protocols.h"
 
-#ifdef SOL_SCTP
-#include "xlat/socksctpoptions.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(SOL_TCP) && defined(IPPROTO_TCP)
-#define SOL_TCP IPPROTO_TCP
+#if defined(HAVE_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 */
+#include "xlat/msg_flags.h"
 
 #if defined(AF_PACKET) /* from e.g. linux/if_packet.h */
-#include "xlat/af_packet_types.h"
-#endif /* defined(AF_PACKET) */
+# include "xlat/af_packet_types.h"
+#endif
 
 void
 printsock(struct tcb *tcp, long addr, int addrlen)
@@ -176,6 +219,12 @@ printsock(struct tcb *tcp, long addr, int addrlen)
 #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];
@@ -209,10 +258,14 @@ printsock(struct tcb *tcp, long addr, int addrlen)
                        tprints("NULL");
                } else if (addrbuf.sau.sun_path[0]) {
                        tprints("sun_path=");
-                       printpathn(tcp, addr + 2, strlen(addrbuf.sau.sun_path));
+                       print_quoted_string(addrbuf.sau.sun_path,
+                                           sizeof(addrbuf.sau.sun_path) + 1,
+                                           QUOTE_0_TERMINATED);
                } else {
                        tprints("sun_path=@");
-                       printpathn(tcp, addr + 3, strlen(addrbuf.sau.sun_path + 1));
+                       print_quoted_string(addrbuf.sau.sun_path + 1,
+                                           sizeof(addrbuf.sau.sun_path),
+                                           QUOTE_0_TERMINATED);
                }
                break;
        case AF_INET:
@@ -235,8 +288,13 @@ printsock(struct tcb *tcp, long addr, int addrlen)
 
                                if (if_indextoname(addrbuf.sa6.sin6_scope_id, scopebuf) == NULL)
                                        numericscope++;
-                               else
-                                       tprintf(", sin6_scope_id=if_nametoindex(\"%s\")", scopebuf);
+                               else {
+                                       tprints(", sin6_scope_id=if_nametoindex(");
+                                       print_quoted_string(scopebuf,
+                                                           sizeof(scopebuf),
+                                                           QUOTE_0_TERMINATED);
+                                       tprints(")");
+                               }
                        } else
                                numericscope++;
 
@@ -288,70 +346,193 @@ printsock(struct tcb *tcp, long addr, int addrlen)
                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=");
-               printstr(tcp, (long) &((struct sockaddr *) addr)->sa_data,
-                       sizeof addrbuf.sa.sa_data);
+               print_quoted_string(addrbuf.sa.sa_data,
+                                   sizeof(addrbuf.sa.sa_data), 0);
                break;
        }
        tprints("}");
 }
 
 #if HAVE_SENDMSG
-#include "xlat/scmvals.h"
+# 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;
+}
 
 static void
-printcmsghdr(struct tcb *tcp, unsigned long addr, unsigned long len)
+printcmsghdr(struct tcb *tcp, unsigned long addr, size_t len)
 {
-       struct cmsghdr *cmsg = len < sizeof(struct cmsghdr) ?
-                              NULL : malloc(len);
-       if (cmsg == NULL || umoven(tcp, addr, len, (char *) cmsg) < 0) {
+       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(cmsg);
+               free(buf);
                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;
+       union_cmsghdr u = { .ptr = buf };
 
-               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 (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;
 
-                       tprints(", {");
-                       while ((char *) fds < ((char *) cmsg + cmsg_len)) {
-                               if (!first)
-                                       tprints(", ");
-                               printfd(tcp, *fds++);
-                               first = 0;
+               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;
                        }
-                       tprints("}}");
-                       free(cmsg);
-                       return;
+               } else {
+                       tprintf("%u", cmsg_type);
                }
-               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;
+               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;
        }
-       free(cmsg);
-       tprints(", ...}");
+       if (len)
+               tprints(", ...");
+       tprints("]");
+       free(buf);
 }
 
 static void
@@ -392,72 +573,99 @@ struct mmsghdr32 {
        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
-printmsghdr(struct tcb *tcp, long addr, unsigned long data_size)
+copy_from_msghdr32(struct msghdr *to_msg, struct msghdr32 *from_msg32)
 {
-       struct msghdr msg;
+       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) {
-                       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;
+               if (umove(tcp, addr, &msg32) < 0)
+                       return false;
+               copy_from_msghdr32(msg, &msg32);
        } else
 #endif
-       if (umove(tcp, addr, &msg) < 0) {
-               tprintf("%#lx", addr);
-               return;
-       }
-       do_msghdr(tcp, &msg, data_size);
+       if (umove(tcp, addr, msg) < 0)
+               return false;
+       return true;
 }
 
-static void
-printmmsghdr(struct tcb *tcp, long addr, unsigned int idx, unsigned long msg_len)
+static bool
+extractmmsghdr(struct tcb *tcp, long addr, unsigned int idx, struct mmsghdr *mmsg)
 {
-       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;
+               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) {
-                       tprintf("%#lx", addr);
-                       return;
-               }
+               addr += sizeof(*mmsg) * idx;
+               if (umove(tcp, addr, mmsg) < 0)
+                       return false;
        }
-       tprints("{");
-       do_msghdr(tcp, &mmsg.msg_hdr, msg_len ? msg_len : mmsg.msg_len);
-       tprintf(", %u}", mmsg.msg_len);
+       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
@@ -484,6 +692,22 @@ decode_mmsg(struct tcb *tcp, unsigned long msg_len)
        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);
+               }
+       }
+}
 #endif /* HAVE_SENDMSG */
 
 /*
@@ -532,6 +756,11 @@ sys_socket(struct tcb *tcp)
                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;
 #endif
                default:
                        tprintf("%lu", tcp->u_arg[2]);
@@ -755,7 +984,7 @@ sys_recvmsg(struct tcb *tcp)
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
        } else {
-               if (syserror(tcp) || !verbose(tcp))
+               if (syserror(tcp))
                        tprintf("%#lx", tcp->u_arg[1]);
                else
                        printmsghdr(tcp, tcp->u_arg[1], tcp->u_rval);
@@ -832,12 +1061,6 @@ sys_getsockname(struct tcb *tcp)
        return do_sockname(tcp, -1);
 }
 
-int
-sys_getpeername(struct tcb *tcp)
-{
-       return do_sockname(tcp, -1);
-}
-
 static int
 do_pipe(struct tcb *tcp, int flags_arg)
 {
@@ -901,282 +1124,382 @@ sys_socketpair(struct tcb *tcp)
        return 0;
 }
 
-int
-sys_getsockopt(struct tcb *tcp)
+#include "xlat/sockoptions.h"
+#include "xlat/sockipoptions.h"
+#include "xlat/sockipv6options.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, int level, int name)
 {
-       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:
+               printxval(sockipoptions, name, "IP_???");
+               break;
+       case SOL_IPV6:
+               printxval(sockipv6options, name, "IPV6_???");
+               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(", ");
+}
+
+#ifdef SO_LINGER
+static void
+print_linger(struct tcb *tcp, long addr, int len)
+{
+       struct linger linger;
+
+       if (len != sizeof(linger) ||
+           umove(tcp, addr, &linger) < 0) {
+               tprintf("%#lx", addr);
+               return;
+       }
+
+       tprintf("{onoff=%d, linger=%d}",
+               linger.l_onoff,
+               linger.l_linger);
+}
+#endif /* SO_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) {
+               tprintf("%#lx", 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 */
+
+#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) {
+               tprintf("%#lx", addr);
+       } else {
+               tprintf("{packets=%u, drops=%u}",
+                       stats.tp_packets,
+                       stats.tp_drops);
+       }
+}
+#endif /* PACKET_STATISTICS */
 
-               switch (tcp->u_arg[1]) {
-               case SOL_SOCKET:
-                       switch (tcp->u_arg[2]) {
+#ifdef ICMP_FILTER
+# include "xlat/icmpfilterflags.h"
+
+static void
+print_icmp_filter(struct tcb *tcp, long addr, int len)
+{
+       struct icmp_filter      filter;
+
+       if (len != sizeof(filter) ||
+           umove(tcp, addr, &filter) < 0) {
+               tprintf("%#lx", addr);
+               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)
+{
+       if (addr && verbose(tcp))
+       switch (level) {
+       case SOL_SOCKET:
+               switch (name) {
 #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;
+               case SO_LINGER:
+                       print_linger(tcp, addr, len);
+                       goto done;
 #endif
 #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) {
+#ifdef ICMP_FILTER
+               case ICMP_FILTER:
+                       print_icmp_filter(tcp, addr, len);
+                       goto done;
+#endif
+               }
+               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 {
+               tprintf("%#lx", addr);
+       }
+done:
+       tprintf(", [%d]", len);
+}
+
+int
+sys_getsockopt(struct tcb *tcp)
+{
+       if (entering(tcp)) {
+               print_sockopt_fd_level_name(tcp, tcp->u_arg[0],
+                                           tcp->u_arg[1], tcp->u_arg[2]);
+       } 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]);
+               } 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 MCAST_JOIN_GROUP
+static void
+print_group_req(struct tcb *tcp, long addr, int len)
 {
-       struct icmp_filter      filter;
+       struct group_req greq;
 
-       if (!addr) {
-               tprints("NULL");
-               return;
-       }
-       if (syserror(tcp) || !verbose(tcp)) {
+       if (len != sizeof(greq) ||
+           umove(tcp, addr, &greq) < 0) {
                tprintf("%#lx", addr);
                return;
        }
-       if (umove(tcp, addr, &filter) < 0) {
-               tprints("{...}");
+
+       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
+
+       tprintf("{gr_interface=%u, gr_group={sa_family=", greq.gr_interface);
+       printxval(addrfams, a.sa->sa_family, "AF_???");
+
+       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));
                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);
+               return;
+#endif /* HAVE_INET_NTOP */
        }
 
-       tprints("~(");
-       printflags(icmpfilterflags, ~filter.data, "ICMP_???");
-       tprints(")");
+       tprints(", sa_data=");
+       print_quoted_string(a.sa->sa_data, sizeof(a.sa->sa_data), 0);
+       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) {
+               tprintf("%#lx", 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) {
+               tprintf("%#lx", 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, int level, 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)
+#ifdef 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;
+                       print_linger(tcp, addr, len);
+                       goto done;
 #endif
                }
                break;
-#ifdef SOL_IP
+
        case SOL_IP:
-               printxval(sockipoptions, name, "IP_???");
-               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 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_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;
+#ifdef ICMP_FILTER
+               case ICMP_FILTER:
+                       print_icmp_filter(tcp, addr, len);
+                       goto done;
 #endif
                }
                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 {
+               tprintf("%#lx", addr);
        }
-       return 0;
+done:
+       tprintf(", %d", len);
 }
 
 int
 sys_setsockopt(struct tcb *tcp)
 {
        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]);
+               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;
 }