]> granicus.if.org Git - strace/blobdiff - net.c
Mpersify RTC_* ioctl parser
[strace] / net.c
diff --git a/net.c b/net.c
index 5a79381b676f2905352aa944ed474c8eaf017d18..3349758e3503a250860e5c911accfc10f69ea46d 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 <arpa/inet.h>
 #include <net/if.h>
 #include <asm/types.h>
-#if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC__ + __GLIBC_MINOR__ >= 3)
+#if defined(__GLIBC__)
 # include <netipx/ipx.h>
 #else
 # include <linux/ipx.h>
 #endif
 
-#if defined(__GLIBC__) && (((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1)) || defined(HAVE_SIN6_SCOPE_ID_LINUX))
-# if defined(HAVE_LINUX_IN6_H)
-#  if defined(HAVE_SIN6_SCOPE_ID_LINUX)
-#   undef in6_addr
-#   undef ipv6_mreq
-#   undef sockaddr_in6
-#   define in6_addr in6_addr_kernel
-#   define ipv6_mreq ipv6_mreq_kernel
-#   define sockaddr_in6 sockaddr_in6_kernel
-#  endif
-#  include <linux/in6.h>
-#  if defined(HAVE_SIN6_SCOPE_ID_LINUX)
-#   undef in6_addr
-#   undef ipv6_mreq
-#   undef sockaddr_in6
-#   define in6_addr in6_addr_libc
-#   define ipv6_mreq ipv6_mreq_libc
-#   define sockaddr_in6 sockaddr_in6_kernel
-#  endif
-# endif
-#endif
-
-#if defined(HAVE_SYS_UIO_H)
-# include <sys/uio.h>
+#if defined(HAVE_LINUX_IP_VS_H)
+# include <linux/ip_vs.h>
 #endif
 #if defined(HAVE_LINUX_NETLINK_H)
 # include <linux/netlink.h>
 #endif
+#if defined(HAVE_LINUX_NETFILTER_ARP_ARP_TABLES_H)
+# include <linux/netfilter_arp/arp_tables.h>
+#endif
+#if defined(HAVE_LINUX_NETFILTER_BRIDGE_EBTABLES_H)
+# include <linux/netfilter_bridge/ebtables.h>
+#endif
+#if defined(HAVE_LINUX_NETFILTER_IPV4_IP_TABLES_H)
+# include <linux/netfilter_ipv4/ip_tables.h>
+#endif
+#if defined(HAVE_LINUX_NETFILTER_IPV6_IP6_TABLES_H)
+# include <linux/netfilter_ipv6/ip6_tables.h>
+#endif
 #if defined(HAVE_LINUX_IF_PACKET_H)
 # include <linux/if_packet.h>
 #endif
 #if defined(HAVE_LINUX_ICMP_H)
 # include <linux/icmp.h>
 #endif
-#ifndef PF_UNSPEC
-# define PF_UNSPEC AF_UNSPEC
+#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
 
-/* Under Linux these are enums so we can't test for them with ifdef. */
-#define IPPROTO_EGP IPPROTO_EGP
-#define IPPROTO_PUP IPPROTO_PUP
-#define IPPROTO_IDP IPPROTO_IDP
-#define IPPROTO_IGMP IPPROTO_IGMP
-#define IPPROTO_RAW IPPROTO_RAW
-#define IPPROTO_MAX IPPROTO_MAX
-
-static const struct xlat domains[] = {
-#ifdef PF_AAL5
-       { PF_AAL5,      "PF_AAL5"       },
-#endif
-#ifdef PF_APPLETALK
-       { PF_APPLETALK, "PF_APPLETALK"  },
-#endif
-#ifdef PF_ASH
-       { PF_ASH,       "PF_ASH"        },
-#endif
-#ifdef PF_ATMPVC
-       { PF_ATMPVC,    "PF_ATMPVC"     },
-#endif
-#ifdef PF_ATMSVC
-       { PF_ATMSVC,    "PF_ATMSVC"     },
-#endif
-#ifdef PF_AX25
-       { PF_AX25,      "PF_AX25"       },
-#endif
-#ifdef PF_BLUETOOTH
-       { PF_BLUETOOTH, "PF_BLUETOOTH"  },
-#endif
-#ifdef PF_BRIDGE
-       { PF_BRIDGE,    "PF_BRIDGE"     },
-#endif
-#ifdef PF_DECnet
-       { PF_DECnet,    "PF_DECnet"     },
-#endif
-#ifdef PF_DECNET
-       { PF_DECNET,    "PF_DECNET"     },
-#endif
-#ifdef PF_ECONET
-       { PF_ECONET,    "PF_ECONET"     },
-#endif
-#ifdef PF_FILE
-       { PF_FILE,      "PF_FILE"       },
-#endif
-#ifdef PF_IMPLINK
-       { PF_IMPLINK,   "PF_IMPLINK"    },
-#endif
-#ifdef PF_INET
-       { PF_INET,      "PF_INET"       },
-#endif
-#ifdef PF_INET6
-       { PF_INET6,     "PF_INET6"      },
-#endif
-#ifdef PF_IPX
-       { PF_IPX,       "PF_IPX"        },
-#endif
-#ifdef PF_IRDA
-       { PF_IRDA,      "PF_IRDA"       },
-#endif
-#ifdef PF_ISO
-       { PF_ISO,       "PF_ISO"        },
-#endif
-#ifdef PF_KEY
-       { PF_KEY,       "PF_KEY"        },
-#endif
-#ifdef PF_UNIX
-       { PF_UNIX,      "PF_UNIX"       },
-#endif
-#ifdef PF_LOCAL
-       { PF_LOCAL,     "PF_LOCAL"      },
-#endif
-#ifdef PF_NETBEUI
-       { PF_NETBEUI,   "PF_NETBEUI"    },
-#endif
-#ifdef PF_NETLINK
-       { PF_NETLINK,   "PF_NETLINK"    },
-#endif
-#ifdef PF_NETROM
-       { PF_NETROM,    "PF_NETROM"     },
-#endif
-#ifdef PF_PACKET
-       { PF_PACKET,    "PF_PACKET"     },
-#endif
-#ifdef PF_PPPOX
-       { PF_PPPOX,     "PF_PPPOX"      },
-#endif
-#ifdef PF_ROSE
-       { PF_ROSE,      "PF_ROSE"       },
-#endif
-#ifdef PF_ROUTE
-       { PF_ROUTE,     "PF_ROUTE"      },
-#endif
-#ifdef PF_SECURITY
-       { PF_SECURITY,  "PF_SECURITY"   },
-#endif
-#ifdef PF_SNA
-       { PF_SNA,       "PF_SNA"        },
-#endif
-#ifdef PF_UNSPEC
-       { PF_UNSPEC,    "PF_UNSPEC"     },
-#endif
-#ifdef PF_WANPIPE
-       { PF_WANPIPE,   "PF_WANPIPE"    },
-#endif
-#ifdef PF_X25
-       { PF_X25,       "PF_X25"        },
-#endif
-       { 0,            NULL            },
-};
-const struct xlat addrfams[] = {
-#ifdef AF_APPLETALK
-       { AF_APPLETALK, "AF_APPLETALK"  },
-#endif
-#ifdef AF_ASH
-       { AF_ASH,       "AF_ASH"        },
-#endif
-#ifdef AF_ATMPVC
-       { AF_ATMPVC,    "AF_ATMPVC"     },
-#endif
-#ifdef AF_ATMSVC
-       { AF_ATMSVC,    "AF_ATMSVC"     },
-#endif
-#ifdef AF_AX25
-       { AF_AX25,      "AF_AX25"       },
-#endif
-#ifdef AF_BLUETOOTH
-       { AF_BLUETOOTH, "AF_BLUETOOTH"  },
-#endif
-#ifdef AF_BRIDGE
-       { AF_BRIDGE,    "AF_BRIDGE"     },
-#endif
-#ifdef AF_DECnet
-       { AF_DECnet,    "AF_DECnet"     },
-#endif
-#ifdef AF_ECONET
-       { AF_ECONET,    "AF_ECONET"     },
-#endif
-#ifdef AF_FILE
-       { AF_FILE,      "AF_FILE"       },
-#endif
-#ifdef AF_IMPLINK
-       { AF_IMPLINK,   "AF_IMPLINK"    },
-#endif
-#ifdef AF_INET
-       { AF_INET,      "AF_INET"       },
-#endif
-#ifdef AF_INET6
-       { AF_INET6,     "AF_INET6"      },
-#endif
-#ifdef AF_IPX
-       { AF_IPX,       "AF_IPX"        },
-#endif
-#ifdef AF_IRDA
-       { AF_IRDA,      "AF_IRDA"       },
-#endif
-#ifdef AF_ISO
-       { AF_ISO,       "AF_ISO"        },
-#endif
-#ifdef AF_KEY
-       { AF_KEY,       "AF_KEY"        },
-#endif
-#ifdef AF_UNIX
-       { AF_UNIX,      "AF_UNIX"       },
-#endif
-#ifdef AF_LOCAL
-       { AF_LOCAL,     "AF_LOCAL"      },
-#endif
-#ifdef AF_NETBEUI
-       { AF_NETBEUI,   "AF_NETBEUI"    },
-#endif
-#ifdef AF_NETLINK
-       { AF_NETLINK,   "AF_NETLINK"    },
-#endif
-#ifdef AF_NETROM
-       { AF_NETROM,    "AF_NETROM"     },
-#endif
-#ifdef AF_PACKET
-       { AF_PACKET,    "AF_PACKET"     },
-#endif
-#ifdef AF_PPPOX
-       { AF_PPPOX,     "AF_PPPOX"      },
-#endif
-#ifdef AF_ROSE
-       { AF_ROSE,      "AF_ROSE"       },
-#endif
-#ifdef AF_ROUTE
-       { AF_ROUTE,     "AF_ROUTE"      },
-#endif
-#ifdef AF_SECURITY
-       { AF_SECURITY,  "AF_SECURITY"   },
-#endif
-#ifdef AF_SNA
-       { AF_SNA,       "AF_SNA"        },
-#endif
-#ifdef AF_UNSPEC
-       { AF_UNSPEC,    "AF_UNSPEC"     },
-#endif
-#ifdef AF_WANPIPE
-       { AF_WANPIPE,   "AF_WANPIPE"    },
-#endif
-#ifdef AF_X25
-       { AF_X25,       "AF_X25"        },
-#endif
-       { 0,            NULL            },
-};
-static const struct xlat socktypes[] = {
-       { SOCK_STREAM,  "SOCK_STREAM"   },
-       { SOCK_DGRAM,   "SOCK_DGRAM"    },
-#ifdef SOCK_RAW
-       { SOCK_RAW,     "SOCK_RAW"      },
-#endif
-#ifdef SOCK_RDM
-       { SOCK_RDM,     "SOCK_RDM"      },
-#endif
-#ifdef SOCK_SEQPACKET
-       { SOCK_SEQPACKET,"SOCK_SEQPACKET"},
-#endif
-#ifdef SOCK_DCCP
-       { SOCK_DCCP,    "SOCK_DCCP"     },
-#endif
-#ifdef SOCK_PACKET
-       { SOCK_PACKET,  "SOCK_PACKET"   },
-#endif
-       { 0,            NULL            },
-};
-static const struct xlat sock_type_flags[] = {
-#ifdef SOCK_CLOEXEC
-       { SOCK_CLOEXEC, "SOCK_CLOEXEC"  },
-#endif
-#ifdef SOCK_NONBLOCK
-       { SOCK_NONBLOCK,"SOCK_NONBLOCK" },
-#endif
-       { 0,            NULL            },
-};
+#include "xlat/addrfams.h"
+#include "xlat/socktypes.h"
+#include "xlat/sock_type_flags.h"
 #ifndef SOCK_TYPE_MASK
 # define SOCK_TYPE_MASK 0xf
 #endif
