]> granicus.if.org Git - strace/blobdiff - net.c
powerpc64: fix 64-bit process detection on embedded
[strace] / net.c
diff --git a/net.c b/net.c
index dd6fb644f757ea3553f9448407e15f71ff2a3f77..f09d1dd66a92edee24f66e2925aaf251e595523e 100644 (file)
--- a/net.c
+++ b/net.c
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *     $Id$
  */
 
 #include "defs.h"
-
 #include <sys/stat.h>
 #include <sys/socket.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
+# 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 <netinet/tcp.h>
 #endif
 #ifdef HAVE_NETINET_UDP_H
-#include <netinet/udp.h>
+# include <netinet/udp.h>
+#endif
+#ifdef HAVE_NETINET_SCTP_H
+# include <netinet/sctp.h>
 #endif
 #include <arpa/inet.h>
 #include <net/if.h>
-#if defined(LINUX)
 #include <asm/types.h>
-#if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC__ + __GLIBC_MINOR__ >= 3)
-#  include <netipx/ipx.h>
+#if defined(__GLIBC__)
+# include <netipx/ipx.h>
 #else
-#  include <linux/ipx.h>
-#endif
-#endif /* LINUX */
-
-#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
+# include <linux/ipx.h>
+#endif
+
+#if defined(__GLIBC__) && defined(HAVE_SIN6_SCOPE_ID_LINUX)
+# if defined(HAVE_LINUX_IN6_H)
+#  if defined(HAVE_SIN6_SCOPE_ID_LINUX)
+#   undef in6_addr
+#   undef ipv6_mreq
+#   undef sockaddr_in6
+#   define in6_addr in6_addr_kernel
+#   define ipv6_mreq ipv6_mreq_kernel
+#   define sockaddr_in6 sockaddr_in6_kernel
+#  endif
+#  include <linux/in6.h>
+#  if defined(HAVE_SIN6_SCOPE_ID_LINUX)
+#   undef in6_addr
+#   undef ipv6_mreq
+#   undef sockaddr_in6
+#   define in6_addr in6_addr_libc
+#   define ipv6_mreq ipv6_mreq_libc
+#   define sockaddr_in6 sockaddr_in6_kernel
+#  endif
+# endif
 #endif
 
 #if defined(HAVE_SYS_UIO_H)
-#include <sys/uio.h>
+# include <sys/uio.h>
 #endif
-
 #if defined(HAVE_LINUX_NETLINK_H)
-#include <linux/netlink.h>
+# include <linux/netlink.h>
 #endif
-
 #if defined(HAVE_LINUX_IF_PACKET_H)
-#include <linux/if_packet.h>
+# include <linux/if_packet.h>
 #endif
-
 #if defined(HAVE_LINUX_ICMP_H)
-#include <linux/icmp.h>
+# include <linux/icmp.h>
 #endif
-
 #ifndef PF_UNSPEC
-#define PF_UNSPEC AF_UNSPEC
-#endif
-
-#if UNIXWARE >= 7
-#define HAVE_SENDMSG           1               /* HACK - *FIXME* */
+# define PF_UNSPEC AF_UNSPEC
 #endif
 
-#ifdef LINUX
-/* 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_UNSPEC
+       XLAT(PF_UNSPEC),
 #endif
-
-static struct xlat domains[] = {
-#ifdef PF_AAL5
-       { PF_AAL5,      "PF_AAL5"       },
+#ifdef PF_LOCAL
+       XLAT(PF_LOCAL),
 #endif
-#ifdef PF_APPLETALK
-       { PF_APPLETALK, "PF_APPLETALK"  },
+#ifdef PF_UNIX
+       XLAT(PF_UNIX),
 #endif
-#ifdef PF_ASH
-       { PF_ASH,       "PF_ASH"        },
+#ifdef PF_INET
+       XLAT(PF_INET),
 #endif
-#ifdef PF_ATMPVC
-       { PF_ATMPVC,    "PF_ATMPVC"     },
+#ifdef PF_AX25
+       XLAT(PF_AX25),
 #endif
-#ifdef PF_ATMSVC
-       { PF_ATMSVC,    "PF_ATMSVC"     },
+#ifdef PF_IPX
+       XLAT(PF_IPX),
 #endif
-#ifdef PF_AX25
-       { PF_AX25,      "PF_AX25"       },
+#ifdef PF_APPLETALK
+       XLAT(PF_APPLETALK),
 #endif
-#ifdef PF_BLUETOOTH
-       { PF_BLUETOOTH, "PF_BLUETOOTH"  },
+#ifdef PF_NETROM
+       XLAT(PF_NETROM),
 #endif
 #ifdef PF_BRIDGE
-       { PF_BRIDGE,    "PF_BRIDGE"     },
+       XLAT(PF_BRIDGE),
 #endif
-#ifdef PF_DECnet
-       { PF_DECnet,    "PF_DECnet"     },
+#ifdef PF_ATMPVC
+       XLAT(PF_ATMPVC),
 #endif
-#ifdef PF_DECNET
-       { PF_DECNET,    "PF_DECNET"     },
+#ifdef PF_X25
+       XLAT(PF_X25),
 #endif
-#ifdef PF_ECONET
-       { PF_ECONET,    "PF_ECONET"     },
+#ifdef PF_INET6
+       XLAT(PF_INET6),
 #endif
-#ifdef PF_FILE
-       { PF_FILE,      "PF_FILE"       },
+#ifdef PF_ROSE
+       XLAT(PF_ROSE),
 #endif
-#ifdef PF_IMPLINK
-       { PF_IMPLINK,   "PF_IMPLINK"    },
+#ifdef PF_DECnet
+       XLAT(PF_DECnet),
 #endif
-#ifdef PF_INET
-       { PF_INET,      "PF_INET"       },
+#ifdef PF_NETBEUI
+       XLAT(PF_NETBEUI),
 #endif
-#ifdef PF_INET6
-       { PF_INET6,     "PF_INET6"      },
+#ifdef PF_SECURITY
+       XLAT(PF_SECURITY),
 #endif
-#ifdef PF_IPX
-       { PF_IPX,       "PF_IPX"        },
+#ifdef PF_KEY
+       XLAT(PF_KEY),
 #endif
-#ifdef PF_IRDA
-       { PF_IRDA,      "PF_IRDA"       },
+#ifdef PF_NETLINK
+       XLAT(PF_NETLINK),
 #endif
-#ifdef PF_ISO
-       { PF_ISO,       "PF_ISO"        },
+#ifdef PF_ROUTE
+       XLAT(PF_ROUTE),
 #endif
-#ifdef PF_KEY
-       { PF_KEY,       "PF_KEY"        },
+#ifdef PF_PACKET
+       XLAT(PF_PACKET),
 #endif
-#ifdef PF_UNIX
-       { PF_UNIX,      "PF_UNIX"       },
+#ifdef PF_ASH
+       XLAT(PF_ASH),
 #endif
-#ifdef PF_LOCAL
-       { PF_LOCAL,     "PF_LOCAL"      },
+#ifdef PF_ECONET
+       XLAT(PF_ECONET),
 #endif
-#ifdef PF_NETBEUI
-       { PF_NETBEUI,   "PF_NETBEUI"    },
+#ifdef PF_ATMSVC
+       XLAT(PF_ATMSVC),
 #endif
-#ifdef PF_NETLINK
-       { PF_NETLINK,   "PF_NETLINK"    },
+#ifdef PF_RDS
+       XLAT(PF_RDS),
 #endif
-#ifdef PF_NETROM
-       { PF_NETROM,    "PF_NETROM"     },
+#ifdef PF_SNA
+       XLAT(PF_SNA),
 #endif
-#ifdef PF_PACKET
-       { PF_PACKET,    "PF_PACKET"     },
+#ifdef PF_IRDA
+       XLAT(PF_IRDA),
 #endif
 #ifdef PF_PPPOX
-       { PF_PPPOX,     "PF_PPPOX"      },
-#endif
-#ifdef PF_ROSE
-       { PF_ROSE,      "PF_ROSE"       },
+       XLAT(PF_PPPOX),
 #endif
-#ifdef PF_ROUTE
-       { PF_ROUTE,     "PF_ROUTE"      },
+#ifdef PF_WANPIPE
+       XLAT(PF_WANPIPE),
 #endif
-#ifdef PF_SECURITY
-       { PF_SECURITY,  "PF_SECURITY"   },
+#ifdef PF_LLC
+       XLAT(PF_LLC),
 #endif
-#ifdef PF_SNA
-       { PF_SNA,       "PF_SNA"        },
+#ifdef PF_CAN
+       XLAT(PF_CAN),
 #endif
-#ifdef PF_UNSPEC
-       { PF_UNSPEC,    "PF_UNSPEC"     },
+#ifdef PF_TIPC
+       XLAT(PF_TIPC),
 #endif
-#ifdef PF_WANPIPE
-       { PF_WANPIPE,   "PF_WANPIPE"    },
+#ifdef PF_BLUETOOTH
+       XLAT(PF_BLUETOOTH),
 #endif
-#ifdef PF_X25
-       { PF_X25,       "PF_X25"        },
+#ifdef PF_IUCV
+       XLAT(PF_IUCV),
 #endif
-       { 0,            NULL            },
-};
-struct xlat addrfams[] = {
-#ifdef AF_APPLETALK
-       { AF_APPLETALK, "AF_APPLETALK"  },
+#ifdef PF_RXRPC
+       XLAT(PF_RXRPC),
 #endif
-#ifdef AF_ASH
-       { AF_ASH,       "AF_ASH"        },
+#ifdef PF_ISDN
+       XLAT(PF_ISDN),
 #endif
-#ifdef AF_ATMPVC
-       { AF_ATMPVC,    "AF_ATMPVC"     },
+#ifdef PF_PHONET
+       XLAT(PF_PHONET),
 #endif
-#ifdef AF_ATMSVC
-       { AF_ATMSVC,    "AF_ATMSVC"     },
+#ifdef PF_IEEE802154
+       XLAT(PF_IEEE802154),
 #endif
-#ifdef AF_AX25
-       { AF_AX25,      "AF_AX25"       },
+#ifdef PF_CAIF
+       XLAT(PF_CAIF),
 #endif
-#ifdef AF_BLUETOOTH
-       { AF_BLUETOOTH, "AF_BLUETOOTH"  },
+#ifdef PF_ALG
+       XLAT(PF_ALG),
 #endif
-#ifdef AF_BRIDGE
-       { AF_BRIDGE,    "AF_BRIDGE"     },
+#ifdef PF_NFC
+       XLAT(PF_NFC),
 #endif
-#ifdef AF_DECnet
-       { AF_DECnet,    "AF_DECnet"     },
+#ifdef PF_VSOCK
+       XLAT(PF_VSOCK),
 #endif
-#ifdef AF_ECONET
-       { AF_ECONET,    "AF_ECONET"     },
+       XLAT_END
+};
+const struct xlat addrfams[] = {
+#ifdef AF_UNSPEC
+       XLAT(AF_UNSPEC),
 #endif
-#ifdef AF_FILE
-       { AF_FILE,      "AF_FILE"       },
+#ifdef AF_LOCAL
+       XLAT(AF_LOCAL),
 #endif
-#ifdef AF_IMPLINK
-       { AF_IMPLINK,   "AF_IMPLINK"    },
+#ifdef AF_UNIX
+       XLAT(AF_UNIX),
 #endif
 #ifdef AF_INET
-       { AF_INET,      "AF_INET"       },
+       XLAT(AF_INET),
 #endif
-#ifdef AF_INET6
-       { AF_INET6,     "AF_INET6"      },
+#ifdef AF_AX25
+       XLAT(AF_AX25),
 #endif
 #ifdef AF_IPX
-       { AF_IPX,       "AF_IPX"        },
+       XLAT(AF_IPX),
 #endif
-#ifdef AF_IRDA
-       { AF_IRDA,      "AF_IRDA"       },
+#ifdef AF_APPLETALK
+       XLAT(AF_APPLETALK),
 #endif
-#ifdef AF_ISO
-       { AF_ISO,       "AF_ISO"        },
+#ifdef AF_NETROM
+       XLAT(AF_NETROM),
 #endif
-#ifdef AF_KEY
-       { AF_KEY,       "AF_KEY"        },
+#ifdef AF_BRIDGE
+       XLAT(AF_BRIDGE),
 #endif
-#ifdef AF_UNIX
-       { AF_UNIX,      "AF_UNIX"       },
+#ifdef AF_ATMPVC
+       XLAT(AF_ATMPVC),
 #endif
-#ifdef AF_LOCAL
-       { AF_LOCAL,     "AF_LOCAL"      },
+#ifdef AF_X25
+       XLAT(AF_X25),
+#endif
+#ifdef AF_INET6
+       XLAT(AF_INET6),
+#endif
+#ifdef AF_ROSE
+       XLAT(AF_ROSE),
+#endif
+#ifdef AF_DECnet
+       XLAT(AF_DECnet),
 #endif
 #ifdef AF_NETBEUI
-       { AF_NETBEUI,   "AF_NETBEUI"    },
+       XLAT(AF_NETBEUI),
+#endif
+#ifdef AF_SECURITY
+       XLAT(AF_SECURITY),
+#endif
+#ifdef AF_KEY
+       XLAT(AF_KEY),
 #endif
 #ifdef AF_NETLINK
-       { AF_NETLINK,   "AF_NETLINK"    },
+       XLAT(AF_NETLINK),
 #endif
-#ifdef AF_NETROM
-       { AF_NETROM,    "AF_NETROM"     },
+#ifdef AF_ROUTE
+       XLAT(AF_ROUTE),
 #endif
 #ifdef AF_PACKET
-       { AF_PACKET,    "AF_PACKET"     },
+       XLAT(AF_PACKET),
 #endif
-#ifdef AF_PPPOX
-       { AF_PPPOX,     "AF_PPPOX"      },
+#ifdef AF_ASH
+       XLAT(AF_ASH),
 #endif
-#ifdef AF_ROSE
-       { AF_ROSE,      "AF_ROSE"       },
+#ifdef AF_ECONET
+       XLAT(AF_ECONET),
 #endif
-#ifdef AF_ROUTE
-       { AF_ROUTE,     "AF_ROUTE"      },
+#ifdef AF_ATMSVC
+       XLAT(AF_ATMSVC),
 #endif
-#ifdef AF_SECURITY
-       { AF_SECURITY,  "AF_SECURITY"   },
+#ifdef AF_RDS
+       XLAT(AF_RDS),
 #endif
 #ifdef AF_SNA
-       { AF_SNA,       "AF_SNA"        },
+       XLAT(AF_SNA),
 #endif
-#ifdef AF_UNSPEC
-       { AF_UNSPEC,    "AF_UNSPEC"     },
+#ifdef AF_IRDA
+       XLAT(AF_IRDA),
+#endif
+#ifdef AF_PPPOX
+       XLAT(AF_PPPOX),
 #endif
 #ifdef AF_WANPIPE
-       { AF_WANPIPE,   "AF_WANPIPE"    },
+       XLAT(AF_WANPIPE),
 #endif
-#ifdef AF_X25
-       { AF_X25,       "AF_X25"        },
+#ifdef AF_LLC
+       XLAT(AF_LLC),
+#endif
+#ifdef AF_CAN
+       XLAT(AF_CAN),
+#endif
+#ifdef AF_TIPC
+       XLAT(AF_TIPC),
+#endif
+#ifdef AF_BLUETOOTH
+       XLAT(AF_BLUETOOTH),
+#endif
+#ifdef AF_IUCV
+       XLAT(AF_IUCV),
 #endif
-       { 0,            NULL            },
+#ifdef AF_RXRPC
+       XLAT(AF_RXRPC),
+#endif
+#ifdef AF_ISDN
+       XLAT(AF_ISDN),
+#endif
+#ifdef AF_PHONET
+       XLAT(AF_PHONET),
+#endif
+#ifdef AF_IEEE802154
+       XLAT(AF_IEEE802154),
+#endif
+#ifdef AF_CAIF
+       XLAT(AF_CAIF),
+#endif
+#ifdef AF_ALG
+       XLAT(AF_ALG),
+#endif
+#ifdef AF_NFC
+       XLAT(AF_NFC),
+#endif
+#ifdef AF_VSOCK
+       XLAT(AF_VSOCK),
+#endif
+       XLAT_END
 };
-static struct xlat socktypes[] = {
-       { SOCK_STREAM,  "SOCK_STREAM"   },
-       { SOCK_DGRAM,   "SOCK_DGRAM"    },
+static const struct xlat socktypes[] = {
+       XLAT(SOCK_STREAM),
+       XLAT(SOCK_DGRAM),
 #ifdef SOCK_RAW
-       { SOCK_RAW,     "SOCK_RAW"      },
+       XLAT(SOCK_RAW),
+#endif
+#ifdef SOCK_RDM
+       XLAT(SOCK_RDM),
 #endif
 #ifdef SOCK_SEQPACKET
-       { SOCK_SEQPACKET,"SOCK_SEQPACKET"},
+       XLAT(SOCK_SEQPACKET),
 #endif
-#ifdef SOCK_RDM
-       { SOCK_RDM,     "SOCK_RDM"      },
+#ifdef SOCK_DCCP
+       XLAT(SOCK_DCCP),
 #endif
 #ifdef SOCK_PACKET
-       { SOCK_PACKET,  "SOCK_PACKET"   },
+       XLAT(SOCK_PACKET),
 #endif
-       { 0,            NULL            },
+       XLAT_END
 };
-static struct xlat socketlayers[] = {
+static const struct xlat sock_type_flags[] = {
+#ifdef SOCK_CLOEXEC
+       XLAT(SOCK_CLOEXEC),
+#endif
+#ifdef SOCK_NONBLOCK
+       XLAT(SOCK_NONBLOCK),
+#endif
+       XLAT_END
+};
+#ifndef SOCK_TYPE_MASK
+# define SOCK_TYPE_MASK 0xf
+#endif
+static const struct xlat socketlayers[] = {
 #if defined(SOL_IP)
-       { SOL_IP,       "SOL_IP"        },
+       XLAT(SOL_IP),
 #endif
 #if defined(SOL_ICMP)
-       { SOL_ICMP,     "SOL_ICMP"      },
+       XLAT(SOL_ICMP),
 #endif
 #if defined(SOL_TCP)
-       { SOL_TCP,      "SOL_TCP"       },
+       XLAT(SOL_TCP),
 #endif
 #if defined(SOL_UDP)
-       { SOL_UDP,      "SOL_UDP"       },
+       XLAT(SOL_UDP),
 #endif
 #if defined(SOL_IPV6)
-       { SOL_IPV6,     "SOL_IPV6"      },
+       XLAT(SOL_IPV6),
 #endif
 #if defined(SOL_ICMPV6)
-       { SOL_ICMPV6,   "SOL_ICMPV6"    },
+       XLAT(SOL_ICMPV6),
 #endif
-#if defined(SOL_RAW)
-       { SOL_RAW,      "SOL_RAW"       },
+#if defined(SOL_SCTP)
+       XLAT(SOL_SCTP),
 #endif
-#if defined(SOL_IPX)
-       { SOL_IPX,      "SOL_IPX"       },
+#if defined(SOL_UDPLITE)
+       XLAT(SOL_UDPLITE),
+#endif
+#if defined(SOL_RAW)
+       XLAT(SOL_RAW),
 #endif
 #if defined(SOL_IPX)
-       { SOL_IPX,      "SOL_IPX"       },
+       XLAT(SOL_IPX),
 #endif
 #if defined(SOL_AX25)
-       { SOL_AX25,     "SOL_AX25"      },
+       XLAT(SOL_AX25),
 #endif
 #if defined(SOL_ATALK)
-       { SOL_ATALK,    "SOL_ATALK"     },
+       XLAT(SOL_ATALK),
 #endif
 #if defined(SOL_NETROM)
-       { SOL_NETROM,   "SOL_NETROM"    },
+       XLAT(SOL_NETROM),
 #endif
 #if defined(SOL_ROSE)
-       { SOL_ROSE,     "SOL_ROSE"      },
+       XLAT(SOL_ROSE),
 #endif
 #if defined(SOL_DECNET)
-       { SOL_DECNET,   "SOL_DECNET"    },
+       XLAT(SOL_DECNET),
 #endif
 #if defined(SOL_X25)
-       { SOL_X25,      "SOL_X25"       },
+       XLAT(SOL_X25),
 #endif
 #if defined(SOL_PACKET)
-       { SOL_PACKET,   "SOL_PACKET"    },
+       XLAT(SOL_PACKET),
 #endif
 #if defined(SOL_ATM)
-       { SOL_ATM,      "SOL_ATM"       },
+       XLAT(SOL_ATM),
 #endif
 #if defined(SOL_AAL)
-       { SOL_AAL,      "SOL_AAL"       },
+       XLAT(SOL_AAL),
 #endif
 #if defined(SOL_IRDA)
-       { SOL_IRDA,     "SOL_IRDA"      },
+       XLAT(SOL_IRDA),
+#endif
+#if defined(SOL_NETBEUI)
+       XLAT(SOL_NETBEUI),
+#endif
+#if defined(SOL_LLC)
+       XLAT(SOL_LLC),
+#endif
+#if defined(SOL_DCCP)
+       XLAT(SOL_DCCP),
+#endif
+#if defined(SOL_NETLINK)
+       XLAT(SOL_NETLINK),
+#endif
+#if defined(SOL_TIPC)
+       XLAT(SOL_TIPC),
+#endif
+#if defined(SOL_RXRPC)
+       XLAT(SOL_RXRPC),
 #endif
-       { SOL_SOCKET,   "SOL_SOCKET"    },      /* Never used! */
+#if defined(SOL_PPPOL2TP)
+       XLAT(SOL_PPPOL2TP),
+#endif
+#if defined(SOL_BLUETOOTH)
+       XLAT(SOL_BLUETOOTH),
+#endif
+#if defined(SOL_PNPIPE)
+       XLAT(SOL_PNPIPE),
+#endif
+#if defined(SOL_RDS)
+       XLAT(SOL_RDS),
+#endif
+#if defined(SOL_IUVC)
+       XLAT(SOL_IUCV),
+#endif
+#if defined(SOL_CAIF)
+       XLAT(SOL_CAIF),
+#endif
+       XLAT(SOL_SOCKET),       /* Never used! */
+       /* The SOL_* array should remain not NULL-terminated. */
 };
 /*** WARNING: DANGER WILL ROBINSON: NOTE "socketlayers" array above
      falls into "protocols" array below!!!!   This is intended!!! ***/