-static const struct xlat socketlayers[] = {
-#if defined(SOL_IP)
-       { SOL_IP,       "SOL_IP"        },
-#endif
-#if defined(SOL_ICMP)
-       { SOL_ICMP,     "SOL_ICMP"      },
-#endif
-#if defined(SOL_TCP)
-       { SOL_TCP,      "SOL_TCP"       },
-#endif
-#if defined(SOL_UDP)
-       { SOL_UDP,      "SOL_UDP"       },
-#endif
-#if defined(SOL_IPV6)
-       { SOL_IPV6,     "SOL_IPV6"      },
-#endif
-#if defined(SOL_ICMPV6)
-       { SOL_ICMPV6,   "SOL_ICMPV6"    },
-#endif
-#if defined(SOL_SCTP)
-       { SOL_SCTP,     "SOL_SCTP"      },
-#endif
-#if defined(SOL_UDPLITE)
-       { SOL_UDPLITE,  "SOL_UDPLITE"   },
-#endif
-#if defined(SOL_RAW)
-       { SOL_RAW,      "SOL_RAW"       },
-#endif
-#if defined(SOL_IPX)
-       { SOL_IPX,      "SOL_IPX"       },
-#endif
-#if defined(SOL_AX25)
-       { SOL_AX25,     "SOL_AX25"      },
-#endif
-#if defined(SOL_ATALK)
-       { SOL_ATALK,    "SOL_ATALK"     },
-#endif
-#if defined(SOL_NETROM)
-       { SOL_NETROM,   "SOL_NETROM"    },
-#endif
-#if defined(SOL_ROSE)
-       { SOL_ROSE,     "SOL_ROSE"      },
-#endif
-#if defined(SOL_DECNET)
-       { SOL_DECNET,   "SOL_DECNET"    },
-#endif
-#if defined(SOL_X25)
-       { SOL_X25,      "SOL_X25"       },
-#endif
-#if defined(SOL_PACKET)
-       { SOL_PACKET,   "SOL_PACKET"    },
-#endif
-#if defined(SOL_ATM)
-       { SOL_ATM,      "SOL_ATM"       },
-#endif
-#if defined(SOL_AAL)
-       { SOL_AAL,      "SOL_AAL"       },
-#endif
-#if defined(SOL_IRDA)
-       { SOL_IRDA,     "SOL_IRDA"      },
-#endif
-#if defined(SOL_NETBEUI)
-       { SOL_NETBEUI,  "SOL_NETBEUI"   },
-#endif
-#if defined(SOL_LLC)
-       { SOL_LLC,      "SOL_LLC"       },
-#endif
-#if defined(SOL_DCCP)
-       { SOL_DCCP,     "SOL_DCCP"      },
-#endif
-#if defined(SOL_NETLINK)
-       { SOL_NETLINK,  "SOL_NETLINK"   },
-#endif
-#if defined(SOL_TIPC)
-       { SOL_TIPC,     "SOL_TIPC"      },
-#endif
-#if defined(SOL_RXRPC)
-       { SOL_RXRPC,    "SOL_RXRPC"     },
-#endif
-#if defined(SOL_PPPOL2TP)
-       { SOL_PPPOL2TP, "SOL_PPPOL2TP"  },
-#endif
-#if defined(SOL_BLUETOOTH)
-       { SOL_BLUETOOTH,"SOL_BLUETOOTH" },
-#endif
-#if defined(SOL_PNPIPE)
-       { SOL_PNPIPE,   "SOL_PNPIPE"    },
-#endif
-#if defined(SOL_RDS)
-       { SOL_RDS,      "SOL_RDS"       },
-#endif
-#if defined(SOL_IUVC)
-       { SOL_IUCV,     "SOL_IUCV"      },
-#endif
-#if defined(SOL_CAIF)
-       { SOL_CAIF,     "SOL_CAIF"      },
-#endif
-       { SOL_SOCKET,   "SOL_SOCKET"    },      /* Never used! */
-       /* The SOL_* array should remain not NULL-terminated. */
-};
-/*** WARNING: DANGER WILL ROBINSON: NOTE "socketlayers" array above
-     falls into "protocols" array below!!!!   This is intended!!! ***/
-static const struct xlat protocols[] = {
-       { IPPROTO_IP,   "IPPROTO_IP"    },
-       { IPPROTO_ICMP, "IPPROTO_ICMP"  },
-       { IPPROTO_TCP,  "IPPROTO_TCP"   },
-       { IPPROTO_UDP,  "IPPROTO_UDP"   },
-#ifdef IPPROTO_IGMP
-       { IPPROTO_IGMP, "IPPROTO_IGMP"  },
-#endif
-#ifdef IPPROTO_GGP
-       { IPPROTO_GGP,  "IPPROTO_GGP"   },
-#endif
-#ifdef IPPROTO_IPIP
-       { IPPROTO_IPIP, "IPPROTO_IPIP"  },
-#endif
-#ifdef IPPROTO_EGP
-       { IPPROTO_EGP,  "IPPROTO_EGP"   },
-#endif
-#ifdef IPPROTO_PUP
-       { IPPROTO_PUP,  "IPPROTO_PUP"   },
-#endif
-#ifdef IPPROTO_IDP
-       { IPPROTO_IDP,  "IPPROTO_IDP"   },
-#endif
-#ifdef IPPROTO_TP
-       { IPPROTO_TP,   "IPPROTO_TP"    },
-#endif
-#ifdef IPPROTO_DCCP
-       { IPPROTO_DCCP, "IPPROTO_DCCP"  },
-#endif
-#ifdef IPPROTO_IPV6
-       { IPPROTO_IPV6, "IPPROTO_IPV6"  },
-#endif
-#ifdef IPPROTO_ROUTING
-       { IPPROTO_ROUTING, "IPPROTO_ROUTING" },
-#endif
-#ifdef IPPROTO_FRAGMENT
-       { IPPROTO_FRAGMENT, "IPPROTO_FRAGMENT" },
-#endif
-#ifdef IPPROTO_RSVP
-       { IPPROTO_RSVP, "IPPROTO_RSVP"  },
-#endif
-#ifdef IPPROTO_GRE
-       { IPPROTO_GRE,  "IPPROTO_GRE"   },
-#endif
-#ifdef IPPROTO_ESP
-       { IPPROTO_ESP,  "IPPROTO_ESP"   },
-#endif
-#ifdef IPPROTO_AH
-       { IPPROTO_AH,   "IPPROTO_AH"    },
-#endif
-#ifdef IPPROTO_ICMPV6
-       { IPPROTO_ICMPV6, "IPPROTO_ICMPV6" },
-#endif
-#ifdef IPPROTO_NONE
-       { IPPROTO_NONE, "IPPROTO_NONE"  },
-#endif
-#ifdef IPPROTO_DSTOPTS
-       { IPPROTO_DSTOPTS, "IPPROTO_DSTOPTS" },
-#endif
-#ifdef IPPROTO_HELLO
-       { IPPROTO_HELLO, "IPPROTO_HELLO" },
-#endif
-#ifdef IPPROTO_ND
-       { IPPROTO_ND,   "IPPROTO_ND"    },
-#endif
-#ifdef IPPROTO_MTP
-       { IPPROTO_MTP,  "IPPROTO_MTP"   },
-#endif
-#ifdef IPPROTO_ENCAP
-       { IPPROTO_ENCAP, "IPPROTO_ENCAP" },
-#endif
-#ifdef IPPROTO_PIM
-       { IPPROTO_PIM,  "IPPROTO_PIM"   },
-#endif
-#ifdef IPPROTO_COMP
-       { IPPROTO_COMP, "IPPROTO_COMP"  },
-#endif
-#ifdef IPPROTO_SCTP
-       { IPPROTO_SCTP, "IPPROTO_SCTP"  },
-#endif
-#ifdef IPPROTO_UDPLITE
-       { IPPROTO_UDPLITE, "IPPROTO_UDPLITE" },
-#endif
-#ifdef IPPROTO_RAW
-       { IPPROTO_RAW,  "IPPROTO_RAW"   },
-#endif
-#ifdef IPPROTO_MAX
-       { IPPROTO_MAX,  "IPPROTO_MAX"   },
-#endif
-       { 0,            NULL            },
-};
-static const struct xlat msg_flags[] = {
-       { MSG_OOB,              "MSG_OOB"               },
-#ifdef MSG_DONTROUTE
-       { MSG_DONTROUTE,        "MSG_DONTROUTE"         },
-#endif
-#ifdef MSG_PEEK
-       { MSG_PEEK,             "MSG_PEEK"              },
-#endif
-#ifdef MSG_CTRUNC
-       { MSG_CTRUNC,           "MSG_CTRUNC"            },
-#endif
-#ifdef MSG_PROXY
-       { MSG_PROXY,            "MSG_PROXY"             },
-#endif
-#ifdef MSG_EOR
-       { MSG_EOR,              "MSG_EOR"               },
-#endif
-#ifdef MSG_WAITALL
-       { MSG_WAITALL,          "MSG_WAITALL"           },
-#endif
-#ifdef MSG_TRUNC
-       { MSG_TRUNC,            "MSG_TRUNC"             },
-#endif
-#ifdef MSG_CTRUNC
-       { MSG_CTRUNC,           "MSG_CTRUNC"            },
-#endif
-#ifdef MSG_ERRQUEUE
-       { MSG_ERRQUEUE,         "MSG_ERRQUEUE"          },
-#endif
-#ifdef MSG_DONTWAIT
-       { MSG_DONTWAIT,         "MSG_DONTWAIT"          },
-#endif
-#ifdef MSG_CONFIRM
-       { MSG_CONFIRM,          "MSG_CONFIRM"           },
-#endif
-#ifdef MSG_PROBE
-       { MSG_PROBE,            "MSG_PROBE"             },
-#endif
-#ifdef MSG_FIN
-       { MSG_FIN,              "MSG_FIN"               },
-#endif
-#ifdef MSG_SYN
-       { MSG_SYN,              "MSG_SYN"               },
-#endif
-#ifdef MSG_RST
-       { MSG_RST,              "MSG_RST"               },
-#endif
-#ifdef MSG_NOSIGNAL
-       { MSG_NOSIGNAL,         "MSG_NOSIGNAL"          },
-#endif
-#ifdef MSG_MORE
-       { MSG_MORE,             "MSG_MORE"              },
-#endif
-#ifdef MSG_WAITFORONE
-       { MSG_WAITFORONE,       "MSG_WAITFORONE"        },
-#endif
-#ifdef MSG_CMSG_CLOEXEC
-       { MSG_CMSG_CLOEXEC,     "MSG_CMSG_CLOEXEC"      },
-#endif
-       { 0,                    NULL                    },
-};
 
-static const struct xlat sockoptions[] = {
-#ifdef SO_ACCEPTCONN
-       { SO_ACCEPTCONN,        "SO_ACCEPTCONN" },
-#endif
-#ifdef SO_ALLRAW
-       { SO_ALLRAW,    "SO_ALLRAW"     },
-#endif
-#ifdef SO_ATTACH_FILTER
-       { SO_ATTACH_FILTER,     "SO_ATTACH_FILTER"      },
-#endif
-#ifdef SO_BINDTODEVICE
-       { SO_BINDTODEVICE,      "SO_BINDTODEVICE"       },
-#endif
-#ifdef SO_BROADCAST
-       { SO_BROADCAST, "SO_BROADCAST"  },
-#endif
-#ifdef SO_BSDCOMPAT
-       { SO_BSDCOMPAT, "SO_BSDCOMPAT"  },
-#endif
-#ifdef SO_DEBUG
-       { SO_DEBUG,     "SO_DEBUG"      },
-#endif
-#ifdef SO_DETACH_FILTER
-       { SO_DETACH_FILTER,     "SO_DETACH_FILTER"      },
-#endif
-#ifdef SO_DONTROUTE
-       { SO_DONTROUTE, "SO_DONTROUTE"  },
-#endif
-#ifdef SO_ERROR
-       { SO_ERROR,     "SO_ERROR"      },
-#endif
-#ifdef SO_ICS
-       { SO_ICS,       "SO_ICS"        },
-#endif
-#ifdef SO_IMASOCKET
-       { SO_IMASOCKET, "SO_IMASOCKET"  },
-#endif
-#ifdef SO_KEEPALIVE
-       { SO_KEEPALIVE, "SO_KEEPALIVE"  },
-#endif
-#ifdef SO_LINGER
-       { SO_LINGER,    "SO_LINGER"     },
-#endif
-#ifdef SO_LISTENING
-       { SO_LISTENING, "SO_LISTENING"  },
-#endif
-#ifdef SO_MGMT
-       { SO_MGMT,      "SO_MGMT"       },
-#endif
-#ifdef SO_NO_CHECK
-       { SO_NO_CHECK,  "SO_NO_CHECK"   },
-#endif
-#ifdef SO_OOBINLINE
-       { SO_OOBINLINE, "SO_OOBINLINE"  },
-#endif
-#ifdef SO_ORDREL
-       { SO_ORDREL,    "SO_ORDREL"     },
-#endif
-#ifdef SO_PARALLELSVR
-       { SO_PARALLELSVR,       "SO_PARALLELSVR"        },
-#endif
-#ifdef SO_PASSCRED
-       { SO_PASSCRED,  "SO_PASSCRED"   },
-#endif
-#ifdef SO_PEERCRED
-       { SO_PEERCRED,  "SO_PEERCRED"   },
-#endif
-#ifdef SO_PEERNAME
-       { SO_PEERNAME,  "SO_PEERNAME"   },
-#endif
-#ifdef SO_PEERSEC
-       { SO_PEERSEC,   "SO_PEERSEC"    },
-#endif
-#ifdef SO_PRIORITY
-       { SO_PRIORITY,  "SO_PRIORITY"   },
-#endif
-#ifdef SO_PROTOTYPE
-       { SO_PROTOTYPE, "SO_PROTOTYPE"  },
-#endif
-#ifdef SO_RCVBUF
-       { SO_RCVBUF,    "SO_RCVBUF"     },
-#endif
-#ifdef SO_RCVLOWAT
-       { SO_RCVLOWAT,  "SO_RCVLOWAT"   },
-#endif
-#ifdef SO_RCVTIMEO
-       { SO_RCVTIMEO,  "SO_RCVTIMEO"   },
-#endif
-#ifdef SO_RDWR
-       { SO_RDWR,      "SO_RDWR"       },
-#endif
-#ifdef SO_REUSEADDR
-       { SO_REUSEADDR, "SO_REUSEADDR"  },
-#endif
-#ifdef SO_REUSEPORT
-       { SO_REUSEPORT, "SO_REUSEPORT"  },
-#endif
-#ifdef SO_SECURITY_AUTHENTICATION
-       { SO_SECURITY_AUTHENTICATION,"SO_SECURITY_AUTHENTICATION"},
-#endif
-#ifdef SO_SECURITY_ENCRYPTION_NETWORK
-       { SO_SECURITY_ENCRYPTION_NETWORK,"SO_SECURITY_ENCRYPTION_NETWORK"},
-#endif
-#ifdef SO_SECURITY_ENCRYPTION_TRANSPORT
-       { SO_SECURITY_ENCRYPTION_TRANSPORT,"SO_SECURITY_ENCRYPTION_TRANSPORT"},
-#endif
-#ifdef SO_SEMA
-       { SO_SEMA,      "SO_SEMA"       },
-#endif
-#ifdef SO_SNDBUF
-       { SO_SNDBUF,    "SO_SNDBUF"     },
-#endif
-#ifdef SO_SNDLOWAT
-       { SO_SNDLOWAT,  "SO_SNDLOWAT"   },
-#endif
-#ifdef SO_SNDTIMEO
-       { SO_SNDTIMEO,  "SO_SNDTIMEO"   },
-#endif
-#ifdef SO_TIMESTAMP
-       { SO_TIMESTAMP, "SO_TIMESTAMP"  },
-#endif
-#ifdef SO_TYPE
-       { SO_TYPE,      "SO_TYPE"       },
-#endif
-#ifdef SO_USELOOPBACK
-       { SO_USELOOPBACK,       "SO_USELOOPBACK"        },
-#endif
-       { 0,            NULL            },
-};
+#include "xlat/socketlayers.h"
 
-#if !defined(SOL_IP) && defined(IPPROTO_IP)
-#define SOL_IP IPPROTO_IP
-#endif
+#include "xlat/inet_protocols.h"
 
-#ifdef SOL_IP
-static const struct xlat sockipoptions[] = {
-#ifdef IP_TOS
-       { IP_TOS,               "IP_TOS"                },
-#endif
-#ifdef IP_TTL
-       { IP_TTL,               "IP_TTL"                },
-#endif
-#ifdef IP_HDRINCL
-       { IP_HDRINCL,           "IP_HDRINCL"            },
-#endif
-#ifdef IP_OPTIONS
-       { IP_OPTIONS,           "IP_OPTIONS"            },
-#endif
-#ifdef IP_ROUTER_ALERT
-       { IP_ROUTER_ALERT,      "IP_ROUTER_ALERT"       },
-#endif
-#ifdef IP_RECVOPTIONS
-       { IP_RECVOPTIONS,       "IP_RECVOPTIONS"        },
-#endif
-#ifdef IP_RECVOPTS
-       { IP_RECVOPTS,          "IP_RECVOPTS"           },
-#endif
-#ifdef IP_RECVRETOPTS
-       { IP_RECVRETOPTS,       "IP_RECVRETOPTS"        },
-#endif
-#ifdef IP_RECVDSTADDR
-       { IP_RECVDSTADDR,       "IP_RECVDSTADDR"        },
-#endif
-#ifdef IP_RETOPTS
-       { IP_RETOPTS,           "IP_RETOPTS"            },
-#endif
-#ifdef IP_PKTINFO
-       { IP_PKTINFO,           "IP_PKTINFO"            },
-#endif
-#ifdef IP_PKTOPTIONS
-       { IP_PKTOPTIONS,        "IP_PKTOPTIONS"         },
-#endif
-#ifdef IP_MTU_DISCOVER
-       { IP_MTU_DISCOVER,      "IP_MTU_DISCOVER"       },
-#endif
-#ifdef IP_RECVERR
-       { IP_RECVERR,           "IP_RECVERR"            },
-#endif
-#ifdef IP_RECVTTL
-       { IP_RECVTTL,           "IP_RECVTTL"            },
-#endif
-#ifdef IP_RECVTOS
-       { IP_RECVTOS,           "IP_RECVTOS"            },
-#endif
-#ifdef IP_MTU
-       { IP_MTU,               "IP_MTU"                },
-#endif
-#ifdef IP_MULTICAST_IF
-       { IP_MULTICAST_IF,      "IP_MULTICAST_IF"       },
-#endif
-#ifdef IP_MULTICAST_TTL
-       { IP_MULTICAST_TTL,     "IP_MULTICAST_TTL"      },
-#endif
-#ifdef IP_MULTICAST_LOOP
-       { IP_MULTICAST_LOOP,    "IP_MULTICAST_LOOP"     },
-#endif
-#ifdef IP_ADD_MEMBERSHIP
-       { IP_ADD_MEMBERSHIP,    "IP_ADD_MEMBERSHIP"     },
-#endif
-#ifdef IP_DROP_MEMBERSHIP
-       { IP_DROP_MEMBERSHIP,   "IP_DROP_MEMBERSHIP"    },
-#endif
-#ifdef IP_BROADCAST_IF
-       { IP_BROADCAST_IF,      "IP_BROADCAST_IF"       },
-#endif
-#ifdef IP_RECVIFINDEX
-       { IP_RECVIFINDEX,       "IP_RECVIFINDEX"        },
-#endif
-#ifdef IP_MSFILTER
-       { IP_MSFILTER,          "IP_MSFILTER"           },
-#endif
-#ifdef MCAST_MSFILTER
-       { MCAST_MSFILTER,       "MCAST_MSFILTER"        },
-#endif
-#ifdef IP_FREEBIND
-       { IP_FREEBIND,          "IP_FREEBIND"           },
+#ifdef AF_NETLINK
+# if !defined NETLINK_SOCK_DIAG && defined NETLINK_INET_DIAG
+#  define NETLINK_SOCK_DIAG NETLINK_INET_DIAG
+# endif
+# include "xlat/netlink_protocols.h"
 #endif
-       { 0,                    NULL                    },
-};
-#endif /* SOL_IP */
 
-#ifdef SOL_IPV6
-static const struct xlat sockipv6options[] = {
-#ifdef IPV6_ADDRFORM
-       { IPV6_ADDRFORM,        "IPV6_ADDRFORM"         },
-#endif
-#ifdef MCAST_FILTER
-       { MCAST_FILTER,         "MCAST_FILTER"          },
-#endif
-#ifdef IPV6_PKTOPTIONS
-       { IPV6_PKTOPTIONS,      "IPV6_PKTOPTIONS"       },
-#endif
-#ifdef IPV6_MTU
-       { IPV6_MTU,             "IPV6_MTU"              },
-#endif
-#ifdef IPV6_V6ONLY
-       { IPV6_V6ONLY,          "IPV6_V6ONLY"           },
-#endif
-#ifdef IPV6_PKTINFO
-       { IPV6_PKTINFO,         "IPV6_PKTINFO"          },
-#endif
-#ifdef IPV6_HOPLIMIT
-       { IPV6_HOPLIMIT,        "IPV6_HOPLIMIT"         },
-#endif
-#ifdef IPV6_RTHDR
-       { IPV6_RTHDR,           "IPV6_RTHDR"            },
-#endif
-#ifdef IPV6_HOPOPTS
-       { IPV6_HOPOPTS,         "IPV6_HOPOPTS"          },
+#if defined(HAVE_BLUETOOTH_BLUETOOTH_H)
+# include "xlat/bt_protocols.h"
 #endif
-#ifdef IPV6_DSTOPTS
-       { IPV6_DSTOPTS,         "IPV6_DSTOPTS"          },
-#endif
-#ifdef IPV6_FLOWINFO
-       { IPV6_FLOWINFO,        "IPV6_FLOWINFO"         },
-#endif
-#ifdef IPV6_UNICAST_HOPS
-       { IPV6_UNICAST_HOPS,    "IPV6_UNICAST_HOPS"     },
-#endif
-#ifdef IPV6_MULTICAST_HOPS
-       { IPV6_MULTICAST_HOPS,  "IPV6_MULTICAST_HOPS"   },
-#endif
-#ifdef IPV6_MULTICAST_LOOP
-       { IPV6_MULTICAST_LOOP,  "IPV6_MULTICAST_LOOP"   },
-#endif
-#ifdef IPV6_MULTICAST_IF
-       { IPV6_MULTICAST_IF,    "IPV6_MULTICAST_IF"     },
-#endif
-#ifdef IPV6_MTU_DISCOVER
-       { IPV6_MTU_DISCOVER,    "IPV6_MTU_DISCOVER"     },
-#endif
-#ifdef IPV6_RECVERR
-       { IPV6_RECVERR,         "IPV6_RECVERR"          },
-#endif
-#ifdef IPV6_FLOWINFO_SEND
-       { IPV6_FLOWINFO_SEND,   "IPV6_FLOWINFO_SEND"    },
-#endif
-#ifdef IPV6_ADD_MEMBERSHIP
-       { IPV6_ADD_MEMBERSHIP,  "IPV6_ADD_MEMBERSHIP"   },
-#endif
-#ifdef IPV6_DROP_MEMBERSHIP
-       { IPV6_DROP_MEMBERSHIP, "IPV6_DROP_MEMBERSHIP"  },
-#endif
-#ifdef IPV6_ROUTER_ALERT
-       { IPV6_ROUTER_ALERT,    "IPV6_ROUTER_ALERT"     },
-#endif
-       { 0,                    NULL                    },
-};
-#endif /* SOL_IPV6 */
 
-#ifdef SOL_IPX
-static const struct xlat sockipxoptions[] = {
-       { IPX_TYPE,     "IPX_TYPE"      },
-       { 0,            NULL            },
-};
-#endif /* SOL_IPX */
+#include "xlat/msg_flags.h"
 
-#ifdef SOL_RAW
-static const struct xlat sockrawoptions[] = {
-#if defined(ICMP_FILTER)
-       { ICMP_FILTER,          "ICMP_FILTER"   },
+#if defined(AF_PACKET) /* from e.g. linux/if_packet.h */
+# include "xlat/af_packet_types.h"
 #endif
-       { 0,                    NULL            },
-};
-#endif /* SOL_RAW */
 