-static struct xlat protocols[] = {
-       { IPPROTO_IP,   "IPPROTO_IP"    },
-       { IPPROTO_ICMP, "IPPROTO_ICMP"  },
-       { IPPROTO_TCP,  "IPPROTO_TCP"   },
-       { IPPROTO_UDP,  "IPPROTO_UDP"   },
+static const struct xlat protocols[] = {
+       XLAT(IPPROTO_IP),
+       XLAT(IPPROTO_ICMP),
+       XLAT(IPPROTO_TCP),
+       XLAT(IPPROTO_UDP),
+#ifdef IPPROTO_IGMP
+       XLAT(IPPROTO_IGMP),
+#endif
 #ifdef IPPROTO_GGP
-       { IPPROTO_GGP,  "IPPROTO_GGP"   },
+       XLAT(IPPROTO_GGP),
+#endif
+#ifdef IPPROTO_IPIP
+       XLAT(IPPROTO_IPIP),
 #endif
 #ifdef IPPROTO_EGP
-       { IPPROTO_EGP,  "IPPROTO_EGP"   },
+       XLAT(IPPROTO_EGP),
 #endif
 #ifdef IPPROTO_PUP
-       { IPPROTO_PUP,  "IPPROTO_PUP"   },
+       XLAT(IPPROTO_PUP),
 #endif
 #ifdef IPPROTO_IDP
-       { IPPROTO_IDP,  "IPPROTO_IDP"   },
+       XLAT(IPPROTO_IDP),
+#endif
+#ifdef IPPROTO_TP
+       XLAT(IPPROTO_TP),
+#endif
+#ifdef IPPROTO_DCCP
+       XLAT(IPPROTO_DCCP),
 #endif
 #ifdef IPPROTO_IPV6
-       { IPPROTO_IPV6, "IPPROTO_IPV6"  },
+       XLAT(IPPROTO_IPV6),
+#endif
+#ifdef IPPROTO_ROUTING
+       XLAT(IPPROTO_ROUTING),
+#endif
+#ifdef IPPROTO_FRAGMENT
+       XLAT(IPPROTO_FRAGMENT),
+#endif
+#ifdef IPPROTO_RSVP
+       XLAT(IPPROTO_RSVP),
+#endif
+#ifdef IPPROTO_GRE
+       XLAT(IPPROTO_GRE),
+#endif
+#ifdef IPPROTO_ESP
+       XLAT(IPPROTO_ESP),
+#endif
+#ifdef IPPROTO_AH
+       XLAT(IPPROTO_AH),
 #endif
 #ifdef IPPROTO_ICMPV6
-       { IPPROTO_ICMPV6,"IPPROTO_ICMPV6"},
+       XLAT(IPPROTO_ICMPV6),
 #endif
-#ifdef IPPROTO_IGMP
-       { IPPROTO_IGMP, "IPPROTO_IGMP"  },
+#ifdef IPPROTO_NONE
+       XLAT(IPPROTO_NONE),
+#endif
+#ifdef IPPROTO_DSTOPTS
+       XLAT(IPPROTO_DSTOPTS),
 #endif
 #ifdef IPPROTO_HELLO
-       { IPPROTO_HELLO,"IPPROTO_HELLO" },
+       XLAT(IPPROTO_HELLO),
 #endif
 #ifdef IPPROTO_ND
-       { IPPROTO_ND,   "IPPROTO_ND"    },
+       XLAT(IPPROTO_ND),
 #endif
-#ifdef IPPROTO_RAW
-       { IPPROTO_RAW,  "IPPROTO_RAW"   },
+#ifdef IPPROTO_MTP
+       XLAT(IPPROTO_MTP),
 #endif
-#ifdef IPPROTO_MAX
-       { IPPROTO_MAX,  "IPPROTO_MAX"   },
+#ifdef IPPROTO_ENCAP
+       XLAT(IPPROTO_ENCAP),
 #endif
-#ifdef IPPROTO_IPIP
-       { IPPROTO_IPIP, "IPPROTO_IPIP"  },
+#ifdef IPPROTO_PIM
+       XLAT(IPPROTO_PIM),
 #endif
-       { 0,            NULL            },
-};
-static struct xlat msg_flags[] = {
-       { MSG_OOB,      "MSG_OOB"       },
-#ifdef MSG_DONTROUTE
-       { MSG_DONTROUTE,"MSG_DONTROUTE" },
+#ifdef IPPROTO_COMP
+       XLAT(IPPROTO_COMP),
 #endif
-#ifdef MSG_PEEK
-       { MSG_PEEK,     "MSG_PEEK"      },
+#ifdef IPPROTO_SCTP
+       XLAT(IPPROTO_SCTP),
 #endif
-#ifdef MSG_CTRUNC
-       { MSG_CTRUNC,   "MSG_CTRUNC"    },
+#ifdef IPPROTO_UDPLITE
+       XLAT(IPPROTO_UDPLITE),
 #endif
-#ifdef MSG_PROXY
-       { MSG_PROXY,    "MSG_PROXY"     },
+#ifdef IPPROTO_RAW
+       XLAT(IPPROTO_RAW),
 #endif
-#ifdef MSG_EOR
-       { MSG_EOR,      "MSG_EOR"       },
+#ifdef IPPROTO_MAX
+       XLAT(IPPROTO_MAX),
 #endif
-#ifdef MSG_WAITALL
-       { MSG_WAITALL,  "MSG_WAITALL"   },
+       XLAT_END
+};
+static const struct xlat msg_flags[] = {
+       XLAT(MSG_OOB),
+#ifdef MSG_PEEK
+       XLAT(MSG_PEEK),
 #endif
-#ifdef MSG_TRUNC
-       { MSG_TRUNC,    "MSG_TRUNC"     },
+#ifdef MSG_DONTROUTE
+       XLAT(MSG_DONTROUTE),
 #endif
 #ifdef MSG_CTRUNC
-       { MSG_CTRUNC,   "MSG_CTRUNC"    },
+       XLAT(MSG_CTRUNC),
 #endif
-#ifdef MSG_ERRQUEUE
-       { MSG_ERRQUEUE, "MSG_ERRQUEUE"  },
+#ifdef MSG_PROBE
+       XLAT(MSG_PROBE),
+#endif
+#ifdef MSG_TRUNC
+       XLAT(MSG_TRUNC),
 #endif
 #ifdef MSG_DONTWAIT
-       { MSG_DONTWAIT, "MSG_DONTWAIT"  },
+       XLAT(MSG_DONTWAIT),
 #endif
-#ifdef MSG_CONFIRM
-       { MSG_CONFIRM,  "MSG_CONFIRM"   },
+#ifdef MSG_EOR
+       XLAT(MSG_EOR),
 #endif
-#ifdef MSG_PROBE
-       { MSG_PROBE,    "MSG_PROBE"     },
+#ifdef MSG_WAITALL
+       XLAT(MSG_WAITALL),
 #endif
 #ifdef MSG_FIN
-       { MSG_FIN,      "MSG_FIN"       },
+       XLAT(MSG_FIN),
 #endif
 #ifdef MSG_SYN
-       { MSG_SYN,      "MSG_SYN"       },
+       XLAT(MSG_SYN),
+#endif
+#ifdef MSG_CONFIRM
+       XLAT(MSG_CONFIRM),
 #endif
 #ifdef MSG_RST
-       { MSG_RST,      "MSG_RST"       },
+       XLAT(MSG_RST),
+#endif
+#ifdef MSG_ERRQUEUE
+       XLAT(MSG_ERRQUEUE),
 #endif
 #ifdef MSG_NOSIGNAL
-       { MSG_NOSIGNAL, "MSG_NOSIGNAL"  },
+       XLAT(MSG_NOSIGNAL),
 #endif
 #ifdef MSG_MORE
-       { MSG_MORE,     "MSG_MORE"      },
+       XLAT(MSG_MORE),
+#endif
+#ifdef MSG_WAITFORONE
+       XLAT(MSG_WAITFORONE),
+#endif
+#ifdef MSG_EOF
+       XLAT(MSG_EOF),
+#endif
+#ifdef MSG_FASTOPEN
+       XLAT(MSG_FASTOPEN),
 #endif
-       { 0,            NULL            },
+#ifdef MSG_CMSG_CLOEXEC
+       XLAT(MSG_CMSG_CLOEXEC),
+#endif
+       XLAT_END
 };
 
-static struct xlat sockoptions[] = {
-#ifdef SO_PEERCRED
-       { SO_PEERCRED,  "SO_PEERCRED"   },
+static const struct xlat sockoptions[] = {
+#ifdef SO_ACCEPTCONN
+       XLAT(SO_ACCEPTCONN),
 #endif
-#ifdef SO_PASSCRED
-       { SO_PASSCRED,  "SO_PASSCRED"   },
+#ifdef SO_ALLRAW
+       XLAT(SO_ALLRAW),
 #endif
-#ifdef SO_DEBUG
-       { SO_DEBUG,     "SO_DEBUG"      },
+#ifdef SO_ATTACH_FILTER
+       XLAT(SO_ATTACH_FILTER),
 #endif
-#ifdef SO_REUSEADDR
-       { SO_REUSEADDR, "SO_REUSEADDR"  },
+#ifdef SO_BINDTODEVICE
+       XLAT(SO_BINDTODEVICE),
 #endif
-#ifdef SO_KEEPALIVE
-       { SO_KEEPALIVE, "SO_KEEPALIVE"  },
+#ifdef SO_BROADCAST
+       XLAT(SO_BROADCAST),
+#endif
+#ifdef SO_BSDCOMPAT
+       XLAT(SO_BSDCOMPAT),
+#endif
+#ifdef SO_DEBUG
+       XLAT(SO_DEBUG),
+#endif
+#ifdef SO_DETACH_FILTER
+       XLAT(SO_DETACH_FILTER),
 #endif
 #ifdef SO_DONTROUTE
-       { SO_DONTROUTE, "SO_DONTROUTE"  },
+       XLAT(SO_DONTROUTE),
 #endif
-#ifdef SO_BROADCAST
-       { SO_BROADCAST, "SO_BROADCAST"  },
+#ifdef SO_ERROR
+       XLAT(SO_ERROR),
+#endif
+#ifdef SO_ICS
+       XLAT(SO_ICS),
+#endif
+#ifdef SO_IMASOCKET
+       XLAT(SO_IMASOCKET),
+#endif
+#ifdef SO_KEEPALIVE
+       XLAT(SO_KEEPALIVE),
 #endif
 #ifdef SO_LINGER
-       { SO_LINGER,    "SO_LINGER"     },
+       XLAT(SO_LINGER),
+#endif
+#ifdef SO_LISTENING
+       XLAT(SO_LISTENING),
+#endif
+#ifdef SO_MGMT
+       XLAT(SO_MGMT),
+#endif
+#ifdef SO_NO_CHECK
+       XLAT(SO_NO_CHECK),
 #endif
 #ifdef SO_OOBINLINE
-       { SO_OOBINLINE, "SO_OOBINLINE"  },
+       XLAT(SO_OOBINLINE),
 #endif
-#ifdef SO_TYPE
-       { SO_TYPE,      "SO_TYPE"       },
+#ifdef SO_ORDREL
+       XLAT(SO_ORDREL),
 #endif
-#ifdef SO_ERROR
-       { SO_ERROR,     "SO_ERROR"      },
+#ifdef SO_PARALLELSVR
+       XLAT(SO_PARALLELSVR),
 #endif
-#ifdef SO_SNDBUF
-       { SO_SNDBUF,    "SO_SNDBUF"     },
+#ifdef SO_PASSCRED
+       XLAT(SO_PASSCRED),
 #endif
-#ifdef SO_RCVBUF
-       { SO_RCVBUF,    "SO_RCVBUF"     },
+#ifdef SO_PEERCRED
+       XLAT(SO_PEERCRED),
 #endif
-#ifdef SO_NO_CHECK
-       { SO_NO_CHECK,  "SO_NO_CHECK"   },
+#ifdef SO_PEERNAME
+       XLAT(SO_PEERNAME),
 #endif
-#ifdef SO_PRIORITY
-       { SO_PRIORITY,  "SO_PRIORITY"   },
+#ifdef SO_PEERSEC
+       XLAT(SO_PEERSEC),
 #endif
-#ifdef SO_ACCEPTCONN
-       { SO_ACCEPTCONN,"SO_ACCEPTCONN" },
+#ifdef SO_PRIORITY
+       XLAT(SO_PRIORITY),
 #endif
-#ifdef SO_USELOOPBACK
-       { SO_USELOOPBACK,"SO_USELOOPBACK"},
+#ifdef SO_PROTOTYPE
+       XLAT(SO_PROTOTYPE),
 #endif
-#ifdef SO_SNDLOWAT
-       { SO_SNDLOWAT,  "SO_SNDLOWAT"   },
+#ifdef SO_RCVBUF
+       XLAT(SO_RCVBUF),
 #endif
 #ifdef SO_RCVLOWAT
-       { SO_RCVLOWAT,  "SO_RCVLOWAT"   },
-#endif
-#ifdef SO_SNDTIMEO
-       { SO_SNDTIMEO,  "SO_SNDTIMEO"   },
+       XLAT(SO_RCVLOWAT),
 #endif
 #ifdef SO_RCVTIMEO
-       { SO_RCVTIMEO,  "SO_RCVTIMEO"   },
+       XLAT(SO_RCVTIMEO),
 #endif
-#ifdef SO_BSDCOMPAT
-       { SO_BSDCOMPAT, "SO_BSDCOMPAT"  },
+#ifdef SO_RDWR
+       XLAT(SO_RDWR),
+#endif
+#ifdef SO_REUSEADDR
+       XLAT(SO_REUSEADDR),
 #endif
 #ifdef SO_REUSEPORT
-       { SO_REUSEPORT, "SO_REUSEPORT"  },
+       XLAT(SO_REUSEPORT),
 #endif
-#ifdef SO_ORDREL
-       { SO_ORDREL,    "SO_ORDREL"     },
+#ifdef SO_SECURITY_AUTHENTICATION
+       XLAT(SO_SECURITY_AUTHENTICATION),
 #endif
-#ifdef SO_IMASOCKET
-       { SO_IMASOCKET, "SO_IMASOCKET"  },
+#ifdef SO_SECURITY_ENCRYPTION_NETWORK
+       XLAT(SO_SECURITY_ENCRYPTION_NETWORK),
 #endif
-#ifdef SO_MGMT
-       { SO_MGMT,      "SO_MGMT"       },
+#ifdef SO_SECURITY_ENCRYPTION_TRANSPORT
+       XLAT(SO_SECURITY_ENCRYPTION_TRANSPORT),
 #endif
-#ifdef SO_LISTENING
-       { SO_LISTENING, "SO_LISTENING"  },
+#ifdef SO_SEMA
+       XLAT(SO_SEMA),
 #endif
-#ifdef SO_RDWR
-       { SO_RDWR,      "SO_RDWR"       },
+#ifdef SO_SNDBUF
+       XLAT(SO_SNDBUF),
 #endif
-#ifdef SO_SEMA
-       { SO_SEMA,      "SO_SEMA"       },
+#ifdef SO_SNDLOWAT
+       XLAT(SO_SNDLOWAT),
 #endif
-#ifdef SO_PARALLELSVR
-       { SO_PARALLELSVR,"SO_PARALLELSVR"},
+#ifdef SO_SNDTIMEO
+       XLAT(SO_SNDTIMEO),
 #endif
-#ifdef SO_PROTOTYPE
-       { SO_PROTOTYPE, "SO_PROTOTYPE"  },
+#ifdef SO_TIMESTAMP
+       XLAT(SO_TIMESTAMP),
 #endif
-#ifdef SO_ALLRAW
-       { SO_ALLRAW,    "SO_ALLRAW"     },
+#ifdef SO_TYPE
+       XLAT(SO_TYPE),
 #endif
-#ifdef SO_ICS
-       { SO_ICS,       "SO_ICS"        },
+#ifdef SO_USELOOPBACK
+       XLAT(SO_USELOOPBACK),
 #endif
-       { 0,            NULL            },
+       XLAT_END
 };
 
-#if !defined (SOL_IP) && defined (IPPROTO_IP)
+#if !defined(SOL_IP) && defined(IPPROTO_IP)
 #define SOL_IP IPPROTO_IP
 #endif
 
 #ifdef SOL_IP
-static struct xlat sockipoptions[] = {
+static const struct xlat sockipoptions[] = {
 #ifdef IP_TOS
-       { IP_TOS,               "IP_TOS"                },
+       XLAT(IP_TOS),
 #endif
 #ifdef IP_TTL
-       { IP_TTL,               "IP_TTL"                },
+       XLAT(IP_TTL),
 #endif
 #ifdef IP_HDRINCL
-       { IP_HDRINCL,           "IP_HDRINCL"            },
+       XLAT(IP_HDRINCL),
 #endif
 #ifdef IP_OPTIONS
-       { IP_OPTIONS,           "IP_OPTIONS"            },
+       XLAT(IP_OPTIONS),
 #endif
 #ifdef IP_ROUTER_ALERT
-       { IP_ROUTER_ALERT,      "IP_ROUTER_ALERT"       },
+       XLAT(IP_ROUTER_ALERT),
 #endif
 #ifdef IP_RECVOPTIONS
-       { IP_RECVOPTIONS,       "IP_RECVOPTIONS"        },
+       XLAT(IP_RECVOPTIONS),
 #endif
 #ifdef IP_RECVOPTS
-       { IP_RECVOPTS,          "IP_RECVOPTS"           },
+       XLAT(IP_RECVOPTS),
 #endif
 #ifdef IP_RECVRETOPTS
-       { IP_RECVRETOPTS,       "IP_RECVRETOPTS"        },
+       XLAT(IP_RECVRETOPTS),
 #endif
 #ifdef IP_RECVDSTADDR
-       { IP_RECVDSTADDR,       "IP_RECVDSTADDR"        },
+       XLAT(IP_RECVDSTADDR),
 #endif
 #ifdef IP_RETOPTS
-       { IP_RETOPTS,           "IP_RETOPTS"            },
+       XLAT(IP_RETOPTS),
 #endif
 #ifdef IP_PKTINFO
-       { IP_PKTINFO,           "IP_PKTINFO"            },
+       XLAT(IP_PKTINFO),
 #endif
 #ifdef IP_PKTOPTIONS
-       { IP_PKTOPTIONS,        "IP_PKTOPTIONS"         },
+       XLAT(IP_PKTOPTIONS),
 #endif
 #ifdef IP_MTU_DISCOVER
-       { IP_MTU_DISCOVER,      "IP_MTU_DISCOVER"       },
+       XLAT(IP_MTU_DISCOVER),
 #endif
 #ifdef IP_RECVERR
-       { IP_RECVERR,           "IP_RECVERR"            },
+       XLAT(IP_RECVERR),
 #endif
 #ifdef IP_RECVTTL
-       { IP_RECVTTL,           "IP_RECRECVTTL"         },
+       XLAT(IP_RECVTTL),
 #endif
 #ifdef IP_RECVTOS
-       { IP_RECVTOS,           "IP_RECRECVTOS"         },
+       XLAT(IP_RECVTOS),
 #endif
 #ifdef IP_MTU
-       { IP_MTU,               "IP_MTU"                },
+       XLAT(IP_MTU),
 #endif
 #ifdef IP_MULTICAST_IF
-       { IP_MULTICAST_IF,      "IP_MULTICAST_IF"       },
+       XLAT(IP_MULTICAST_IF),
 #endif
 #ifdef IP_MULTICAST_TTL
-       { IP_MULTICAST_TTL,     "IP_MULTICAST_TTL"      },
+       XLAT(IP_MULTICAST_TTL),
 #endif
 #ifdef IP_MULTICAST_LOOP
-       { IP_MULTICAST_LOOP,    "IP_MULTICAST_LOOP"     },
+       XLAT(IP_MULTICAST_LOOP),
 #endif
 #ifdef IP_ADD_MEMBERSHIP
-       { IP_ADD_MEMBERSHIP,    "IP_ADD_MEMBERSHIP"     },
+       XLAT(IP_ADD_MEMBERSHIP),
 #endif
 #ifdef IP_DROP_MEMBERSHIP
-       { IP_DROP_MEMBERSHIP,   "IP_DROP_MEMBERSHIP"    },
+       XLAT(IP_DROP_MEMBERSHIP),
 #endif
 #ifdef IP_BROADCAST_IF
-       { IP_BROADCAST_IF,      "IP_BROADCAST_IF"       },
+       XLAT(IP_BROADCAST_IF),
 #endif
 #ifdef IP_RECVIFINDEX
-       { IP_RECVIFINDEX,       "IP_RECVIFINDEX"        },
+       XLAT(IP_RECVIFINDEX),
+#endif
+#ifdef IP_MSFILTER
+       XLAT(IP_MSFILTER),
+#endif
+#ifdef MCAST_MSFILTER
+       XLAT(MCAST_MSFILTER),
+#endif
+#ifdef IP_FREEBIND
+       XLAT(IP_FREEBIND),
+#endif
+#ifdef IP_IPSEC_POLICY
+       XLAT(IP_IPSEC_POLICY),
+#endif
+#ifdef IP_XFRM_POLICY
+       XLAT(IP_XFRM_POLICY),
+#endif
+#ifdef IP_PASSSEC
+       XLAT(IP_PASSSEC),
+#endif
+#ifdef IP_TRANSPARENT
+       XLAT(IP_TRANSPARENT),
+#endif
+#ifdef IP_ORIGDSTADDR
+       XLAT(IP_ORIGDSTADDR),
+#endif
+#ifdef IP_RECVORIGDSTADDR
+       XLAT(IP_RECVORIGDSTADDR),
 #endif
-       { 0,                    NULL                    },
+#ifdef IP_MINTTL
+       XLAT(IP_MINTTL),
+#endif
+#ifdef IP_NODEFRAG
+       XLAT(IP_NODEFRAG),
+#endif
+#ifdef IP_UNBLOCK_SOURCE
+       XLAT(IP_UNBLOCK_SOURCE),
+#endif
+#ifdef IP_BLOCK_SOURCE
+       XLAT(IP_BLOCK_SOURCE),
+#endif
+#ifdef IP_ADD_SOURCE_MEMBERSHIP
+       XLAT(IP_ADD_SOURCE_MEMBERSHIP),
+#endif
+#ifdef IP_DROP_SOURCE_MEMBERSHIP
+       XLAT(IP_DROP_SOURCE_MEMBERSHIP),
+#endif
+#ifdef MCAST_JOIN_GROUP
+       XLAT(MCAST_JOIN_GROUP),
+#endif
+#ifdef MCAST_BLOCK_SOURCE
+       XLAT(MCAST_BLOCK_SOURCE),
+#endif
+#ifdef MCAST_UNBLOCK_SOURCE
+       XLAT(MCAST_UNBLOCK_SOURCE),
+#endif
+#ifdef MCAST_LEAVE_GROUP
+       XLAT(MCAST_LEAVE_GROUP),
+#endif
+#ifdef MCAST_JOIN_SOURCE_GROUP
+       XLAT(MCAST_JOIN_SOURCE_GROUP),
+#endif
+#ifdef MCAST_LEAVE_SOURCE_GROUP
+       XLAT(MCAST_LEAVE_SOURCE_GROUP),
+#endif
+#ifdef IP_MULTICAST_ALL
+       XLAT(IP_MULTICAST_ALL),
+#endif
+#ifdef IP_UNICAST_IF
+       XLAT(IP_UNICAST_IF),
+#endif
+       XLAT_END
 };
 #endif /* SOL_IP */
 
+#ifdef SOL_IPV6
+static const struct xlat sockipv6options[] = {
+#ifdef IPV6_ADDRFORM
+       XLAT(IPV6_ADDRFORM),
+#endif
+#ifdef MCAST_FILTER
+       XLAT(MCAST_FILTER),
+#endif
+#ifdef IPV6_PKTOPTIONS
+       XLAT(IPV6_PKTOPTIONS),
+#endif
+#ifdef IPV6_MTU
+       XLAT(IPV6_MTU),
+#endif
+#ifdef IPV6_V6ONLY
+       XLAT(IPV6_V6ONLY),
+#endif
+#ifdef IPV6_PKTINFO
+       XLAT(IPV6_PKTINFO),
+#endif
+#ifdef IPV6_HOPLIMIT
+       XLAT(IPV6_HOPLIMIT),
+#endif
+#ifdef IPV6_RTHDR
+       XLAT(IPV6_RTHDR),
+#endif
+#ifdef IPV6_HOPOPTS
+       XLAT(IPV6_HOPOPTS),
+#endif
+#ifdef IPV6_DSTOPTS
+       XLAT(IPV6_DSTOPTS),
+#endif
+#ifdef IPV6_FLOWINFO
+       XLAT(IPV6_FLOWINFO),
+#endif
+#ifdef IPV6_UNICAST_HOPS
+       XLAT(IPV6_UNICAST_HOPS),
+#endif
+#ifdef IPV6_MULTICAST_HOPS
+       XLAT(IPV6_MULTICAST_HOPS),
+#endif
+#ifdef IPV6_MULTICAST_LOOP
+       XLAT(IPV6_MULTICAST_LOOP),
+#endif
+#ifdef IPV6_MULTICAST_IF
+       XLAT(IPV6_MULTICAST_IF),
+#endif
+#ifdef IPV6_MTU_DISCOVER
+       XLAT(IPV6_MTU_DISCOVER),
+#endif
+#ifdef IPV6_RECVERR
+       XLAT(IPV6_RECVERR),
+#endif
+#ifdef IPV6_FLOWINFO_SEND
+       XLAT(IPV6_FLOWINFO_SEND),
+#endif
+#ifdef IPV6_ADD_MEMBERSHIP
+       XLAT(IPV6_ADD_MEMBERSHIP),
+#endif
+#ifdef IPV6_DROP_MEMBERSHIP
+       XLAT(IPV6_DROP_MEMBERSHIP),
+#endif
+#ifdef IPV6_ROUTER_ALERT
+       XLAT(IPV6_ROUTER_ALERT),
+#endif
+       XLAT_END
+};
+#endif /* SOL_IPV6 */
+
 #ifdef SOL_IPX
-static struct xlat sockipxoptions[] = {
-       { IPX_TYPE,     "IPX_TYPE"      },
-       { 0,            NULL            },
+static const struct xlat sockipxoptions[] = {
+       XLAT(IPX_TYPE),
+       XLAT_END
 };
 #endif /* SOL_IPX */
 
 #ifdef SOL_RAW
-static struct xlat sockrawoptions[] = {
+static const struct xlat sockrawoptions[] = {
 #if defined(ICMP_FILTER)
-       { ICMP_FILTER,          "ICMP_FILTER"   },
+       XLAT(ICMP_FILTER),
 #endif
-       { 0,                    NULL            },
+       XLAT_END
 };
 #endif /* SOL_RAW */
 
 #ifdef SOL_PACKET
-static struct xlat sockpacketoptions[] = {
-       { PACKET_ADD_MEMBERSHIP,        "PACKET_ADD_MEMBERSHIP" },
-       { PACKET_DROP_MEMBERSHIP,       "PACKET_DROP_MEMBERSHIP"},
+static const struct xlat sockpacketoptions[] = {
+#ifdef PACKET_ADD_MEMBERSHIP
+       XLAT(PACKET_ADD_MEMBERSHIP),
+#endif
+#ifdef PACKET_DROP_MEMBERSHIP
+       XLAT(PACKET_DROP_MEMBERSHIP),
+#endif
 #if defined(PACKET_RECV_OUTPUT)
-       { PACKET_RECV_OUTPUT,           "PACKET_RECV_OUTPUT"    },
+       XLAT(PACKET_RECV_OUTPUT),
 #endif
 #if defined(PACKET_RX_RING)
-       { PACKET_RX_RING,               "PACKET_RX_RING"        },
+       XLAT(PACKET_RX_RING),
 #endif
 #if defined(PACKET_STATISTICS)
-       { PACKET_STATISTICS,            "PACKET_STATISTICS"     },
+       XLAT(PACKET_STATISTICS),
+#endif
+#if defined(PACKET_COPY_THRESH)
+       XLAT(PACKET_COPY_THRESH),
+#endif
+#if defined(PACKET_AUXDATA)
+       XLAT(PACKET_AUXDATA),
+#endif
+#if defined(PACKET_ORIGDEV)
+       XLAT(PACKET_ORIGDEV),
+#endif
+#if defined(PACKET_VERSION)
+       XLAT(PACKET_VERSION),
+#endif
+#if defined(PACKET_HDRLEN)
+       XLAT(PACKET_HDRLEN),
 #endif
-       { 0,                            NULL                    },
+#if defined(PACKET_RESERVE)
+       XLAT(PACKET_RESERVE),
+#endif
+#if defined(PACKET_TX_RING)
+       XLAT(PACKET_TX_RING),
+#endif
+#if defined(PACKET_LOSS)
+       XLAT(PACKET_LOSS),
+#endif
+       XLAT_END
 };
 #endif /* SOL_PACKET */
 
-#if  !defined (SOL_TCP) && defined (IPPROTO_TCP)
+#ifdef SOL_SCTP
+static const struct xlat socksctpoptions[] = {
+#if defined(SCTP_RTOINFO)
+       XLAT(SCTP_RTOINFO),
+#endif
+#if defined(SCTP_ASSOCINFO)
+       XLAT(SCTP_ASSOCINFO),
+#endif
+#if defined(SCTP_INITMSG)
+       XLAT(SCTP_INITMSG),
+#endif
+#if defined(SCTP_NODELAY)
+       XLAT(SCTP_NODELAY),
+#endif
+#if defined(SCTP_AUTOCLOSE)
+       XLAT(SCTP_AUTOCLOSE),
+#endif
+#if defined(SCTP_SET_PEER_PRIMARY_ADDR)
+       XLAT(SCTP_SET_PEER_PRIMARY_ADDR),
+#endif
+#if defined(SCTP_PRIMARY_ADDR)
+       XLAT(SCTP_PRIMARY_ADDR),
+#endif
+#if defined(SCTP_ADAPTATION_LAYER)
+       XLAT(SCTP_ADAPTATION_LAYER),
+#endif
+#if defined(SCTP_DISABLE_FRAGMENTS)
+       XLAT(SCTP_DISABLE_FRAGMENTS),
+#endif
+#if defined(SCTP_PEER_ADDR_PARAMS)
+       XLAT(SCTP_PEER_ADDR_PARAMS),
+#endif
+#if defined(SCTP_DEFAULT_SEND_PARAM)
+       XLAT(SCTP_DEFAULT_SEND_PARAM),
+#endif
+#if defined(SCTP_EVENTS)
+       XLAT(SCTP_EVENTS),
+#endif
+#if defined(SCTP_I_WANT_MAPPED_V4_ADDR)
+       XLAT(SCTP_I_WANT_MAPPED_V4_ADDR),
+#endif
+#if defined(SCTP_MAXSEG)
+       XLAT(SCTP_MAXSEG),
+#endif
+#if defined(SCTP_STATUS)
+       XLAT(SCTP_STATUS),
+#endif
+#if defined(SCTP_GET_PEER_ADDR_INFO)
+       XLAT(SCTP_GET_PEER_ADDR_INFO),
+#endif
+#if defined(SCTP_DELAYED_ACK)
+       XLAT(SCTP_DELAYED_ACK),
+#endif
+#if defined(SCTP_CONTEXT)
+       XLAT(SCTP_CONTEXT),
+#endif
+#if defined(SCTP_FRAGMENT_INTERLEAVE)
+       XLAT(SCTP_FRAGMENT_INTERLEAVE),
+#endif
+#if defined(SCTP_PARTIAL_DELIVERY_POINT)
+       XLAT(SCTP_PARTIAL_DELIVERY_POINT),
+#endif
+#if defined(SCTP_MAX_BURST)
+       XLAT(SCTP_MAX_BURST),
+#endif
+#if defined(SCTP_AUTH_CHUNK)
+       XLAT(SCTP_AUTH_CHUNK),
+#endif
+#if defined(SCTP_HMAC_IDENT)
+       XLAT(SCTP_HMAC_IDENT),
+#endif
+#if defined(SCTP_AUTH_KEY)
+       XLAT(SCTP_AUTH_KEY),
+#endif
+#if defined(SCTP_AUTH_ACTIVE_KEY)
+       XLAT(SCTP_AUTH_ACTIVE_KEY),
+#endif
+#if defined(SCTP_AUTH_DELETE_KEY)
+       XLAT(SCTP_AUTH_DELETE_KEY),
+#endif
+#if defined(SCTP_PEER_AUTH_CHUNKS)
+       XLAT(SCTP_PEER_AUTH_CHUNKS),
+#endif
+#if defined(SCTP_LOCAL_AUTH_CHUNKS)
+       XLAT(SCTP_LOCAL_AUTH_CHUNKS),
+#endif
+#if defined(SCTP_GET_ASSOC_NUMBER)
+       XLAT(SCTP_GET_ASSOC_NUMBER),
+#endif
+
+       /* linux specific things */
+#if defined(SCTP_SOCKOPT_BINDX_ADD)
+       XLAT(SCTP_SOCKOPT_BINDX_ADD),
+#endif
+#if defined(SCTP_SOCKOPT_BINDX_REM)
+       XLAT(SCTP_SOCKOPT_BINDX_REM),
+#endif
+#if defined(SCTP_SOCKOPT_PEELOFF)
+       XLAT(SCTP_SOCKOPT_PEELOFF),
+#endif
+#if defined(SCTP_GET_PEER_ADDRS_NUM_OLD)
+       XLAT(SCTP_GET_PEER_ADDRS_NUM_OLD),
+#endif
+#if defined(SCTP_GET_PEER_ADDRS_OLD)
+       XLAT(SCTP_GET_PEER_ADDRS_OLD),
+#endif
+#if defined(SCTP_GET_LOCAL_ADDRS_NUM_OLD)
+       XLAT(SCTP_GET_LOCAL_ADDRS_NUM_OLD),
+#endif
+#if defined(SCTP_GET_LOCAL_ADDRS_OLD)
+       XLAT(SCTP_GET_LOCAL_ADDRS_OLD),
+#endif
+#if defined(SCTP_SOCKOPT_CONNECTX_OLD)
+       XLAT(SCTP_SOCKOPT_CONNECTX_OLD),
+#endif
+#if defined(SCTP_GET_PEER_ADDRS)
+       XLAT(SCTP_GET_PEER_ADDRS),
+#endif
+#if defined(SCTP_GET_LOCAL_ADDRS)
+       XLAT(SCTP_GET_LOCAL_ADDRS),
+#endif
+
+       XLAT_END
+};
+#endif
+
+#if !defined(SOL_TCP) && defined(IPPROTO_TCP)
 #define SOL_TCP IPPROTO_TCP
 #endif
 
 #ifdef SOL_TCP
-static struct xlat socktcpoptions[] = {
-       { TCP_NODELAY,          "TCP_NODELAY"   },
-       { TCP_MAXSEG,           "TCP_MAXSEG"    },
-#if defined(TCP_CORK)
-       { TCP_CORK,             "TCP_CORK"      },
+static const struct xlat socktcpoptions[] = {
+       XLAT(TCP_NODELAY),
+       XLAT(TCP_MAXSEG),
+#ifdef TCP_CORK
+       XLAT(TCP_CORK),
+#endif
+#ifdef TCP_KEEPIDLE
+       XLAT(TCP_KEEPIDLE),
+#endif
+#ifdef TCP_KEEPINTVL
+       XLAT(TCP_KEEPINTVL),
+#endif
+#ifdef TCP_KEEPCNT
+       XLAT(TCP_KEEPCNT),
+#endif
+#ifdef TCP_SYNCNT
+       XLAT(TCP_SYNCNT),
+#endif
+#ifdef TCP_LINGER2
+       XLAT(TCP_LINGER2),
+#endif
+#ifdef TCP_DEFER_ACCEPT
+       XLAT(TCP_DEFER_ACCEPT),
+#endif
+#ifdef TCP_WINDOW_CLAMP
+       XLAT(TCP_WINDOW_CLAMP),
+#endif
+#ifdef TCP_INFO
+       XLAT(TCP_INFO),
+#endif
+#ifdef TCP_QUICKACK
+       XLAT(TCP_QUICKACK),
 #endif
-#if defined(TCP_KEEPIDLE)
-       { TCP_KEEPIDLE,         "TCP_KEEPIDLE" },
+#ifdef TCP_CONGESTION
+       XLAT(TCP_CONGESTION),
 #endif
-#if defined(TCP_KEEPINTVL)
-       { TCP_KEEPINTVL,        "TCP_KEEPINTVL" },
+#ifdef TCP_MD5SIG
+       XLAT(TCP_MD5SIG),
 #endif
-#if defined(TCP_KEEPCNT)
-       { TCP_KEEPCNT,          "TCP_KEEPCNT" },
+#ifdef TCP_COOKIE_TRANSACTIONS
+       XLAT(TCP_COOKIE_TRANSACTIONS),
 #endif
-#if defined(TCP_NKEEP)
-       { TCP_NKEEP,            "TCP_NKEEP"     },
+#ifdef TCP_THIN_LINEAR_TIMEOUTS
+       XLAT(TCP_THIN_LINEAR_TIMEOUTS),
 #endif
-#if defined(TCP_SYNCNT)
-       { TCP_SYNCNT,           "TCP_SYNCNT" },
+#ifdef TCP_THIN_DUPACK
+       XLAT(TCP_THIN_DUPACK),
 #endif
-#if defined(TCP_LINGER2)
-       { TCP_LINGER2,          "TCP_LINGER2" },
+#ifdef TCP_USER_TIMEOUT
+       XLAT(TCP_USER_TIMEOUT),
 #endif
-#if defined(TCP_DEFER_ACCEPT)
-       { TCP_DEFER_ACCEPT,     "TCP_DEFER_ACCEPT" },
+#ifdef TCP_REPAIR
+       XLAT(TCP_REPAIR),
 #endif
-#if defined(TCP_WINDOW_CLAMP)
-       { TCP_WINDOW_CLAMP,     "TCP_WINDOW_CLAMP" },
+#ifdef TCP_REPAIR_QUEUE
+       XLAT(TCP_REPAIR_QUEUE),
 #endif
-#if defined(TCP_INFO)
-       { TCP_INFO,             "TCP_INFO" },
+#ifdef TCP_QUEUE_SEQ
+       XLAT(TCP_QUEUE_SEQ),
 #endif
-#if defined(TCP_QUICKACK)
-       { TCP_QUICKACK,         "TCP_QUICKACK" },
+#ifdef TCP_REPAIR_OPTIONS
+       XLAT(TCP_REPAIR_OPTIONS),
 #endif
-       { 0,                    NULL            },
+#ifdef TCP_FASTOPEN
+       XLAT(TCP_FASTOPEN),
+#endif
+#ifdef TCP_TIMESTAMP
+       XLAT(TCP_TIMESTAMP),
+#endif
+       XLAT_END
 };
 #endif /* SOL_TCP */
 
 #ifdef SOL_RAW
-static struct xlat icmpfilterflags[] = {
+static const struct xlat icmpfilterflags[] = {
 #if defined(ICMP_ECHOREPLY)
        { (1<<ICMP_ECHOREPLY),          "ICMP_ECHOREPLY"        },
 #endif
@@ -796,43 +1289,39 @@ static struct xlat icmpfilterflags[] = {
 #if defined(ICMP_ADDRESSREPLY)
        { (1<<ICMP_ADDRESSREPLY),       "ICMP_ADDRESSREPLY"     },
 #endif
-       { 0,                            NULL                    },
+       XLAT_END
 };
 #endif /* SOL_RAW */
 
 #if defined(AF_PACKET) /* from e.g. linux/if_packet.h */
-static struct xlat af_packet_types[] = {
+static const struct xlat af_packet_types[] = {
 #if defined(PACKET_HOST)
-       { PACKET_HOST,                  "PACKET_HOST"           },
+       XLAT(PACKET_HOST),
 #endif
 #if defined(PACKET_BROADCAST)
-       { PACKET_BROADCAST,             "PACKET_BROADCAST"      },
+       XLAT(PACKET_BROADCAST),
 #endif
 #if defined(PACKET_MULTICAST)
-       { PACKET_MULTICAST,             "PACKET_MULTICAST"      },
+       XLAT(PACKET_MULTICAST),
 #endif
 #if defined(PACKET_OTHERHOST)
-       { PACKET_OTHERHOST,             "PACKET_OTHERHOST"      },
+       XLAT(PACKET_OTHERHOST),
 #endif
 #if defined(PACKET_OUTGOING)
-       { PACKET_OUTGOING,              "PACKET_OUTGOING"       },
+       XLAT(PACKET_OUTGOING),
 #endif
 #if defined(PACKET_LOOPBACK)
-       { PACKET_LOOPBACK,              "PACKET_LOOPBACK"       },
+       XLAT(PACKET_LOOPBACK),
 #endif
 #if defined(PACKET_FASTROUTE)
-       { PACKET_FASTROUTE,             "PACKET_FASTROUTE"      },
+       XLAT(PACKET_FASTROUTE),
 #endif
-       { 0,                            NULL                    },
+       XLAT_END
 };
 #endif /* defined(AF_PACKET) */
 
-
 void
-printsock(tcp, addr, addrlen)
-struct tcb *tcp;
-long addr;
-int addrlen;
+printsock(struct tcb *tcp, long addr, int addrlen)
 {
        union {
                char pad[128];
@@ -842,7 +1331,7 @@ int addrlen;
 #ifdef HAVE_INET_NTOP
                struct sockaddr_in6 sa6;
 #endif
-#if defined(LINUX) && defined(AF_IPX)
+#if defined(AF_IPX)
                struct sockaddr_ipx sipx;
 #endif
 #ifdef AF_PACKET
@@ -855,33 +1344,38 @@ int addrlen;
        char string_addr[100];
 
        if (addr == 0) {
-               tprintf("NULL");
+               tprints("NULL");
                return;
        }
        if (!verbose(tcp)) {
                tprintf("%#lx", addr);
                return;
        }
-       if ((addrlen<2) || (addrlen>sizeof(addrbuf)))
-               addrlen=sizeof(addrbuf);
 
-       if (umoven(tcp, addr, addrlen, (char*)&addrbuf) < 0) {
-               tprintf("{...}");
+       if (addrlen < 2 || addrlen > sizeof(addrbuf))
+               addrlen = sizeof(addrbuf);
+
+       memset(&addrbuf, 0, sizeof(addrbuf));
+       if (umoven(tcp, addr, addrlen, addrbuf.pad) < 0) {
+               tprints("{...}");
                return;
        }
+       addrbuf.pad[sizeof(addrbuf.pad) - 1] = '\0';
 
-       tprintf("{sa_family=");
+       tprints("{sa_family=");
        printxval(addrfams, addrbuf.sa.sa_family, "AF_???");
-       tprintf(", ");
+       tprints(", ");
 
        switch (addrbuf.sa.sa_family) {
        case AF_UNIX:
-               if (addrlen==2) {
-                       tprintf("<nil>");
+               if (addrlen == 2) {
+                       tprints("NULL");
                } else if (addrbuf.sau.sun_path[0]) {
-                       tprintf("path=\"%-.*s\"", addrlen-2, addrbuf.sau.sun_path);
+                       tprints("sun_path=");
+                       printpathn(tcp, addr + 2, strlen(addrbuf.sau.sun_path));
                } else {
-                       tprintf("path=@%-.*s", addrlen-3, addrbuf.sau.sun_path+1);
+                       tprints("sun_path=@");
+                       printpathn(tcp, addr + 3, strlen(addrbuf.sau.sun_path + 1));
                }
                break;
        case AF_INET:
@@ -897,26 +1391,26 @@ int addrlen;
 #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];
+                       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 (if_indextoname(addrbuf.sa6.sin6_scope_id, scopebuf) == NULL)
+                                       numericscope++;
+                               else
+                                       tprintf(", sin6_scope_id=if_nametoindex(\"%s\")", scopebuf);
+                       } else
+                               numericscope++;
 
-                   if (numericscope)
+                       if (numericscope)
 #endif
-                       tprintf(", sin6_scope_id=%u", addrbuf.sa6.sin6_scope_id);
+                               tprintf(", sin6_scope_id=%u", addrbuf.sa6.sin6_scope_id);
                }
 #endif
-                   break;
+               break;
 #endif
-#if defined(AF_IPX) && defined(linux)
+#if defined(AF_IPX)
        case AF_IPX:
                {
                        int i;
@@ -929,12 +1423,12 @@ int addrlen;
                         * this way.. :)
                         */
                        tprintf("%08lx:", (unsigned long)ntohl(addrbuf.sipx.sipx_network));
-                       for (i = 0; i<IPX_NODE_LEN; i++)
+                       for (i = 0; i < IPX_NODE_LEN; i++)
                                tprintf("%02x", addrbuf.sipx.sipx_node[i]);
                        tprintf("/[%02x]", addrbuf.sipx.sipx_type);
                }
                break;
-#endif /* AF_IPX && linux */
+#endif /* AF_IPX */
 #ifdef AF_PACKET
        case AF_PACKET:
                {
@@ -946,12 +1440,12 @@ int addrlen;
                        tprintf(", addr(%d)={%d, ",
                                        addrbuf.ll.sll_halen,
                                        addrbuf.ll.sll_hatype);
-                       for (i=0; i<addrbuf.ll.sll_halen; i++)
+                       for (i = 0; i < addrbuf.ll.sll_halen; i++)
                                tprintf("%02x", addrbuf.ll.sll_addr[i]);
                }
                break;
 
-#endif /* AF_APACKET */
+#endif /* AF_PACKET */
 #ifdef AF_NETLINK
        case AF_NETLINK:
                tprintf("pid=%d, groups=%08x", addrbuf.nl.nl_pid, addrbuf.nl.nl_groups);
@@ -961,58 +1455,235 @@ int addrlen;
        AF_X25 AF_ROSE etc. still need to be done */
 
        default:
-               tprintf("sa_data=");
+               tprints("sa_data=");
                printstr(tcp, (long) &((struct sockaddr *) addr)->sa_data,
                        sizeof addrbuf.sa.sa_data);
                break;
        }
-       tprintf("}");
+       tprints("}");
+}
+
+#if HAVE_SENDMSG
+static const struct xlat scmvals[] = {
+#ifdef SCM_RIGHTS
+       XLAT(SCM_RIGHTS),
+#endif
+#ifdef SCM_CREDENTIALS
+       XLAT(SCM_CREDENTIALS),
+#endif
+       XLAT_END
+};
+
+static void
+printcmsghdr(struct tcb *tcp, unsigned long addr, unsigned long 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);
+               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);
+
+                       tprintf("{pid=%ld, uid=%ld, gid=%ld}}",
+                               (long)uc->pid, (long)uc->uid, (long)uc->gid);
+                       free(cmsg);
+                       return;
+               }
+       }
+       free(cmsg);
+       tprints(", ...}");
 }
 
-#if HAVE_SENDMSG
+static void
+do_msghdr(struct tcb *tcp, struct msghdr *msg, unsigned long data_size)
+{
+       tprintf("{msg_name(%d)=", msg->msg_namelen);
+       printsock(tcp, (long)msg->msg_name, msg->msg_namelen);
+
+       tprintf(", msg_iov(%lu)=", (unsigned long)msg->msg_iovlen);
+       tprint_iov_upto(tcp, (unsigned long)msg->msg_iovlen,
+                  (unsigned long)msg->msg_iov, 1, data_size);
+
+#ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
+       tprintf(", msg_controllen=%lu", (unsigned long)msg->msg_controllen);
+       if (msg->msg_controllen)
+               printcmsghdr(tcp, (unsigned long) msg->msg_control,
+                            msg->msg_controllen);
+       tprints(", msg_flags=");
+       printflags(msg_flags, msg->msg_flags, "MSG_???");
+#else /* !HAVE_STRUCT_MSGHDR_MSG_CONTROL */
+       tprintf("msg_accrights=%#lx, msg_accrightslen=%u",
+               (unsigned long) msg->msg_accrights, msg->msg_accrightslen);
+#endif /* !HAVE_STRUCT_MSGHDR_MSG_CONTROL */
+       tprints("}");
+}
+
+struct msghdr32 {
+       uint32_t /* void* */    msg_name;
+       uint32_t /* socklen_t */msg_namelen;
+       uint32_t /* iovec* */   msg_iov;
+       uint32_t /* size_t */   msg_iovlen;
+       uint32_t /* void* */    msg_control;
+       uint32_t /* size_t */   msg_controllen;
+       uint32_t /* int */      msg_flags;
+};
+struct mmsghdr32 {
+       struct msghdr32         msg_hdr;
+       uint32_t /* unsigned */ msg_len;
+};
 
 static void
-printmsghdr(tcp, addr)
-struct tcb *tcp;
-long addr;
+printmsghdr(struct tcb *tcp, long addr, unsigned long data_size)
 {
        struct msghdr msg;
 
+#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
+       if (current_wordsize == 4) {
+               struct msghdr32 msg32;
+
+               if (umove(tcp, addr, &msg32) < 0) {
+                       tprintf("%#lx", addr);
+                       return;
+               }
+               msg.msg_name       = (void*)(long)msg32.msg_name;
+               msg.msg_namelen    =              msg32.msg_namelen;
+               msg.msg_iov        = (void*)(long)msg32.msg_iov;
+               msg.msg_iovlen     =              msg32.msg_iovlen;
+               msg.msg_control    = (void*)(long)msg32.msg_control;
+               msg.msg_controllen =              msg32.msg_controllen;
+               msg.msg_flags      =              msg32.msg_flags;
+       } else
+#endif
        if (umove(tcp, addr, &msg) < 0) {
                tprintf("%#lx", addr);
                return;
        }
-       tprintf("{msg_name(%d)=", msg.msg_namelen);
-       printsock(tcp, (long)msg.msg_name, msg.msg_namelen);
+       do_msghdr(tcp, &msg, data_size);
+}
 
-       tprintf(", msg_iov(%lu)=", (unsigned long)msg.msg_iovlen);
-       tprint_iov(tcp, msg.msg_iovlen, (long) msg.msg_iov);
+static void
+printmmsghdr(struct tcb *tcp, long addr, unsigned int idx, unsigned long msg_len)
+{
+       struct mmsghdr {
+               struct msghdr msg_hdr;
+               unsigned msg_len;
+       } mmsg;
+
+#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
+       if (current_wordsize == 4) {
+               struct mmsghdr32 mmsg32;
+
+               addr += sizeof(mmsg32) * idx;
+               if (umove(tcp, addr, &mmsg32) < 0) {
+                       tprintf("%#lx", addr);
+                       return;
+               }
+               mmsg.msg_hdr.msg_name       = (void*)(long)mmsg32.msg_hdr.msg_name;
+               mmsg.msg_hdr.msg_namelen    =              mmsg32.msg_hdr.msg_namelen;
+               mmsg.msg_hdr.msg_iov        = (void*)(long)mmsg32.msg_hdr.msg_iov;
+               mmsg.msg_hdr.msg_iovlen     =              mmsg32.msg_hdr.msg_iovlen;
+               mmsg.msg_hdr.msg_control    = (void*)(long)mmsg32.msg_hdr.msg_control;
+               mmsg.msg_hdr.msg_controllen =              mmsg32.msg_hdr.msg_controllen;
+               mmsg.msg_hdr.msg_flags      =              mmsg32.msg_hdr.msg_flags;
+               mmsg.msg_len                =              mmsg32.msg_len;
+       } else
+#endif
+       {
+               addr += sizeof(mmsg) * idx;
+               if (umove(tcp, addr, &mmsg) < 0) {
+                       tprintf("%#lx", addr);
+                       return;
+               }
+       }
+       tprints("{");
+       do_msghdr(tcp, &mmsg.msg_hdr, msg_len ? msg_len : mmsg.msg_len);
+       tprintf(", %u}", mmsg.msg_len);
+}
 
-#ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
-       tprintf(", msg_controllen=%lu", (unsigned long)msg.msg_controllen);
-       if (msg.msg_controllen)
-               tprintf(", msg_control=%#lx, ", (unsigned long) msg.msg_control);
-       tprintf(", msg_flags=");
-       if (printflags(msg_flags, msg.msg_flags)==0)
-               tprintf("0");
-#else /* !HAVE_STRUCT_MSGHDR_MSG_CONTROL */
-       tprintf("msg_accrights=%#lx, msg_accrightslen=%u",
-               (unsigned long) msg.msg_accrights, msg.msg_accrightslen);
-#endif /* !HAVE_STRUCT_MSGHDR_MSG_CONTROL */
-       tprintf("}");
+static void
+decode_mmsg(struct tcb *tcp, unsigned long msg_len)
+{
+       /* mmsgvec */
+       if (syserror(tcp)) {
+               tprintf("%#lx", tcp->u_arg[1]);
+       } else {
+               unsigned int len = tcp->u_rval;
+               unsigned int i;
+
+               tprints("{");
+               for (i = 0; i < len; ++i) {
+                       if (i)
+                               tprints(", ");
+                       printmmsghdr(tcp, tcp->u_arg[1], i, msg_len);
+               }
+               tprints("}");
+       }
+       /* vlen */
+       tprintf(", %u, ", (unsigned int) tcp->u_arg[2]);
+       /* flags */
+       printflags(msg_flags, tcp->u_arg[3], "MSG_???");
 }
 
 #endif /* HAVE_SENDMSG */
 
+/*
+ * low bits of the socket type define real socket type,
+ * other bits are socket type flags.
+ */
+static void
+tprint_sock_type(struct tcb *tcp, int flags)
+{
+       const char *str = xlookup(socktypes, flags & SOCK_TYPE_MASK);
+
+       if (str) {
+               tprints(str);
+               flags &= ~SOCK_TYPE_MASK;
+               if (!flags)
+                       return;
+               tprints("|");
+       }
+       printflags(sock_type_flags, flags, "SOCK_???");
+}
+
 int
-sys_socket(tcp)
-struct tcb *tcp;
+sys_socket(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printxval(domains, tcp->u_arg[0], "PF_???");
-               tprintf(", ");
-               printxval(socktypes, tcp->u_arg[1], "SOCK_???");
-               tprintf(", ");
+               tprints(", ");
+               tprint_sock_type(tcp, tcp->u_arg[1]);
+               tprints(", ");
                switch (tcp->u_arg[0]) {
                case PF_INET:
 #ifdef PF_INET6
@@ -1023,9 +1694,9 @@ struct tcb *tcp;
 #ifdef PF_IPX
                case PF_IPX:
                        /* BTW: I don't believe this.. */
-                       tprintf("[");
+                       tprints("[");
                        printxval(domains, tcp->u_arg[2], "PF_???");
-                       tprintf("]");
+                       tprints("]");
                        break;
 #endif /* PF_IPX */
                default:
@@ -1037,38 +1708,11 @@ struct tcb *tcp;
 }
 
 int
-sys_so_socket(tcp)
-struct tcb *tcp;
-{
-       if (entering(tcp)) {
-               /* not sure really what these args are... but this
-                * is how truss prints it
-                */
-               tprintf("%ld, %ld, %ld, ",
-                 tcp->u_arg[0], tcp->u_arg[1], tcp->u_arg[2]);
-               printpath(tcp, tcp->u_arg[3]);
-               tprintf(", %ld", tcp->u_arg[4]);
-       }
-       return 0;
-}
-
-int
-sys_so_socketpair(tcp)
-struct tcb *tcp;
-{
-       if (entering(tcp)) {
-               /* not sure what this arg is */
-               tprintf("0x%lx", tcp->u_arg[0]);
-       }
-       return 0;
-}
-
-int
-sys_bind(tcp)
-struct tcb *tcp;
+sys_bind(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
                printsock(tcp, tcp->u_arg[1], tcp->u_arg[2]);
                tprintf(", %lu", tcp->u_arg[2]);
        }
@@ -1076,70 +1720,89 @@ struct tcb *tcp;
 }
 
 int
-sys_connect(tcp)
-struct tcb *tcp;
+sys_connect(struct tcb *tcp)
 {
        return sys_bind(tcp);
 }
 
 int
-sys_listen(tcp)
-struct tcb *tcp;
+sys_listen(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, %lu", tcp->u_arg[0], tcp->u_arg[1]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               tprintf("%lu", tcp->u_arg[1]);
        }
        return 0;
 }
 
-int
-sys_accept(tcp)
-struct tcb *tcp;
+static int
+do_accept(struct tcb *tcp, int flags_arg)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-       } else if (!tcp->u_arg[2])
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               return 0;
+       }
+       if (!tcp->u_arg[2])
                tprintf("%#lx, NULL", tcp->u_arg[1]);
        else {
-               if (tcp->u_arg[1] == 0 || syserror(tcp)) {
+               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], tcp->u_arg[2]);
+                       printsock(tcp, tcp->u_arg[1], len);
                }
-               tprintf(", ");
-               printnum(tcp, tcp->u_arg[2], "%lu");
+               tprints(", ");
+               printnum_int(tcp, tcp->u_arg[2], "%u");
+       }
+       if (flags_arg >= 0) {
+               tprints(", ");
+               printflags(sock_type_flags, tcp->u_arg[flags_arg],
+                          "SOCK_???");
        }
        return 0;
 }
 
 int