-#ifdef SOL_PACKET
-static const struct xlat sockpacketoptions[] = {
-#ifdef PACKET_ADD_MEMBERSHIP
-       { PACKET_ADD_MEMBERSHIP,        "PACKET_ADD_MEMBERSHIP" },
-#endif
-#ifdef PACKET_DROP_MEMBERSHIP
-       { PACKET_DROP_MEMBERSHIP,       "PACKET_DROP_MEMBERSHIP"},
-#endif
-#if defined(PACKET_RECV_OUTPUT)
-       { PACKET_RECV_OUTPUT,           "PACKET_RECV_OUTPUT"    },
-#endif
-#if defined(PACKET_RX_RING)
-       { PACKET_RX_RING,               "PACKET_RX_RING"        },
-#endif
-#if defined(PACKET_STATISTICS)
-       { PACKET_STATISTICS,            "PACKET_STATISTICS"     },
-#endif
-#if defined(PACKET_COPY_THRESH)
-       { PACKET_COPY_THRESH,           "PACKET_COPY_THRESH"    },
-#endif
-#if defined(PACKET_AUXDATA)
-       { PACKET_AUXDATA,               "PACKET_AUXDATA"        },
-#endif
-#if defined(PACKET_ORIGDEV)
-       { PACKET_ORIGDEV,               "PACKET_ORIGDEV"        },
-#endif
-#if defined(PACKET_VERSION)
-       { PACKET_VERSION,               "PACKET_VERSION"        },
-#endif
-#if defined(PACKET_HDRLEN)
-       { PACKET_HDRLEN,                "PACKET_HDRLEN" },
-#endif
-#if defined(PACKET_RESERVE)
-       { PACKET_RESERVE,               "PACKET_RESERVE"        },
-#endif
-#if defined(PACKET_TX_RING)
-       { PACKET_TX_RING,               "PACKET_TX_RING"        },
-#endif
-#if defined(PACKET_LOSS)
-       { PACKET_LOSS,                  "PACKET_LOSS"   },
-#endif
-       { 0,                            NULL                    },
-};
-#endif /* SOL_PACKET */
+static void
+print_ifindex(unsigned int ifindex)
+{
+#ifdef HAVE_IF_INDEXTONAME
+       char buf[IFNAMSIZ + 1];
 
-#ifdef SOL_SCTP
-static const struct xlat socksctpoptions[] = {
-#if defined(SCTP_RTOINFO)
-       { SCTP_RTOINFO,                 "SCTP_RTOINFO"  },
-#endif
-#if defined(SCTP_ASSOCINFO)
-       { SCTP_ASSOCINFO,               "SCTP_ASSOCINFO"},
-#endif
-#if defined(SCTP_INITMSG)
-       { SCTP_INITMSG,                 "SCTP_INITMSG"  },
-#endif
-#if defined(SCTP_NODELAY)
-       { SCTP_NODELAY,                 "SCTP_NODELAY"  },
-#endif
-#if defined(SCTP_AUTOCLOSE)
-       { SCTP_AUTOCLOSE,               "SCTP_AUTOCLOSE"},
-#endif
-#if defined(SCTP_SET_PEER_PRIMARY_ADDR)
-       { SCTP_SET_PEER_PRIMARY_ADDR,   "SCTP_SET_PEER_PRIMARY_ADDR"},
-#endif
-#if defined(SCTP_PRIMARY_ADDR)
-       { SCTP_PRIMARY_ADDR,            "SCTP_PRIMARY_ADDR"     },
-#endif
-#if defined(SCTP_ADAPTATION_LAYER)
-       { SCTP_ADAPTATION_LAYER,        "SCTP_ADAPTATION_LAYER" },
-#endif
-#if defined(SCTP_DISABLE_FRAGMENTS)
-       { SCTP_DISABLE_FRAGMENTS,       "SCTP_DISABLE_FRAGMENTS"},
-#endif
-#if defined(SCTP_PEER_ADDR_PARAMS)
-       { SCTP_PEER_ADDR_PARAMS,        "SCTP_PEER_ADDR_PARAMS" },
-#endif
-#if defined(SCTP_DEFAULT_SEND_PARAM)
-       { SCTP_DEFAULT_SEND_PARAM,      "SCTP_DEFAULT_SEND_PARAM"},
-#endif
-#if defined(SCTP_EVENTS)
-       { SCTP_EVENTS,                  "SCTP_EVENTS"           },
-#endif
-#if defined(SCTP_I_WANT_MAPPED_V4_ADDR)
-       { SCTP_I_WANT_MAPPED_V4_ADDR,   "SCTP_I_WANT_MAPPED_V4_ADDR"},
-#endif
-#if defined(SCTP_MAXSEG)
-       { SCTP_MAXSEG,                  "SCTP_MAXSEG"           },
-#endif
-#if defined(SCTP_STATUS)
-       { SCTP_STATUS,                  "SCTP_STATUS"           },
-#endif
-#if defined(SCTP_GET_PEER_ADDR_INFO)
-       { SCTP_GET_PEER_ADDR_INFO,      "SCTP_GET_PEER_ADDR_INFO"},
-#endif
-#if defined(SCTP_DELAYED_ACK)
-       { SCTP_DELAYED_ACK,             "SCTP_DELAYED_ACK"      },
-#endif
-#if defined(SCTP_CONTEXT)
-       { SCTP_CONTEXT,                 "SCTP_CONTEXT"          },
-#endif
-#if defined(SCTP_FRAGMENT_INTERLEAVE)
-       { SCTP_FRAGMENT_INTERLEAVE,     "SCTP_FRAGMENT_INTERLEAVE"},
-#endif
-#if defined(SCTP_PARTIAL_DELIVERY_POINT)
-       { SCTP_PARTIAL_DELIVERY_POINT,  "SCTP_PARTIAL_DELIVERY_POINT"},
-#endif
-#if defined(SCTP_MAX_BURST)
-       { SCTP_MAX_BURST,               "SCTP_MAX_BURST"        },
-#endif
-#if defined(SCTP_AUTH_CHUNK)
-       { SCTP_AUTH_CHUNK,              "SCTP_AUTH_CHUNK"       },
-#endif
-#if defined(SCTP_HMAC_IDENT)
-       { SCTP_HMAC_IDENT,              "SCTP_HMAC_IDENT"       },
-#endif
-#if defined(SCTP_AUTH_KEY)
-       { SCTP_AUTH_KEY,                "SCTP_AUTH_KEY"         },
-#endif
-#if defined(SCTP_AUTH_ACTIVE_KEY)
-       { SCTP_AUTH_ACTIVE_KEY,         "SCTP_AUTH_ACTIVE_KEY"  },
-#endif
-#if defined(SCTP_AUTH_DELETE_KEY)
-       { SCTP_AUTH_DELETE_KEY,         "SCTP_AUTH_DELETE_KEY"  },
-#endif
-#if defined(SCTP_PEER_AUTH_CHUNKS)
-       { SCTP_PEER_AUTH_CHUNKS,        "SCTP_PEER_AUTH_CHUNKS" },
-#endif
-#if defined(SCTP_LOCAL_AUTH_CHUNKS)
-       { SCTP_LOCAL_AUTH_CHUNKS,       "SCTP_LOCAL_AUTH_CHUNKS"},
-#endif
-#if defined(SCTP_GET_ASSOC_NUMBER)
-       { SCTP_GET_ASSOC_NUMBER,        "SCTP_GET_ASSOC_NUMBER" },
+       if (if_indextoname(ifindex, buf)) {
+               tprints("if_nametoindex(");
+               print_quoted_string(buf, sizeof(buf), QUOTE_0_TERMINATED);
+               tprints(")");
+               return;
+       }
 #endif
+       tprintf("%u", ifindex);
+}
 
-       /* linux specific things */
-#if defined(SCTP_SOCKOPT_BINDX_ADD)
-       { SCTP_SOCKOPT_BINDX_ADD,       "SCTP_SOCKOPT_BINDX_ADD"        },
-#endif
-#if defined(SCTP_SOCKOPT_BINDX_REM)
-       { SCTP_SOCKOPT_BINDX_REM,       "SCTP_SOCKOPT_BINDX_REM"        },
-#endif
-#if defined(SCTP_SOCKOPT_PEELOFF)
-       { SCTP_SOCKOPT_PEELOFF,         "SCTP_SOCKOPT_PEELOFF"          },
-#endif
-#if defined(SCTP_GET_PEER_ADDRS_NUM_OLD)
-       { SCTP_GET_PEER_ADDRS_NUM_OLD,  "SCTP_GET_PEER_ADDRS_NUM_OLD"   },
-#endif
-#if defined(SCTP_GET_PEER_ADDRS_OLD)
-       { SCTP_GET_PEER_ADDRS_OLD,      "SCTP_GET_PEER_ADDRS_OLD"       },
-#endif
-#if defined(SCTP_GET_LOCAL_ADDRS_NUM_OLD)
-       { SCTP_GET_LOCAL_ADDRS_NUM_OLD, "SCTP_GET_LOCAL_ADDRS_NUM_OLD"  },
-#endif
-#if defined(SCTP_GET_LOCAL_ADDRS_OLD)
-       { SCTP_GET_LOCAL_ADDRS_OLD,     "SCTP_GET_LOCAL_ADDRS_OLD"      },
+typedef 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(SCTP_SOCKOPT_CONNECTX_OLD)
-       { SCTP_SOCKOPT_CONNECTX_OLD,    "SCTP_SOCKOPT_CONNECTX_OLD"     },
+#if defined(AF_IPX)
+       struct sockaddr_ipx sipx;
 #endif
-#if defined(SCTP_GET_PEER_ADDRS)
-       { SCTP_GET_PEER_ADDRS,          "SCTP_GET_PEER_ADDRS"           },
+#ifdef AF_PACKET
+       struct sockaddr_ll ll;
 #endif
-#if defined(SCTP_GET_LOCAL_ADDRS)
-       { SCTP_GET_LOCAL_ADDRS,         "SCTP_GET_LOCAL_ADDRS"          },
+#ifdef AF_NETLINK
+       struct sockaddr_nl nl;
 #endif
-
-       { 0,    NULL    },
-};
+#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+       struct sockaddr_hci hci;
+       struct sockaddr_l2 l2;
+       struct sockaddr_rc rc;
+       struct sockaddr_sco sco;
 #endif
+} sockaddr_buf_t;
 
-#if !defined(SOL_TCP) && defined(IPPROTO_TCP)
-#define SOL_TCP IPPROTO_TCP
-#endif
+static void
+print_sockaddr(struct tcb *tcp, const sockaddr_buf_t *addr, const int addrlen)
+{
+       tprints("{sa_family=");
+       printxval(addrfams, addr->sa.sa_family, "AF_???");
+       tprints(", ");
 
-#ifdef SOL_TCP
-static const struct xlat socktcpoptions[] = {
-       { TCP_NODELAY,          "TCP_NODELAY"   },
-       { TCP_MAXSEG,           "TCP_MAXSEG"    },
-#if defined(TCP_CORK)
-       { TCP_CORK,             "TCP_CORK"      },
-#endif
-#if defined(TCP_KEEPIDLE)
-       { TCP_KEEPIDLE,         "TCP_KEEPIDLE" },
-#endif
-#if defined(TCP_KEEPINTVL)
-       { TCP_KEEPINTVL,        "TCP_KEEPINTVL" },
-#endif
-#if defined(TCP_KEEPCNT)
-       { TCP_KEEPCNT,          "TCP_KEEPCNT" },
-#endif
-#if defined(TCP_NKEEP)
-       { TCP_NKEEP,            "TCP_NKEEP"     },
-#endif
-#if defined(TCP_SYNCNT)
-       { TCP_SYNCNT,           "TCP_SYNCNT" },
-#endif
-#if defined(TCP_LINGER2)
-       { TCP_LINGER2,          "TCP_LINGER2" },
-#endif
-#if defined(TCP_DEFER_ACCEPT)
-       { TCP_DEFER_ACCEPT,     "TCP_DEFER_ACCEPT" },
-#endif
-#if defined(TCP_WINDOW_CLAMP)
-       { TCP_WINDOW_CLAMP,     "TCP_WINDOW_CLAMP" },
-#endif
-#if defined(TCP_INFO)
-       { TCP_INFO,             "TCP_INFO" },
-#endif
-#if defined(TCP_QUICKACK)
-       { TCP_QUICKACK,         "TCP_QUICKACK" },
-#endif
-#if defined(TCP_CONGESTION)
-       { TCP_CONGESTION,       "TCP_CONGESTION" },
-#endif
-#if defined(TCP_MD5SIG)
-       { TCP_MD5SIG,           "TCP_MD5SIG" },
-#endif
-#if defined(TCP_COOKIE_TRANSACTIONS)
-       { TCP_COOKIE_TRANSACTIONS,      "TCP_COOKIE_TRANSACTIONS" },
-#endif
-#if defined(TCP_THIN_LINEAR_TIMEOUTS)
-       { TCP_THIN_LINEAR_TIMEOUTS,     "TCP_THIN_LINEAR_TIMEOUTS" },
-#endif
-#if defined(TCP_THIN_DUPACK)
-       { TCP_THIN_DUPACK,      "TCP_THIN_DUPACK" },
-#endif
-#if defined(TCP_USER_TIMEOUT)
-       { TCP_USER_TIMEOUT,     "TCP_USER_TIMEOUT" },
+       switch (addr->sa.sa_family) {
+       case AF_UNIX:
+               if (addrlen == 2) {
+                       tprints("NULL");
+               } else if (addr->sau.sun_path[0]) {
+                       tprints("sun_path=");
+                       print_quoted_string(addr->sau.sun_path,
+                                           sizeof(addr->sau.sun_path) + 1,
+                                           QUOTE_0_TERMINATED);
+               } else {
+                       tprints("sun_path=@");
+                       print_quoted_string(addr->sau.sun_path + 1,
+                                           sizeof(addr->sau.sun_path),
+                                           QUOTE_0_TERMINATED);
+               }
+               break;
+       case AF_INET:
+               tprintf("sin_port=htons(%u), sin_addr=inet_addr(\"%s\")",
+                       ntohs(addr->sin.sin_port), inet_ntoa(addr->sin.sin_addr));
+               break;
+#ifdef HAVE_INET_NTOP
+       case AF_INET6:
+               {
+                       char string_addr[100];
+                       inet_ntop(AF_INET6, &addr->sa6.sin6_addr,
+                                 string_addr, sizeof(string_addr));
+                       tprintf("sin6_port=htons(%u), inet_pton(AF_INET6"
+                               ", \"%s\", &sin6_addr), sin6_flowinfo=%u",
+                               ntohs(addr->sa6.sin6_port), string_addr,
+                               addr->sa6.sin6_flowinfo);
+# ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
+                       tprints(", sin6_scope_id=");
+#  if defined IN6_IS_ADDR_LINKLOCAL && defined IN6_IS_ADDR_MC_LINKLOCAL
+                       if (IN6_IS_ADDR_LINKLOCAL(&addr->sa6.sin6_addr)
+                           || IN6_IS_ADDR_MC_LINKLOCAL(&addr->sa6.sin6_addr))
+                               print_ifindex(addr->sa6.sin6_scope_id);
+                       else
+#  endif
+                               tprintf("%u", addr->sa6.sin6_scope_id);
+# endif /* HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID */
+               }
+               break;
 #endif
-       { 0,                    NULL            },
-};
-#endif /* SOL_TCP */
+#if defined(AF_IPX)
+       case AF_IPX:
+               {
+                       int i;
+                       tprintf("sipx_port=htons(%u), ",
+                                       ntohs(addr->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(addr->sipx.sipx_network));
+                       for (i = 0; i < IPX_NODE_LEN; i++)
+                               tprintf("%02x", addr->sipx.sipx_node[i]);
+                       tprintf("/[%02x]", addr->sipx.sipx_type);
+               }
+               break;
+#endif /* AF_IPX */
+#ifdef AF_PACKET
+       case AF_PACKET:
+               {
+                       int i;
+                       tprintf("proto=%#04x, if%d, pkttype=",
+                                       ntohs(addr->ll.sll_protocol),
+                                       addr->ll.sll_ifindex);
+                       printxval(af_packet_types, addr->ll.sll_pkttype, "PACKET_???");
+                       tprintf(", addr(%d)={%d, ",
+                                       addr->ll.sll_halen,
+                                       addr->ll.sll_hatype);
+                       for (i = 0; i < addr->ll.sll_halen; i++)
+                               tprintf("%02x", addr->ll.sll_addr[i]);
+               }
+               break;
 
-#ifdef SOL_RAW
-static const struct xlat icmpfilterflags[] = {
-#if defined(ICMP_ECHOREPLY)
-       { (1<<ICMP_ECHOREPLY),          "ICMP_ECHOREPLY"        },
-#endif
-#if defined(ICMP_DEST_UNREACH)
-       { (1<<ICMP_DEST_UNREACH),       "ICMP_DEST_UNREACH"     },
-#endif
-#if defined(ICMP_SOURCE_QUENCH)
-       { (1<<ICMP_SOURCE_QUENCH),      "ICMP_SOURCE_QUENCH"    },
-#endif
-#if defined(ICMP_REDIRECT)
-       { (1<<ICMP_REDIRECT),           "ICMP_REDIRECT"         },
-#endif
-#if defined(ICMP_ECHO)
-       { (1<<ICMP_ECHO),               "ICMP_ECHO"             },
-#endif
-#if defined(ICMP_TIME_EXCEEDED)
-       { (1<<ICMP_TIME_EXCEEDED),      "ICMP_TIME_EXCEEDED"    },
-#endif
-#if defined(ICMP_PARAMETERPROB)
-       { (1<<ICMP_PARAMETERPROB),      "ICMP_PARAMETERPROB"    },
-#endif
-#if defined(ICMP_TIMESTAMP)
-       { (1<<ICMP_TIMESTAMP),          "ICMP_TIMESTAMP"        },
-#endif
-#if defined(ICMP_TIMESTAMPREPLY)
-       { (1<<ICMP_TIMESTAMPREPLY),     "ICMP_TIMESTAMPREPLY"   },
-#endif
-#if defined(ICMP_INFO_REQUEST)
-       { (1<<ICMP_INFO_REQUEST),       "ICMP_INFO_REQUEST"     },
-#endif
-#if defined(ICMP_INFO_REPLY)
-       { (1<<ICMP_INFO_REPLY),         "ICMP_INFO_REPLY"       },
-#endif
-#if defined(ICMP_ADDRESS)
-       { (1<<ICMP_ADDRESS),            "ICMP_ADDRESS"          },
-#endif
-#if defined(ICMP_ADDRESSREPLY)
-       { (1<<ICMP_ADDRESSREPLY),       "ICMP_ADDRESSREPLY"     },
-#endif
-       { 0,                            NULL                    },
-};
-#endif /* SOL_RAW */
+#endif /* AF_PACKET */
+#ifdef AF_NETLINK
+       case AF_NETLINK:
+               tprintf("pid=%d, groups=%08x", addr->nl.nl_pid, addr->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)}",
+                       addr->sco.sco_bdaddr.b[0], addr->sco.sco_bdaddr.b[1],
+                       addr->sco.sco_bdaddr.b[2], addr->sco.sco_bdaddr.b[3],
+                       addr->sco.sco_bdaddr.b[4], addr->sco.sco_bdaddr.b[5],
+                       addr->rc.rc_bdaddr.b[0], addr->rc.rc_bdaddr.b[1],
+                       addr->rc.rc_bdaddr.b[2], addr->rc.rc_bdaddr.b[3],
+                       addr->rc.rc_bdaddr.b[4], addr->rc.rc_bdaddr.b[5],
+                       addr->rc.rc_channel,
+                       btohs(addr->l2.l2_psm), addr->l2.l2_bdaddr.b[0],
+                       addr->l2.l2_bdaddr.b[1], addr->l2.l2_bdaddr.b[2],
+                       addr->l2.l2_bdaddr.b[3], addr->l2.l2_bdaddr.b[4],
+                       addr->l2.l2_bdaddr.b[5], btohs(addr->l2.l2_cid),
+                       btohs(addr->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 */
 
-#if defined(AF_PACKET) /* from e.g. linux/if_packet.h */
-static const struct xlat af_packet_types[] = {
-#if defined(PACKET_HOST)
-       { PACKET_HOST,                  "PACKET_HOST"           },
-#endif
-#if defined(PACKET_BROADCAST)
-       { PACKET_BROADCAST,             "PACKET_BROADCAST"      },
-#endif
-#if defined(PACKET_MULTICAST)
-       { PACKET_MULTICAST,             "PACKET_MULTICAST"      },
-#endif
-#if defined(PACKET_OTHERHOST)
-       { PACKET_OTHERHOST,             "PACKET_OTHERHOST"      },
-#endif
-#if defined(PACKET_OUTGOING)
-       { PACKET_OUTGOING,              "PACKET_OUTGOING"       },
-#endif
-#if defined(PACKET_LOOPBACK)
-       { PACKET_LOOPBACK,              "PACKET_LOOPBACK"       },
-#endif
-#if defined(PACKET_FASTROUTE)
-       { PACKET_FASTROUTE,             "PACKET_FASTROUTE"      },
-#endif
-       { 0,                            NULL                    },
-};
-#endif /* defined(AF_PACKET) */
+       default:
+               tprints("sa_data=");
+               print_quoted_string(addr->sa.sa_data,
+                                   sizeof(addr->sa.sa_data), 0);
+               break;
+       }
+       tprints("}");
+}
 
 void
 printsock(struct tcb *tcp, long addr, int addrlen)
 {
-       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;
+       sockaddr_buf_t addrbuf;
+
+       if (addrlen < 2) {
+               printaddr(addr);
+               return;
+       }
+
+       if (addrlen > (int) sizeof(addrbuf))
+               addrlen = sizeof(addrbuf);
+
+       memset(&addrbuf, 0, sizeof(addrbuf));
+       if (umoven_or_printaddr(tcp, addr, addrlen, addrbuf.pad))
+               return;
+       addrbuf.pad[sizeof(addrbuf.pad) - 1] = '\0';
+
+       print_sockaddr(tcp, &addrbuf, addrlen);
+}
+
+#include "xlat/scmvals.h"
+#include "xlat/ip_cmsg_types.h"
+
+#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
+struct cmsghdr32 {
+       uint32_t cmsg_len;
+       int cmsg_level;
+       int cmsg_type;
+};
 #endif
-#ifdef AF_NETLINK
-               struct sockaddr_nl nl;
+
+typedef union {
+       char *ptr;
+       struct cmsghdr *cmsg;
+#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
+       struct cmsghdr32 *cmsg32;
 #endif
-       } addrbuf;
-       char string_addr[100];
+} union_cmsghdr;
+
+static void
+print_scm_rights(struct tcb *tcp, const void *cmsg_data,
+                const size_t data_len)
+{
+       const int *fds = cmsg_data;
+       const char *end = (const char *) cmsg_data + data_len;
+       bool seen = false;
 
-       if (addr == 0) {
-               tprints("NULL");
+       if (sizeof(*fds) > data_len)
                return;
+
+       tprints(", [");
+       while ((const char *) fds < end) {
+               if (seen)
+                       tprints(", ");
+               else
+                       seen = true;
+               printfd(tcp, *fds++);
        }
-       if (!verbose(tcp)) {
-               tprintf("%#lx", addr);
+       tprints("]");
+}
+
+static void
+print_scm_creds(struct tcb *tcp, const void *cmsg_data,
+               const size_t data_len)
+{
+       const struct ucred *uc = cmsg_data;
+
+       if (sizeof(*uc) > data_len)
+               return;
+
+       tprintf(", {pid=%u, uid=%u, gid=%u}",
+               (unsigned) uc->pid, (unsigned) uc->uid, (unsigned) uc->gid);
+}
+
+static void
+print_scm_security(struct tcb *tcp, const void *cmsg_data,
+                  const size_t data_len)
+{
+       if (!data_len)
+               return;
+
+       tprints(", ");
+       print_quoted_string(cmsg_data, data_len, 0);
+}
+
+static void
+print_cmsg_ip_pktinfo(struct tcb *tcp, const void *cmsg_data,
+                     const size_t data_len)
+{
+       const struct in_pktinfo *info = cmsg_data;
+
+       if (sizeof(*info) > data_len)
+               return;
+
+       tprints(", {ipi_ifindex=");
+       print_ifindex(info->ipi_ifindex);
+       tprintf(", ipi_spec_dst=inet_addr(\"%s\"), ipi_addr=inet_addr(\"%s\")}",
+               inet_ntoa(info->ipi_spec_dst), inet_ntoa(info->ipi_addr));
+}
+
+static void
+print_cmsg_ip_ttl(struct tcb *tcp, const void *cmsg_data,
+                 const size_t data_len)
+{
+       const unsigned int *ttl = cmsg_data;
+
+       if (sizeof(*ttl) > data_len)
+               return;
+
+       tprintf(", {ttl=%u}", *ttl);
+}
+
+static void
+print_cmsg_ip_tos(struct tcb *tcp, const void *cmsg_data,
+                 const size_t data_len)
+{
+       const uint8_t *tos = cmsg_data;
+
+       if (sizeof(*tos) > data_len)
+               return;
+
+       tprintf(", {tos=%x}", *tos);
+}
+
+static void
+print_cmsg_ip_checksum(struct tcb *tcp, const void *cmsg_data,
+                      const size_t data_len)
+{
+       const uint32_t *csum = cmsg_data;
+
+       if (sizeof(*csum) > data_len)
+               return;
+
+       tprintf(", {csum=%u}", *csum);
+}
+
+static void
+print_cmsg_ip_opts(struct tcb *tcp, const void *cmsg_data,
+                  const size_t data_len)
+{
+       const unsigned char *opts = cmsg_data;
+       size_t i;
+
+       if (!data_len)
+               return;
+
+       tprints(", {opts=0x");
+       for (i = 0; i < data_len; ++i)
+               tprintf("%02x", opts[i]);
+       tprints("}");
+}
+
+static void
+print_cmsg_ip_recverr(struct tcb *tcp, const void *cmsg_data,
+                     const size_t data_len)
+{
+       const struct {
+               uint32_t ee_errno;
+               uint8_t  ee_origin;
+               uint8_t  ee_type;
+               uint8_t  ee_code;
+               uint8_t  ee_pad;
+               uint32_t ee_info;
+               uint32_t ee_data;
+               struct sockaddr_in offender;
+       } *err = cmsg_data;
+
+       if (sizeof(*err) > data_len)
                return;
-       }
 
-       if (addrlen < 2 || addrlen > sizeof(addrbuf))
-               addrlen = sizeof(addrbuf);
+       tprintf(", {ee_errno=%u, ee_origin=%u, ee_type=%u, ee_code=%u"
+               ", ee_info=%u, ee_data=%u, offender=",
+               err->ee_errno, err->ee_origin, err->ee_type,
+               err->ee_code, err->ee_info, err->ee_data);
+       print_sockaddr(tcp, (const void *) &err->offender,
+               sizeof(err->offender));
+       tprints("}");
+}
 
-       memset(&addrbuf, 0, sizeof(addrbuf));
-       if (umoven(tcp, addr, addrlen, addrbuf.pad) < 0) {
-               tprints("{...}");
+static void
+print_cmsg_ip_origdstaddr(struct tcb *tcp, const void *cmsg_data,
+                         const size_t data_len)
+{
+       if (sizeof(struct sockaddr_in) > data_len)
                return;
-       }
-       addrbuf.pad[sizeof(addrbuf.pad) - 1] = '\0';
 
-       tprints("{sa_family=");
-       printxval(addrfams, addrbuf.sa.sa_family, "AF_???");
        tprints(", ");
+       print_sockaddr(tcp, cmsg_data, data_len);
+}
 
-       switch (addrbuf.sa.sa_family) {
-       case AF_UNIX:
-               if (addrlen == 2) {
-                       tprints("NULL");
-               } else if (addrbuf.sau.sun_path[0]) {
-                       tprints("sun_path=");
-                       printpathn(tcp, addr + 2, strlen(addrbuf.sau.sun_path));
-               } else {
-                       tprints("sun_path=@");
-                       printpathn(tcp, addr + 3, strlen(addrbuf.sau.sun_path + 1));
-               }
-               break;
-       case AF_INET:
-               tprintf("sin_port=htons(%u), sin_addr=inet_addr(\"%s\")",
-                       ntohs(addrbuf.sin.sin_port), inet_ntoa(addrbuf.sin.sin_addr));
-               break;
-#ifdef HAVE_INET_NTOP
-       case AF_INET6:
-               inet_ntop(AF_INET6, &addrbuf.sa6.sin6_addr, string_addr, sizeof(string_addr));
-               tprintf("sin6_port=htons(%u), inet_pton(AF_INET6, \"%s\", &sin6_addr), sin6_flowinfo=%u",
-                               ntohs(addrbuf.sa6.sin6_port), string_addr,
-                               addrbuf.sa6.sin6_flowinfo);
-#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
-               {
-#if defined(HAVE_IF_INDEXTONAME) && defined(IN6_IS_ADDR_LINKLOCAL) && defined(IN6_IS_ADDR_MC_LINKLOCAL)
-                       int numericscope = 0;
-                       if (IN6_IS_ADDR_LINKLOCAL(&addrbuf.sa6.sin6_addr)
-                           || IN6_IS_ADDR_MC_LINKLOCAL(&addrbuf.sa6.sin6_addr)) {
-                               char scopebuf[IFNAMSIZ + 1];
-
-                               if (if_indextoname(addrbuf.sa6.sin6_scope_id, scopebuf) == NULL)
-                                       numericscope++;
-                               else
-                                       tprintf(", sin6_scope_id=if_nametoindex(\"%s\")", scopebuf);
-                       } else
-                               numericscope++;
-
-                       if (numericscope)
-#endif
-                               tprintf(", sin6_scope_id=%u", addrbuf.sa6.sin6_scope_id);
-               }
-#endif
-               break;
-#endif
-#if defined(AF_IPX)
-       case AF_IPX:
-               {
-                       int i;
-                       tprintf("sipx_port=htons(%u), ",
-                                       ntohs(addrbuf.sipx.sipx_port));
-                       /* Yes, I know, this does not look too
-                        * strace-ish, but otherwise the IPX
-                        * addresses just look monstrous...
-                        * Anyways, feel free if you don't like
-                        * this way.. :)
-                        */
-                       tprintf("%08lx:", (unsigned long)ntohl(addrbuf.sipx.sipx_network));
-                       for (i = 0; i < IPX_NODE_LEN; i++)
-                               tprintf("%02x", addrbuf.sipx.sipx_node[i]);
-                       tprintf("/[%02x]", addrbuf.sipx.sipx_type);
+static void
+print_cmsg_type_data(struct tcb *tcp, const int cmsg_level, const int cmsg_type,
+                    const void *cmsg_data, const size_t data_len)
+{
+       switch (cmsg_level) {
+       case SOL_SOCKET:
+               printxval(scmvals, cmsg_type, "SCM_???");
+               switch (cmsg_type) {
+               case SCM_RIGHTS:
+                       print_scm_rights(tcp, cmsg_data, data_len);
+                       break;
+               case SCM_CREDENTIALS:
+                       print_scm_creds(tcp, cmsg_data, data_len);
+                       break;
+               case SCM_SECURITY:
+                       print_scm_security(tcp, cmsg_data, data_len);
+                       break;
                }
                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, "?");
-                       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]);
+       case SOL_IP:
+               printxval(ip_cmsg_types, cmsg_type, "IP_???");
+               switch (cmsg_type) {
+               case IP_PKTINFO:
+                       print_cmsg_ip_pktinfo(tcp, cmsg_data, data_len);
+                       break;
+               case IP_TTL:
+                       print_cmsg_ip_ttl(tcp, cmsg_data, data_len);
+                       break;
+               case IP_TOS:
+                       print_cmsg_ip_tos(tcp, cmsg_data, data_len);
+                       break;
+               case IP_RECVOPTS:
+               case IP_RETOPTS:
+                       print_cmsg_ip_opts(tcp, cmsg_data, data_len);
+                       break;
+               case IP_RECVERR:
+                       print_cmsg_ip_recverr(tcp, cmsg_data, data_len);
+                       break;
+               case IP_ORIGDSTADDR:
+                       print_cmsg_ip_origdstaddr(tcp, cmsg_data, data_len);
+                       break;
+               case IP_CHECKSUM:
+                       print_cmsg_ip_checksum(tcp, cmsg_data, data_len);
+                       break;
+               case SCM_SECURITY:
+                       print_scm_security(tcp, cmsg_data, data_len);
+                       break;
                }
                break;
-
-#endif /* AF_PACKET */
-#ifdef AF_NETLINK
-       case AF_NETLINK:
-               tprintf("pid=%d, groups=%08x", addrbuf.nl.nl_pid, addrbuf.nl.nl_groups);
-               break;
-#endif /* AF_NETLINK */
-       /* AF_AX25 AF_APPLETALK AF_NETROM AF_BRIDGE AF_AAL5
-       AF_X25 AF_ROSE etc. still need to be done */
-
        default:
-               tprints("sa_data=");
-               printstr(tcp, (long) &((struct sockaddr *) addr)->sa_data,
-                       sizeof addrbuf.sa.sa_data);
-               break;
+               tprintf("%u", cmsg_type);
        }
-       tprints("}");
 }
 