-sys_send(tcp)
-struct tcb *tcp;
+sys_accept(struct tcb *tcp)
+{
+       return do_accept(tcp, -1);
+}
+
+int
+sys_accept4(struct tcb *tcp)
+{
+       return do_accept(tcp, 3);
+}
+
+int
+sys_send(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[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 */
-               if (printflags(msg_flags, tcp->u_arg[3]) == 0)
-                       tprintf("0");
+               printflags(msg_flags, tcp->u_arg[3], "MSG_???");
        }
        return 0;
 }
 
 int
-sys_sendto(tcp)
-struct tcb *tcp;
+sys_sendto(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[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 */
-               if (printflags(msg_flags, tcp->u_arg[3]) == 0)
-                       tprintf("0");
+               printflags(msg_flags, tcp->u_arg[3], "MSG_???");
                /* to address */
-               tprintf(", ");
+               tprints(", ");
                printsock(tcp, tcp->u_arg[4], tcp->u_arg[5]);
                /* to length */
                tprintf(", %lu", tcp->u_arg[5]);
@@ -1150,16 +1813,34 @@ struct tcb *tcp;
 #ifdef HAVE_SENDMSG
 
 int
-sys_sendmsg(tcp)
-struct tcb *tcp;
+sys_sendmsg(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printmsghdr(tcp, tcp->u_arg[1]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               printmsghdr(tcp, tcp->u_arg[1], (unsigned long) -1L);
                /* flags */
-               tprintf(", ");
-               if (printflags(msg_flags, tcp->u_arg[2]) == 0)
-                       tprintf("0");
+               tprints(", ");
+               printflags(msg_flags, tcp->u_arg[2], "MSG_???");
+       }
+       return 0;
+}
+
+int
+sys_sendmmsg(struct tcb *tcp)
+{
+       if (entering(tcp)) {
+               /* sockfd */
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               if (!verbose(tcp)) {
+                       tprintf("%#lx, %u, ",
+                               tcp->u_arg[1], (unsigned int) tcp->u_arg[2]);
+                       printflags(msg_flags, tcp->u_arg[3], "MSG_???");
+               }
+       } else {
+               if (verbose(tcp))
+                       decode_mmsg(tcp, (unsigned long) -1L);
        }
        return 0;
 }
@@ -1167,11 +1848,11 @@ struct tcb *tcp;
 #endif /* HAVE_SENDMSG */
 
 int
-sys_recv(tcp)
-struct tcb *tcp;
+sys_recv(struct tcb *tcp)
 {
        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]);
@@ -1179,20 +1860,19 @@ struct tcb *tcp;
                        printstr(tcp, tcp->u_arg[1], tcp->u_rval);
 
                tprintf(", %lu, ", tcp->u_arg[2]);
-               if (printflags(msg_flags, tcp->u_arg[3]) == 0)
-                       tprintf("0");
+               printflags(msg_flags, tcp->u_arg[3], "MSG_???");
        }
        return 0;
 }
 
 int
-sys_recvfrom(tcp)
-struct tcb *tcp;
+sys_recvfrom(struct tcb *tcp)
 {
        int fromlen;
 
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
        } else {
                if (syserror(tcp)) {
                        tprintf("%#lx, %lu, %lu, %#lx, %#lx",
@@ -1205,25 +1885,24 @@ struct tcb *tcp;
                /* len */
                tprintf(", %lu, ", tcp->u_arg[2]);
                /* flags */
-               if (printflags(msg_flags, tcp->u_arg[3]) == 0)
-                       tprintf("0");
+               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)
-                               tprintf(", NULL");
+                               tprints(", NULL");
                        else
                                tprintf(", %#lx", tcp->u_arg[4]);
                        if (tcp->u_arg[5] == 0)
-                               tprintf(", NULL");
+                               tprints(", NULL");
                        else
                                tprintf(", %#lx", tcp->u_arg[5]);
                        return 0;
                }
                if (umove(tcp, tcp->u_arg[5], &fromlen) < 0) {
-                       tprintf(", {...}, [?]");
+                       tprints(", {...}, [?]");
                        return 0;
                }
-               tprintf(", ");
+               tprints(", ");
                printsock(tcp, tcp->u_arg[4], tcp->u_arg[5]);
                /* from length */
                tprintf(", [%u]", fromlen);
@@ -1234,99 +1913,150 @@ struct tcb *tcp;
 #ifdef HAVE_SENDMSG
 
 int
-sys_recvmsg(tcp)
-struct tcb *tcp;
+sys_recvmsg(struct tcb *tcp)
 {
        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]);
                else