-#if HAVE_SENDMSG
-static const struct xlat scmvals[] = {
-#ifdef SCM_RIGHTS
-       { SCM_RIGHTS,           "SCM_RIGHTS"            },
-#endif
-#ifdef SCM_CREDENTIALS
-       { SCM_CREDENTIALS,      "SCM_CREDENTIALS"       },
-#endif
-       { 0,                    NULL                    }
-};
-
 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) {
-               tprintf(", msg_control=%#lx", addr);
-               free(cmsg);
+       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) {
+               tprints(", msg_control=");
+               printaddr(addr);
+               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;
-
-               printxval(scmvals, cmsg->cmsg_type, "SCM_???");
-               cmsg_len = (len < cmsg->cmsg_len) ? len : cmsg->cmsg_len;
-
-               if (cmsg->cmsg_type == SCM_RIGHTS
-                   && CMSG_LEN(sizeof(int)) <= cmsg_len) {
-                       int *fds = (int *) CMSG_DATA(cmsg);
-                       int first = 1;
-
-                       tprints(", {");
-                       while ((char *) fds < ((char *) cmsg + cmsg_len)) {
-                               if (!first)
-                                       tprints(", ");
-                               tprintf("%d", *fds++);
-                               first = 0;
-                       }
-                       tprints("}}");
-                       free(cmsg);
-                       return;
-               }
-               if (cmsg->cmsg_type == SCM_CREDENTIALS
-                   && CMSG_LEN(sizeof(struct ucred)) <= cmsg_len) {
-                       struct ucred *uc = (struct ucred *) CMSG_DATA(cmsg);
+       union_cmsghdr u = { .ptr = buf };
 
-                       tprintf("{pid=%ld, uid=%ld, gid=%ld}}",
-                               (long)uc->pid, (long)uc->uid, (long)uc->gid);
-                       free(cmsg);
-                       return;
+       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;
+
+               print_cmsg_type_data(tcp, cmsg_level, cmsg_type,
+                                    (const void *) (u.ptr + cmsg_size),
+                                    cmsg_len > cmsg_size ? cmsg_len - cmsg_size: 0);
+               tprints("}");
+
+               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
-do_msghdr(struct tcb *tcp, struct msghdr *msg)
+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(tcp, (unsigned long)msg->msg_iovlen,
-                  (unsigned long)msg->msg_iov, 1);
+       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);
@@ -1428,42 +615,121 @@ do_msghdr(struct tcb *tcp, struct msghdr *msg)
        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
-printmsghdr(struct tcb *tcp, long addr)
+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
 
-       if (umove(tcp, addr, &msg) < 0) {
-               tprintf("%#lx", addr);
-               return;
+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;
        }
-       do_msghdr(tcp, &msg);
+       return true;
 }
 
 static void
-printmmsghdr(struct tcb *tcp, long addr, unsigned int idx)
+printmsghdr(struct tcb *tcp, long addr, unsigned long data_size)
 {
-       struct mmsghdr {
-               struct msghdr msg_hdr;
-               unsigned msg_len;
-       } mmsg;
-
-       addr += sizeof(mmsg) * idx;
-       if (umove(tcp, addr, &mmsg) < 0) {
-               tprintf("%#lx", addr);
-               return;
+       struct msghdr msg;
+
+       if (verbose(tcp) && extractmsghdr(tcp, addr, &msg))
+               do_msghdr(tcp, &msg, data_size);
+       else
+               printaddr(addr);
+}
+
+void
+dumpiov_in_msghdr(struct tcb *tcp, long addr, unsigned long data_size)
+{
+       struct msghdr msg;
+
+       if (extractmsghdr(tcp, addr, &msg))
+               dumpiov_upto(tcp, msg.msg_iovlen, (long)msg.msg_iov, data_size);
+}
+
+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);
        }
-       tprints("{");
-       do_msghdr(tcp, &mmsg.msg_hdr);
-       tprintf(", %u}", mmsg.msg_len);
+       else
+               printaddr(addr);
 }
 
 static void
-decode_mmsg(struct tcb *tcp)
+decode_mmsg(struct tcb *tcp, unsigned long msg_len)
 {
        /* mmsgvec */
        if (syserror(tcp)) {
-               tprintf("%#lx", tcp->u_arg[1]);
+               printaddr(tcp->u_arg[1]);
        } else {
                unsigned int len = tcp->u_rval;
                unsigned int i;
@@ -1472,7 +738,7 @@ decode_mmsg(struct tcb *tcp)
                for (i = 0; i < len; ++i) {
                        if (i)
                                tprints(", ");
-                       printmmsghdr(tcp, tcp->u_arg[1], i);
+                       printmmsghdr(tcp, tcp->u_arg[1], i, msg_len);
                }
                tprints("}");
        }
@@ -1482,14 +748,29 @@ decode_mmsg(struct tcb *tcp)
        printflags(msg_flags, tcp->u_arg[3], "MSG_???");
 }
 
-#endif /* HAVE_SENDMSG */
+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_upto(tcp, mmsg.msg_hdr.msg_iovlen,
+                               (long)mmsg.msg_hdr.msg_iov, mmsg.msg_len);
+               }
+       }
+}
 
 /*
  * low bits of the socket type define real socket type,
  * other bits are socket type flags.
  */
 static void
-tprint_sock_type(struct tcb *tcp, int flags)
+tprint_sock_type(unsigned int flags)
 {
        const char *str = xlookup(socktypes, flags & SOCK_TYPE_MASK);
 
@@ -1503,83 +784,84 @@ tprint_sock_type(struct tcb *tcp, int flags)
        printflags(sock_type_flags, flags, "SOCK_???");
 }
 
-int
-sys_socket(struct tcb *tcp)
+SYS_FUNC(socket)
 {
-       if (entering(tcp)) {
-               printxval(domains, tcp->u_arg[0], "PF_???");
-               tprints(", ");
-               tprint_sock_type(tcp, tcp->u_arg[1]);
-               tprints(", ");
-               switch (tcp->u_arg[0]) {
-               case PF_INET:
-#ifdef PF_INET6
-               case PF_INET6:
+       printxval(addrfams, tcp->u_arg[0], "AF_???");
+       tprints(", ");
+       tprint_sock_type(tcp->u_arg[1]);
+       tprints(", ");
+       switch (tcp->u_arg[0]) {
+       case AF_INET:
+#ifdef AF_INET6
+       case AF_INET6:
 #endif
-                       printxval(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 */
-               default:
-                       tprintf("%lu", tcp->u_arg[2]);
-                       break;
-               }
+               printxval(inet_protocols, tcp->u_arg[2], "IPPROTO_???");
+               break;
+#ifdef AF_IPX
+       case AF_IPX:
+               /* BTW: I don't believe this.. */
+               tprints("[");
+               printxval(addrfams, tcp->u_arg[2], "AF_???");
+               tprints("]");
+               break;
+#endif /* AF_IPX */
+#ifdef AF_NETLINK
+       case AF_NETLINK:
+               printxval(netlink_protocols, tcp->u_arg[2], "NETLINK_???");
+               break;
+#endif
+#if defined(AF_BLUETOOTH) && defined(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;
        }
-       return 0;
-}
 
-int
-sys_bind(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printsock(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu", tcp->u_arg[2]);
-       }
-       return 0;
+       return RVAL_DECODED | RVAL_FD;
 }
 
-int
-sys_connect(struct tcb *tcp)
+SYS_FUNC(bind)
 {
-       return sys_bind(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 RVAL_DECODED;
 }
 
-int
-sys_listen(struct tcb *tcp)
+SYS_FUNC(listen)
 {
-       if (entering(tcp)) {
-               tprintf("%ld, %lu", tcp->u_arg[0], tcp->u_arg[1]);
-       }
-       return 0;
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       tprintf("%lu", tcp->u_arg[1]);
+
+       return RVAL_DECODED;
 }
 
 static int
-do_accept(struct tcb *tcp, int flags_arg)
+do_sockname(struct tcb *tcp, int flags_arg)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               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]);
-               } else {
-                       printsock(tcp, tcp->u_arg[1], len);
-               }
+
+       int len;
+       if (!tcp->u_arg[2] || !verbose(tcp) || syserror(tcp) ||
+           umove(tcp, tcp->u_arg[2], &len) < 0) {
+               printaddr(tcp->u_arg[1]);
                tprints(", ");
-               printnum_int(tcp, tcp->u_arg[2], "%u");
+               printaddr(tcp->u_arg[2]);
+       } else {
+               printsock(tcp, tcp->u_arg[1], len);
+               tprintf(", [%d]", len);
        }
+
        if (flags_arg >= 0) {
                tprints(", ");
                printflags(sock_type_flags, tcp->u_arg[flags_arg],
@@ -1588,70 +870,65 @@ do_accept(struct tcb *tcp, int flags_arg)
        return 0;
 }
 
-int
-sys_accept(struct tcb *tcp)
+SYS_FUNC(accept)
 {
-       return do_accept(tcp, -1);
+       do_sockname(tcp, -1);
+       return RVAL_FD;
 }
 
-int
-sys_accept4(struct tcb *tcp)
+SYS_FUNC(accept4)
 {
-       return do_accept(tcp, 3);
+       do_sockname(tcp, 3);
+       return RVAL_FD;
 }
 
-int
-sys_send(struct tcb *tcp)
+SYS_FUNC(send)
 {
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               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;
+       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 RVAL_DECODED;
 }
 
-int
-sys_sendto(struct tcb *tcp)
+SYS_FUNC(sendto)
 {
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu, ", tcp->u_arg[2]);
-               /* flags */
-               printflags(msg_flags, tcp->u_arg[3], "MSG_???");
-               /* to address */
-               tprints(", ");
-               printsock(tcp, tcp->u_arg[4], tcp->u_arg[5]);
-               /* to length */
-               tprintf(", %lu", tcp->u_arg[5]);
-       }
-       return 0;
-}
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+       tprintf(", %lu, ", tcp->u_arg[2]);
+       /* flags */
+       printflags(msg_flags, tcp->u_arg[3], "MSG_???");
+       /* to address */
+       tprints(", ");
+       printsock(tcp, tcp->u_arg[4], tcp->u_arg[5]);
+       /* to length */
+       tprintf(", %lu", tcp->u_arg[5]);
 
-#ifdef HAVE_SENDMSG
+       return RVAL_DECODED;
+}
 
-int
-sys_sendmsg(struct tcb *tcp)
+SYS_FUNC(sendmsg)
 {
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printmsghdr(tcp, tcp->u_arg[1]);
-               /* flags */
-               tprints(", ");
-               printflags(msg_flags, tcp->u_arg[2], "MSG_???");
-       }
-       return 0;
+       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 RVAL_DECODED;
 }
 
-int
-sys_sendmmsg(struct tcb *tcp)
+SYS_FUNC(sendmmsg)
 {
        if (entering(tcp)) {
                /* sockfd */
-               tprintf("%d, ", (int) tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
                if (!verbose(tcp)) {
                        tprintf("%#lx, %u, ",
                                tcp->u_arg[1], (unsigned int) tcp->u_arg[2]);
@@ -1659,21 +936,19 @@ sys_sendmmsg(struct tcb *tcp)
                }
        } else {
                if (verbose(tcp))
-                       decode_mmsg(tcp);
+                       decode_mmsg(tcp, (unsigned long) -1L);
        }
        return 0;
 }
 
-#endif /* HAVE_SENDMSG */
-
-int
-sys_recv(struct tcb *tcp)
+SYS_FUNC(recv)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
        } else {
                if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
+                       printaddr(tcp->u_arg[1]);
                else
                        printstr(tcp, tcp->u_arg[1], tcp->u_rval);
 
@@ -1683,62 +958,51 @@ sys_recv(struct tcb *tcp)
        return 0;
 }
 
-int
-sys_recvfrom(struct tcb *tcp)
+SYS_FUNC(recvfrom)
 {
        int fromlen;
 
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
        } else {
+               /* buf */
                if (syserror(tcp)) {
-                       tprintf("%#lx, %lu, %lu, %#lx, %#lx",
-                               tcp->u_arg[1], tcp->u_arg[2], tcp->u_arg[3],
-                               tcp->u_arg[4], tcp->u_arg[5]);
-                       return 0;
+                       printaddr(tcp->u_arg[1]);
+               } else {
+                       printstr(tcp, tcp->u_arg[1], tcp->u_rval);
                }
-               /* buf */
-               printstr(tcp, tcp->u_arg[1], tcp->u_rval);
                /* len */
                tprintf(", %lu, ", tcp->u_arg[2]);
                /* flags */
                printflags(msg_flags, tcp->u_arg[3], "MSG_???");
-               /* from address, len */
-               if (!tcp->u_arg[4] || !tcp->u_arg[5]) {
-                       if (tcp->u_arg[4] == 0)
-                               tprints(", NULL");
-                       else
-                               tprintf(", %#lx", tcp->u_arg[4]);
-                       if (tcp->u_arg[5] == 0)
-                               tprints(", NULL");
-                       else
-                               tprintf(", %#lx", tcp->u_arg[5]);
-                       return 0;
-               }
-               if (umove(tcp, tcp->u_arg[5], &fromlen) < 0) {
-                       tprints(", {...}, [?]");
+               tprints(", ");
+               if (syserror(tcp) || !tcp->u_arg[4] || !tcp->u_arg[5] ||
+                   umove(tcp, tcp->u_arg[5], &fromlen) < 0) {
+                       /* from address, len */
+                       printaddr(tcp->u_arg[4]);
+                       tprints(", ");
+                       printaddr(tcp->u_arg[5]);
                        return 0;
                }
-               tprints(", ");
-               printsock(tcp, tcp->u_arg[4], tcp->u_arg[5]);
+               /* from address */
+               printsock(tcp, tcp->u_arg[4], fromlen);
                /* from length */
                tprintf(", [%u]", fromlen);
        }
        return 0;
 }
 