-                       printmsghdr(tcp, tcp->u_arg[1]);
+                       printmsghdr(tcp, tcp->u_arg[1], tcp->u_rval);
                /* flags */
-               tprintf(", ");
-               if (printflags(msg_flags, tcp->u_arg[2]) == 0)
-                       tprintf("0");
+               tprints(", ");
+               printflags(msg_flags, tcp->u_arg[2], "MSG_???");
        }
        return 0;
 }
 
+int
+sys_recvmmsg(struct tcb *tcp)
+{
+       /* +5 chars are for "left " prefix */
+       static char str[5 + TIMESPEC_TEXT_BUFSIZE];
+
+       if (entering(tcp)) {
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               if (verbose(tcp)) {
+                       sprint_timespec(str, tcp, tcp->u_arg[4]);
+                       /* Abusing tcp->auxstr as temp storage.
+                        * Will be used and freed on syscall exit.
+                        */
+                       tcp->auxstr = strdup(str);
+               } else {
+                       tprintf("%#lx, %ld, ", tcp->u_arg[1], tcp->u_arg[2]);
+                       printflags(msg_flags, tcp->u_arg[3], "MSG_???");
+                       tprints(", ");
+                       print_timespec(tcp, tcp->u_arg[4]);
+               }
+               return 0;
+       } else {
+               if (verbose(tcp)) {
+                       decode_mmsg(tcp, 0);
+                       /* timeout on entrance */
+                       tprintf(", %s", tcp->auxstr ? tcp->auxstr : "{...}");
+                       free((void *) tcp->auxstr);
+                       tcp->auxstr = NULL;
+               }
+               if (syserror(tcp))
+                       return 0;
+               if (tcp->u_rval == 0) {
+                       tcp->auxstr = "Timeout";
+                       return RVAL_STR;
+               }
+               if (!verbose(tcp))
+                       return 0;
+               /* timeout on exit */
+               sprint_timespec(stpcpy(str, "left "), tcp, tcp->u_arg[4]);
+               tcp->auxstr = str;
+               return RVAL_STR;
+       }
+}
+
 #endif /* HAVE_SENDMSG */
 
+static const struct xlat shutdown_modes[] = {
+       { 0,    "SHUT_RD"       },
+       { 1,    "SHUT_WR"       },
+       { 2,    "SHUT_RDWR"     },
+       XLAT_END
+};
+
 int
-sys_shutdown(tcp)
-struct tcb *tcp;
+sys_shutdown(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, %ld", tcp->u_arg[0], tcp->u_arg[1]);
-               switch (tcp->u_arg[1]) {
-               case 0:
-                       tprintf("%s", " /* receive */");
-                       break;
-               case 1:
-                       tprintf("%s", " /* send */");
-                       break;
-               case 2:
-                       tprintf("%s", " /* send and receive */");
-                       break;
-               }
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               printxval(shutdown_modes, tcp->u_arg[1], "SHUT_???");
        }
        return 0;
 }
 
 int
-sys_getsockname(tcp)
-struct tcb *tcp;
+sys_getsockname(struct tcb *tcp)
 {
        return sys_accept(tcp);
 }
 
 int
-sys_getpeername(tcp)
-struct tcb *tcp;
+sys_getpeername(struct tcb *tcp)
 {
        return sys_accept(tcp);
 }
 
-int
-sys_pipe(tcp)
-struct tcb *tcp;
+static int
+do_pipe(struct tcb *tcp, int flags_arg)
 {
-
-#if defined(LINUX) && !defined(SPARC) && !defined(SPARC64) && !defined(SH) && !defined(IA64)
-       int fds[2];
-
        if (exiting(tcp)) {
                if (syserror(tcp)) {
                        tprintf("%#lx", tcp->u_arg[0]);
-                       return 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 (flags_arg >= 0) {
+                       tprints(", ");
+                       printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
                }
-               if (umoven(tcp, tcp->u_arg[0], sizeof fds, (char *) fds) < 0)
-                       tprintf("[...]");
-               else
-                       tprintf("[%u, %u]", fds[0], fds[1]);
        }
-#elif defined(SPARC) || defined(SPARC64) || defined(SH) || defined(SVR4) || defined(FREEBSD) || defined(IA64)
-       if (exiting(tcp))
-               tprintf("[%lu, %lu]", tcp->u_rval, getrval2(tcp));
-#endif
        return 0;
 }
 
 int
-sys_socketpair(tcp)
-struct tcb *tcp;
+sys_pipe(struct tcb *tcp)
+{
+       return do_pipe(tcp, -1);
+}
+
+int
+sys_pipe2(struct tcb *tcp)
+{
+       return do_pipe(tcp, 1);
+}
+
+int
+sys_socketpair(struct tcb *tcp)
 {
-#ifdef LINUX
        int fds[2];
-#endif
 
        if (entering(tcp)) {
                printxval(domains, tcp->u_arg[0], "PF_???");
-               tprintf(", ");
-               printxval(socktypes, tcp->u_arg[1], "SOCK_???");
-               tprintf(", ");
+               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_???");
@@ -1334,9 +2064,9 @@ struct tcb *tcp;
 #ifdef PF_IPX
                case PF_IPX:
                        /* BTW: I don't believe this.. */
-                       tprintf("[");
+                       tprints("[");
                        printxval(domains, tcp->u_arg[2], "PF_???");
-                       tprintf("]");
+                       tprints("]");
                        break;
 #endif /* PF_IPX */
                default:
@@ -1348,27 +2078,22 @@ struct tcb *tcp;
                        tprintf(", %#lx", tcp->u_arg[3]);
                        return 0;
                }
-#ifdef LINUX
                if (umoven(tcp, tcp->u_arg[3], sizeof fds, (char *) fds) < 0)
-                       tprintf(", [...]");
+                       tprints(", [...]");
                else
                        tprintf(", [%u, %u]", fds[0], fds[1]);
-#endif /* LINUX */
-#if defined(SUNOS4) || defined(SVR4) || defined(FREEBSD)
-               tprintf(", [%lu, %lu]", tcp->u_rval, getrval2(tcp));
-#endif /* SUNOS4 || SVR4 || FREEBSD */
        }
        return 0;
 }
 
 int