-#ifdef HAVE_SENDMSG
-
-int
-sys_recvmsg(struct tcb *tcp)
+SYS_FUNC(recvmsg)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
        } else {
-               if (syserror(tcp) || !verbose(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
+               if (syserror(tcp))
+                       printaddr(tcp->u_arg[1]);
                else
-                       printmsghdr(tcp, tcp->u_arg[1]);
+                       printmsghdr(tcp, tcp->u_arg[1], tcp->u_rval);
                /* flags */
                tprints(", ");
                printflags(msg_flags, tcp->u_arg[2], "MSG_???");
@@ -1746,20 +1010,18 @@ sys_recvmsg(struct tcb *tcp)
        return 0;
 }
 
-int
-sys_recvmmsg(struct tcb *tcp)
+SYS_FUNC(recvmmsg)
 {
-       /* +5 chars are for "left " prefix */
-       static char str[5 + TIMESPEC_TEXT_BUFSIZE];
+       static char str[sizeof("left") + TIMESPEC_TEXT_BUFSIZE];
 
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
                if (verbose(tcp)) {
-                       sprint_timespec(str, tcp, tcp->u_arg[4]);
                        /* Abusing tcp->auxstr as temp storage.
-                        * Will be used and freed on syscall exit.
+                        * Will be used and cleared on syscall exit.
                         */
-                       tcp->auxstr = strdup(str);
+                       tcp->auxstr = sprint_timespec(tcp, tcp->u_arg[4]);
                } else {
                        tprintf("%#lx, %ld, ", tcp->u_arg[1], tcp->u_arg[2]);
                        printflags(msg_flags, tcp->u_arg[3], "MSG_???");
@@ -1769,10 +1031,10 @@ sys_recvmmsg(struct tcb *tcp)
                return 0;
        } else {
                if (verbose(tcp)) {
-                       decode_mmsg(tcp);
+                       decode_mmsg(tcp, 0);
+                       tprints(", ");
                        /* timeout on entrance */
-                       tprintf(", %s", tcp->auxstr ? tcp->auxstr : "{...}");
-                       free((void *) tcp->auxstr);
+                       tprints(tcp->auxstr);
                        tcp->auxstr = NULL;
                }
                if (syserror(tcp))
@@ -1784,63 +1046,55 @@ sys_recvmmsg(struct tcb *tcp)
                if (!verbose(tcp))
                        return 0;
                /* timeout on exit */
-               sprint_timespec(stpcpy(str, "left "), tcp, tcp->u_arg[4]);
+               snprintf(str, sizeof(str), "left %s",
+                        sprint_timespec(tcp, tcp->u_arg[4]));
                tcp->auxstr = str;
                return RVAL_STR;
        }
 }
 
-#endif /* HAVE_SENDMSG */
+#include "xlat/shutdown_modes.h"
 
-static const struct xlat shutdown_modes[] = {
-       { 0,    "SHUT_RD"       },
-       { 1,    "SHUT_WR"       },
-       { 2,    "SHUT_RDWR"     },
-       { 0,    NULL            }
-};
+SYS_FUNC(shutdown)
+{
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       printxval(shutdown_modes, tcp->u_arg[1], "SHUT_???");
 
-int
-sys_shutdown(struct tcb *tcp)
+       return RVAL_DECODED;
+}
+
+SYS_FUNC(getsockname)
 {
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printxval(shutdown_modes, tcp->u_arg[1], "SHUT_???");
-       }
-       return 0;
+       return do_sockname(tcp, -1);
 }
 
-int
-sys_getsockname(struct tcb *tcp)
+static void
+printpair_fd(struct tcb *tcp, const int i0, const int i1)
 {
-       return sys_accept(tcp);
+       tprints("[");
+       printfd(tcp, i0);
+       tprints(", ");
+       printfd(tcp, i1);
+       tprints("]");
 }
 
-int
-sys_getpeername(struct tcb *tcp)
+static void
+decode_pair_fd(struct tcb *tcp, const long addr)
 {
-       return sys_accept(tcp);
+       int pair[2];
+
+       if (umove_or_printaddr(tcp, addr, &pair))
+               return;
+
+       printpair_fd(tcp, pair[0], pair[1]);
 }
 
 static int
 do_pipe(struct tcb *tcp, int flags_arg)
-{
-       if (exiting(tcp)) {
-               if (syserror(tcp)) {
-                       tprintf("%#lx", tcp->u_arg[0]);
-               } else {
-#if !defined(SPARC) && !defined(SPARC64) && !defined(SH) && !defined(IA64)
-                       int fds[2];
-
-                       if (umoven(tcp, tcp->u_arg[0], sizeof fds, (char *) fds) < 0)
-                               tprints("[...]");
-                       else
-                               tprintf("[%u, %u]", fds[0], fds[1]);
-#elif defined(SPARC) || defined(SPARC64) || defined(SH) || defined(IA64)
-                       tprintf("[%lu, %lu]", tcp->u_rval, getrval2(tcp));
-#else
-                       tprintf("%#lx", tcp->u_arg[0]);
-#endif
-               }
+{
+       if (exiting(tcp)) {
+               decode_pair_fd(tcp, tcp->u_arg[0]);
                if (flags_arg >= 0) {
                        tprints(", ");
                        printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
@@ -1849,205 +1103,165 @@ do_pipe(struct tcb *tcp, int flags_arg)
        return 0;
 }
 
-int
-sys_pipe(struct tcb *tcp)
+SYS_FUNC(pipe)
 {
+#ifdef HAVE_GETRVAL2
+       if (exiting(tcp) && !syserror(tcp))
+               printpair_fd(tcp, tcp->u_rval, getrval2(tcp));
+       return 0;
+#else
        return do_pipe(tcp, -1);
+#endif
 }
 
-int
-sys_pipe2(struct tcb *tcp)
+SYS_FUNC(pipe2)
 {
        return do_pipe(tcp, 1);
 }
 
-int
-sys_socketpair(struct tcb *tcp)
+SYS_FUNC(socketpair)
 {
-       int fds[2];
-
        if (entering(tcp)) {
-               printxval(domains, tcp->u_arg[0], "PF_???");
+               printxval(addrfams, tcp->u_arg[0], "AF_???");
                tprints(", ");
-               tprint_sock_type(tcp, tcp->u_arg[1]);
-               tprints(", ");
-               switch (tcp->u_arg[0]) {
-               case PF_INET:
-                       printxval(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 */
-               default:
-                       tprintf("%lu", tcp->u_arg[2]);
-                       break;
-               }
+               tprint_sock_type(tcp->u_arg[1]);
+               tprintf(", %lu", tcp->u_arg[2]);
        } else {
-               if (syserror(tcp)) {
-                       tprintf(", %#lx", tcp->u_arg[3]);
-                       return 0;
-               }
-               if (umoven(tcp, tcp->u_arg[3], sizeof fds, (char *) fds) < 0)
-                       tprints(", [...]");
-               else
-                       tprintf(", [%u, %u]", fds[0], fds[1]);
+               tprints(", ");
+               decode_pair_fd(tcp, tcp->u_arg[3]);
        }
        return 0;
 }
 
-int
-sys_getsockopt(struct tcb *tcp)
+#include "xlat/sockoptions.h"
+#include "xlat/sockipoptions.h"
+#include "xlat/getsockipoptions.h"
+#include "xlat/setsockipoptions.h"
+#include "xlat/sockipv6options.h"
+#include "xlat/getsockipv6options.h"
+#include "xlat/setsockipv6options.h"
+#include "xlat/sockipxoptions.h"
+#include "xlat/sockrawoptions.h"
+#include "xlat/sockpacketoptions.h"
+#include "xlat/socksctpoptions.h"
+#include "xlat/socktcpoptions.h"
+
+static void
+print_sockopt_fd_level_name(struct tcb *tcp, int fd, unsigned int level,
+                           unsigned int name, bool is_getsockopt)
 {
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               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(", ");
-       } 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;
-               }
+       switch (level) {
+       case SOL_SOCKET:
+               printxval(sockoptions, name, "SO_???");
+               break;
+       case SOL_IP:
+               printxvals(name, "IP_???", sockipoptions,
+                       is_getsockopt ? getsockipoptions : setsockipoptions, NULL);
+               break;
+       case SOL_IPV6:
+               printxvals(name, "IPV6_???", sockipv6options,
+                       is_getsockopt ? getsockipv6options : setsockipv6options, NULL);
+               break;
+       case SOL_IPX:
+               printxval(sockipxoptions, name, "IPX_???");
+               break;
+       case SOL_PACKET:
+               printxval(sockpacketoptions, name, "PACKET_???");
+               break;
+       case SOL_TCP:
+               printxval(socktcpoptions, name, "TCP_???");
+               break;
+       case SOL_SCTP:
+               printxval(socksctpoptions, name, "SCTP_???");
+               break;
+       case SOL_RAW:
+               printxval(sockrawoptions, name, "RAW_???");
+               break;
+
+               /* Other SOL_* protocol levels still need work. */
+
+       default:
+               tprintf("%u", name);
+       }
+
+       tprints(", ");
+}
 
-               switch (tcp->u_arg[1]) {
-               case SOL_SOCKET:
-                       switch (tcp->u_arg[2]) {
 #ifdef SO_LINGER
-                       case SO_LINGER:
-                               if (len == sizeof(struct linger)) {
-                                       struct linger linger;
-                                       if (umove(tcp,
-                                                  tcp->u_arg[3],
-                                                  &linger) < 0)
-                                               break;
-                                       tprintf("{onoff=%d, linger=%d}, "
-                                               "[%d]",
-                                               linger.l_onoff,
-                                               linger.l_linger,
-                                               len);
-                                       return 0;
-                               }
-                               break;
-#endif
+static void
+print_linger(struct tcb *tcp, long addr, int len)
+{
+       struct linger linger;
+
+       if (len != sizeof(linger) ||
+           umove(tcp, addr, &linger) < 0) {
+               printaddr(addr);
+               return;
+       }
+
+       tprintf("{onoff=%d, linger=%d}",
+               linger.l_onoff,
+               linger.l_linger);
+}
+#endif /* SO_LINGER */
+
 #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;
-#endif
-                       }
-                       break;
-               case SOL_PACKET:
-                       switch (tcp->u_arg[2]) {
-#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;
-#endif
-                       }
-                       break;
-               }
+static void
+print_ucred(struct tcb *tcp, long addr, int len)
+{
+       struct ucred uc;
 
-               if (len == sizeof(int)) {
-                       printnum_int(tcp, tcp->u_arg[3], "%d");
-               }
-               else {
-                       printstr(tcp, tcp->u_arg[3], len);
-               }
-               tprintf(", [%d]", len);
+       if (len != sizeof(uc) ||
+           umove(tcp, addr, &uc) < 0) {
+               printaddr(addr);
+       } else {
+               tprintf("{pid=%u, uid=%u, gid=%u}",
+                       (unsigned) uc.pid,
+                       (unsigned) uc.uid,
+                       (unsigned) uc.gid);
        }
-       return 0;
 }
+#endif /* SO_PEERCRED */
 
-#if defined(ICMP_FILTER)
-static void printicmpfilter(struct tcb *tcp, long addr)
+#ifdef PACKET_STATISTICS
+static void
+print_tpacket_stats(struct tcb *tcp, long addr, int len)
 {
-       struct icmp_filter      filter;
+       struct tpacket_stats stats;
 
-       if (!addr) {
-               tprints("NULL");
-               return;
+       if (len != sizeof(stats) ||
+           umove(tcp, addr, &stats) < 0) {
+               printaddr(addr);
+       } else {
+               tprintf("{packets=%u, drops=%u}",
+                       stats.tp_packets,
+                       stats.tp_drops);
        }
-       if (syserror(tcp) || !verbose(tcp)) {
-               tprintf("%#lx", addr);
+}
+#endif /* PACKET_STATISTICS */
+
+#ifdef ICMP_FILTER
+# include "xlat/icmpfilterflags.h"
+
+static void
+print_icmp_filter(struct tcb *tcp, const long addr, int len)
+{
+       struct icmp_filter filter = {};
+
+       if (len > (int) sizeof(filter))
+               len = sizeof(filter);
+       else if (len <= 0) {
+               printaddr(addr);
                return;
        }
-       if (umove(tcp, addr, &filter) < 0) {
-               tprints("{...}");
+
+       if (umoven_or_printaddr(tcp, addr, len, &filter))
                return;
-       }
 
        tprints("~(");
        printflags(icmpfilterflags, ~filter.data, "ICMP_???");
@@ -2055,160 +1269,304 @@ static void printicmpfilter(struct tcb *tcp, long addr)
 }
 #endif /* ICMP_FILTER */
 
-static int
-printsockopt(struct tcb *tcp, int level, int name, long addr, int len)
+static void
+print_getsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
+                long addr, int len)
 {
-       printxval(socketlayers, level, "SOL_??");
-       tprints(", ");
+       if (addr && verbose(tcp))
        switch (level) {
-           case SOL_SOCKET:
-               printxval(sockoptions, name, "SO_???");
+       case SOL_SOCKET:
                switch (name) {
-#if defined(SO_LINGER)
-                   case SO_LINGER:
-                       if (len == sizeof(struct linger)) {
-                               struct linger linger;
-                               if (umove(tcp, addr, &linger) < 0)
-                                       break;
-                               tprintf(", {onoff=%d, linger=%d}",
-                                       linger.l_onoff,
-                                       linger.l_linger);
-                               return 0;
-                       }
-                       break;
-#endif
-               }
-               break;
-#ifdef SOL_IP
-           case SOL_IP:
-               printxval(sockipoptions, name, "IP_???");
-               break;
+#ifdef SO_LINGER
+               case SO_LINGER:
+                       print_linger(tcp, addr, len);
+                       goto done;
 #endif
-#ifdef SOL_IPV6
-           case SOL_IPV6:
-               printxval(sockipv6options, name, "IPV6_???");
-               break;
+#ifdef SO_PEERCRED
+               case SO_PEERCRED:
+                       print_ucred(tcp, addr, len);
+                       goto done;
 #endif
-#ifdef SOL_IPX
-           case SOL_IPX:
-               printxval(sockipxoptions, name, "IPX_???");
+               }
                break;
-#endif
-#ifdef SOL_PACKET
-           case SOL_PACKET:
-               printxval(sockpacketoptions, name, "PACKET_???");
-               /* TODO: decode packate_mreq for PACKET_*_MEMBERSHIP */
+
+       case SOL_PACKET:
                switch (name) {
-#ifdef PACKET_RX_RING
-                   case PACKET_RX_RING:
-#endif
-#ifdef PACKET_TX_RING
-                   case PACKET_TX_RING:
+#ifdef PACKET_STATISTICS
+               case PACKET_STATISTICS:
+                       print_tpacket_stats(tcp, addr, len);
+                       goto done;
 #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 */
                }
                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_???");
+
+       case SOL_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 (verbose(tcp)) {
+               if (len == sizeof(int)) {
+                       printnum_int(tcp, addr, "%d");
+               } else {
+                       printstr(tcp, addr, len);
+               }
+       } else {
+               printaddr(addr);
+       }
+done:
+       tprintf(", [%d]", len);
+}
+
+SYS_FUNC(getsockopt)
+{
+       if (entering(tcp)) {
+               print_sockopt_fd_level_name(tcp, tcp->u_arg[0],
+                                           tcp->u_arg[1], tcp->u_arg[2], true);
+       } else {
+               int len;
 
-       if (len == sizeof(int)) {
-               printnum_int(tcp, addr, "%d");
+               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);
+               }
        }
-       else {
+       return 0;
+}
+
+#ifdef IP_ADD_MEMBERSHIP
+static void
+print_mreq(struct tcb *tcp, long addr, unsigned int len)
+{
+       struct ip_mreq mreq;
+
+       if (len < sizeof(mreq)) {
                printstr(tcp, addr, len);
+               return;
        }
-       return 0;
+       if (umove_or_printaddr(tcp, addr, &mreq))
+               return;
+
+       tprints("{imr_multiaddr=inet_addr(");
+       print_quoted_string(inet_ntoa(mreq.imr_multiaddr),
+                           16, QUOTE_0_TERMINATED);
+       tprints("), imr_interface=inet_addr(");
+       print_quoted_string(inet_ntoa(mreq.imr_interface),
+                           16, QUOTE_0_TERMINATED);
+       tprints(")}");
 }
+#endif /* IP_ADD_MEMBERSHIP */
+
+#ifdef IPV6_ADD_MEMBERSHIP
+static void
+print_mreq6(struct tcb *tcp, long addr, unsigned int len)
+{
+       struct ipv6_mreq mreq;
 
-#ifdef HAVE_STRUCT_OPTHDR
+       if (len < sizeof(mreq))
+               goto fail;
 
-void
-print_sock_optmgmt(struct tcb *tcp, long addr, int len)
+       if (umove_or_printaddr(tcp, addr, &mreq))
+               return;
+
+#ifdef HAVE_INET_NTOP
+       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;
+#endif /* HAVE_INET_NTOP */
+
+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)
 {
-       int c = 0;
-       struct opthdr hdr;
+       struct group_req greq;
 
-       while (len >= (int) sizeof hdr) {
-               if (umove(tcp, addr, &hdr) < 0) break;
-               if (c++) {
-                       tprints(", ");
+       if (len != sizeof(greq) ||
+           umove(tcp, addr, &greq) < 0) {
+               printaddr(addr);
+               return;
+       }
+
+       tprintf("{gr_interface=%u, gr_group=", greq.gr_interface);
+       print_sockaddr(tcp, (const void *) &greq.gr_group,
+                      sizeof(greq.gr_group));
+       tprintf("}");
+
+}
+#endif /* MCAST_JOIN_GROUP */
+
+#ifdef PACKET_RX_RING
+static void
+print_tpacket_req(struct tcb *tcp, long addr, int len)
+{
+       struct tpacket_req req;
+
+       if (len != sizeof(req) ||
+           umove(tcp, addr, &req) < 0) {
+               printaddr(addr);
+       } else {
+               tprintf("{block_size=%u, block_nr=%u, "
+                       "frame_size=%u, frame_nr=%u}",
+                       req.tp_block_size,
+                       req.tp_block_nr,
+                       req.tp_frame_size,
+                       req.tp_frame_nr);
+       }
+}
+#endif /* PACKET_RX_RING */
+
+#ifdef PACKET_ADD_MEMBERSHIP
+# include "xlat/packet_mreq_type.h"
+
+static void
+print_packet_mreq(struct tcb *tcp, long addr, int len)
+{
+       struct packet_mreq mreq;
+
+       if (len != sizeof(mreq) ||
+           umove(tcp, addr, &mreq) < 0) {
+               printaddr(addr);
+       } else {
+               unsigned int i;
+
+               tprintf("{mr_ifindex=%u, mr_type=", mreq.mr_ifindex);
+               printxval(packet_mreq_type, mreq.mr_type, "PACKET_MR_???");
+               tprintf(", mr_alen=%u, mr_address=", mreq.mr_alen);
+               if (mreq.mr_alen > ARRAY_SIZE(mreq.mr_address))
+                       mreq.mr_alen = ARRAY_SIZE(mreq.mr_address);
+               for (i = 0; i < mreq.mr_alen; ++i)
+                       tprintf("%02x", mreq.mr_address[i]);
+               tprints("}");
+       }
+}
+#endif /* PACKET_ADD_MEMBERSHIP */
+
+static void
+print_setsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
+                long addr, int len)
+{
+       if (addr && verbose(tcp))
+       switch (level) {
+       case SOL_SOCKET:
+               switch (name) {
+#ifdef SO_LINGER
+               case SO_LINGER:
+                       print_linger(tcp, addr, len);
+                       goto done;
+#endif
                }
-               else if (len > hdr.len + sizeof hdr) {
-                       tprints("[");
+               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:
+                       print_group_req(tcp, addr, len);
+                       goto done;
+#endif /* MCAST_JOIN_GROUP */
                }
-               tprints("{");
-               addr += sizeof hdr;
-               len -= sizeof hdr;
-               printsockopt(tcp, hdr.level, hdr.name, addr, hdr.len);
-               if (hdr.len > 0) {
-                       addr += hdr.len;
-                       len -= hdr.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 */
                }
-               tprints("}");
+               break;
+
+       case SOL_PACKET:
+               switch (name) {
+#ifdef PACKET_RX_RING
+               case PACKET_RX_RING:
+# ifdef PACKET_TX_RING
+               case 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;
+
+       case SOL_RAW:
+               switch (name) {
+#ifdef ICMP_FILTER
+               case ICMP_FILTER:
+                       print_icmp_filter(tcp, addr, len);
+                       goto done;
+#endif
+               }
+               break;
        }
-       if (len > 0) {
-               if (c++) tprints(", ");
-               printstr(tcp, addr, len);
+
+       /* default arg printing */
+
+       if (verbose(tcp)) {
+               if (len == sizeof(int)) {
+                       printnum_int(tcp, addr, "%d");
+               } else {
+                       printstr(tcp, addr, len);
+               }
+       } else {
+               printaddr(addr);
        }
-       if (c > 1) tprints("]");
+done:
+       tprintf(", %d", len);
 }
 
-#endif
-
-int
-sys_setsockopt(struct tcb *tcp)
+SYS_FUNC(setsockopt)
 {
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printsockopt(tcp, tcp->u_arg[1], tcp->u_arg[2],
-                             tcp->u_arg[3], tcp->u_arg[4]);
-               tprintf(", %lu", tcp->u_arg[4]);
-       }
-       return 0;
+       print_sockopt_fd_level_name(tcp, tcp->u_arg[0],
+                                   tcp->u_arg[1], tcp->u_arg[2], false);
+       print_setsockopt(tcp, tcp->u_arg[1], tcp->u_arg[2],
+                        tcp->u_arg[3], tcp->u_arg[4]);
+
+       return RVAL_DECODED;
 }