-sys_getsockopt(tcp)
-struct tcb *tcp;
+sys_getsockopt(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
                printxval(socketlayers, tcp->u_arg[1], "SOL_???");
-               tprint(", ");
+               tprints(", ");
                switch (tcp->u_arg[1]) {
                case SOL_SOCKET:
                        printxval(sockoptions, tcp->u_arg[2], "SO_???");
@@ -1378,6 +2103,11 @@ struct tcb *tcp;
                        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_???");
@@ -1393,6 +2123,11 @@ struct tcb *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
 
                /* SOL_AX25 SOL_ROSE SOL_ATALK SOL_NETROM SOL_UDP SOL_DECNET SOL_X25
                 * etc. still need work */
@@ -1400,10 +2135,11 @@ struct tcb *tcp;
                        tprintf("%lu", tcp->u_arg[2]);
                        break;
                }
+               tprints(", ");
        } else {
-               long len;
-               if (syserror(tcp) || umove (tcp, tcp->u_arg[4], &len) < 0) {
-                       tprintf("%#lx, %#lx",
+               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;
                }
@@ -1413,46 +2149,82 @@ struct tcb *tcp;
                        switch (tcp->u_arg[2]) {
 #ifdef SO_LINGER
                        case SO_LINGER:
-                               if (len == sizeof (struct linger)) {
+                               if (len == sizeof(struct linger)) {
                                        struct linger linger;
-                                       if (umove (tcp,
+                                       if (umove(tcp,
                                                   tcp->u_arg[3],
                                                   &linger) < 0)
                                                break;
-                                       tprintf("{onoff=%d, linger=%d}, "
-                                               "[%ld]",
+                                       tprintf("{onoff=%d, linger=%d}, "
+                                               "[%d]",
                                                linger.l_onoff,
                                                linger.l_linger,
                                                len);
                                        return 0;
                                }
                                break;
+#endif
+#ifdef SO_PEERCRED
+                       case SO_PEERCRED:
+                               if (len == sizeof(struct ucred)) {
+                                       struct ucred uc;
+                                       if (umove(tcp,
+                                                  tcp->u_arg[3],
+                                                  &uc) < 0)
+                                               break;
+                                       tprintf("{pid=%ld, uid=%ld, gid=%ld}, "
+                                               "[%d]",
+                                               (long)uc.pid,
+                                               (long)uc.uid,
+                                               (long)uc.gid,
+                                               len);
+                                       return 0;
+                               }
+                               break;
+#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;
                }
 
-               tprintf (", ");
-               if (len == sizeof (int)) {
-                       printnum(tcp, tcp->u_arg[3], "%ld");
+               if (len == sizeof(int)) {
+                       printnum_int(tcp, tcp->u_arg[3], "%d");
                }
                else {
-                       printstr (tcp, tcp->u_arg[3], len);
+                       printstr(tcp, tcp->u_arg[3], len);
                }
-               tprintf(", [%ld]", len);
+               tprintf(", [%d]", len);
        }
        return 0;
 }
 
 #if defined(ICMP_FILTER)
-static void printicmpfilter(tcp, addr)
-struct tcb *tcp;
-long addr;
+static void printicmpfilter(struct tcb *tcp, long addr)
 {
        struct icmp_filter      filter;
 
        if (!addr) {
-               tprintf("NULL");
+               tprints("NULL");
                return;
        }
        if (syserror(tcp) || !verbose(tcp)) {
@@ -1460,36 +2232,30 @@ long addr;
                return;
        }
        if (umove(tcp, addr, &filter) < 0) {
-               tprintf("{...}");
+               tprints("{...}");
                return;
        }
 
-       tprintf("~(");
-       if (printflags(icmpfilterflags, ~filter.data) == 0)
-               tprintf("0");
-       tprintf(")");
+       tprints("~(");
+       printflags(icmpfilterflags, ~filter.data, "ICMP_???");
+       tprints(")");
 }
 #endif /* ICMP_FILTER */
 
 static int
-printsockopt (tcp, level, name, addr, len)
-struct tcb *tcp;
-int level;
-int name;
-long addr;
-int len;
+printsockopt(struct tcb *tcp, int level, int name, long addr, int len)
 {
        printxval(socketlayers, level, "SOL_??");
-       tprint(", ");
+       tprints(", ");
        switch (level) {
-           case SOL_SOCKET:
+       case SOL_SOCKET:
                printxval(sockoptions, name, "SO_???");
                switch (name) {
 #if defined(SO_LINGER)
-                   case SO_LINGER:
-                       if (len == sizeof (struct linger)) {
+               case SO_LINGER:
+                       if (len == sizeof(struct linger)) {
                                struct linger linger;
-                               if (umove (tcp, addr, &linger) < 0)
+                               if (umove(tcp, addr, &linger) < 0)
                                        break;
                                tprintf(", {onoff=%d, linger=%d}",
                                        linger.l_onoff,
@@ -1501,35 +2267,67 @@ int len;
                }
                break;
 #ifdef SOL_IP
-           case SOL_IP:
+       case SOL_IP:
                printxval(sockipoptions, name, "IP_???");
                break;
 #endif
+#ifdef SOL_IPV6
+       case SOL_IPV6:
+               printxval(sockipv6options, name, "IPV6_???");
+               break;
+#endif
 #ifdef SOL_IPX
-           case SOL_IPX:
+       case SOL_IPX:
                printxval(sockipxoptions, name, "IPX_???");
                break;
 #endif
 #ifdef SOL_PACKET
-           case SOL_PACKET:
+       case SOL_PACKET:
                printxval(sockpacketoptions, name, "PACKET_???");
                /* TODO: decode packate_mreq for PACKET_*_MEMBERSHIP */
+               switch (name) {
+#ifdef PACKET_RX_RING
+               case PACKET_RX_RING:
+#endif
+#ifdef PACKET_TX_RING
+               case PACKET_TX_RING:
+#endif
+#if defined(PACKET_RX_RING) || defined(PACKET_TX_RING)
+                       if (len == sizeof(struct tpacket_req)) {
+                               struct tpacket_req req;
+                               if (umove(tcp, addr, &req) < 0)
+                                       break;
+                               tprintf(", {block_size=%u, block_nr=%u, frame_size=%u, frame_nr=%u}",
+                                       req.tp_block_size,
+                                       req.tp_block_nr,
+                                       req.tp_frame_size,
+                                       req.tp_frame_nr);
+                               return 0;
+                       }
+                       break;
+#endif /* PACKET_RX_RING || PACKET_TX_RING */
+               }
                break;
 #endif
 #ifdef SOL_TCP
-           case 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:
+       case SOL_RAW:
                printxval(sockrawoptions, name, "RAW_???");
                switch (name) {
 #if defined(ICMP_FILTER)
-                   case ICMP_FILTER:
-                       tprintf(", ");
-                       printicmpfilter(tcp, addr);
-                       return 0;
+                       case ICMP_FILTER:
+                               tprints(", ");
+                               printicmpfilter(tcp, addr);
+                               return 0;
 #endif
                }
                break;
@@ -1538,225 +2336,32 @@ int len;
                /* SOL_AX25 SOL_ATALK SOL_NETROM SOL_UDP SOL_DECNET SOL_X25
                 * etc. still need work  */
 
-           default:
+       default:
                tprintf("%u", name);
        }
 
        /* default arg printing */
 
-       tprint(", ");
+       tprints(", ");
 
-       if (len == sizeof (int)) {
-               printnum(tcp, addr, "%ld");
+       if (len == sizeof(int)) {
+               printnum_int(tcp, addr, "%d");
        }
        else {
-               printstr (tcp, addr, len);
+               printstr(tcp, addr, len);
        }
        return 0;
 }
 
-
-#ifdef HAVE_STRUCT_OPTHDR
-
-void
-print_sock_optmgmt (tcp, addr, len)
-struct tcb *tcp;
-long addr;
-int len;
-{
-       int c = 0;
-       struct opthdr hdr;
-
-       while (len >= (int) sizeof hdr) {
-               if (umove(tcp, addr, &hdr) < 0) break;
-               if (c++) {
-                       tprintf (", ");
-               }
-               else if (len > hdr.len + sizeof hdr) {
-                       tprintf ("[");
-               }
-               tprintf ("{");
-               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;
-               }
-               tprintf ("}");
-       }
-       if (len > 0) {
-               if (c++) tprintf (", ");
-               printstr (tcp, addr, len);
-       }
-       if (c > 1) tprintf ("]");
-}
-
-#endif
-
 int
-sys_setsockopt(tcp)
-struct tcb *tcp;
+sys_setsockopt(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printsockopt (tcp, tcp->u_arg[1], tcp->u_arg[2],
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               printsockopt(tcp, tcp->u_arg[1], tcp->u_arg[2],
                              tcp->u_arg[3], tcp->u_arg[4]);
                tprintf(", %lu", tcp->u_arg[4]);
        }
        return 0;
 }
-
-#if UNIXWARE >= 7
-
-static struct xlat sock_version[] = {
-       { __NETLIB_UW211_SVR4,  "UW211_SVR4" },
-       { __NETLIB_UW211_XPG4,  "UW211_XPG4" },
-       { __NETLIB_GEMINI_SVR4, "GEMINI_SVR4" },
-       { __NETLIB_GEMINI_XPG4, "GEMINI_XPG4" },
-       { __NETLIB_FP1_SVR4,    "FP1_SVR4" },
-       { __NETLIB_FP1_XPG4,    "FP1_XPG4" },
-       { 0,            NULL            },
-};
-
-
-int
-netlib_call(tcp, func)
-struct tcb *tcp;
-int (*func) ();
-{
-       if (entering(tcp)) {
-               int i;
-               printxval (sock_version, tcp->u_arg[0], "__NETLIB_???");
-               tprintf(", ");
-               --tcp->u_nargs;
-               for (i = 0; i < tcp->u_nargs; i++)
-                       tcp->u_arg[i] = tcp->u_arg[i + 1];
-               return func (tcp);
-
-       }
-
-       return func (tcp);
-}
-
-int
-sys_xsocket(tcp)
-struct tcb *tcp;
-{
-       return netlib_call (tcp, sys_socket);
-}
-
-int
-sys_xsocketpair(tcp)
-struct tcb *tcp;
-{
-       return netlib_call (tcp, sys_socketpair);
-}
-
-int
-sys_xbind(tcp)
-struct tcb *tcp;
-{
-       return netlib_call (tcp, sys_bind);
-}
-
-int
-sys_xconnect(tcp)
-struct tcb *tcp;
-{
-       return netlib_call (tcp, sys_connect);
-}
-
-int
-sys_xlisten(tcp)
-struct tcb *tcp;
-{
-       return netlib_call (tcp, sys_listen);
-}
-
-int
-sys_xaccept(tcp)
-struct tcb *tcp;
-{
-       return netlib_call (tcp, sys_accept);
-}
-
-int
-sys_xsendmsg(tcp)
-struct tcb *tcp;
-{
-       return netlib_call (tcp, sys_sendmsg);
-}
-
-int
-sys_xrecvmsg(tcp)
-struct tcb *tcp;
-{
-       return netlib_call (tcp, sys_recvmsg);
-}
-
-int
-sys_xgetsockaddr(tcp)
-struct tcb *tcp;
-{
-       if (entering(tcp)) {
-               printxval (sock_version, tcp->u_arg[0], "__NETLIB_???");
-               tprintf(", ");
-               if (tcp->u_arg[1] == 0) {
-                       tprintf ("LOCALNAME, ");
-               }
-               else if (tcp->u_arg[1] == 1) {
-                       tprintf ("REMOTENAME, ");
-               }
-               else {
-                       tprintf ("%ld, ", tcp->u_arg [1]);
-               }
-               tprintf ("%ld, ", tcp->u_arg [2]);
-       }
-       else {
-               if (tcp->u_arg[3] == 0 || syserror(tcp)) {
-                       tprintf("%#lx", tcp->u_arg[3]);
-               } else {
-                       printsock(tcp, tcp->u_arg[3], tcp->u_arg[4]);
-               }
-               tprintf(", ");
-               printnum(tcp, tcp->u_arg[4], "%lu");
-       }
-
-       return 0;
-
-}
-
-#if 0
-
-int
-sys_xsetsockaddr(tcp)
-struct tcb *tcp;
-{
-       return netlib_call (tcp, sys_setsockaddr);
-}
-
-#endif
-
-int
-sys_xgetsockopt(tcp)
-struct tcb *tcp;
-{
-       return netlib_call (tcp, sys_getsockopt);
-}
-
-int
-sys_xsetsockopt(tcp)
-struct tcb *tcp;
-{
-       return netlib_call (tcp, sys_setsockopt);
-}
-
-int
-sys_xshutdown(tcp)
-struct tcb *tcp;
-{
-       return netlib_call (tcp, sys_shutdown);
-}
-
-#endif