]> granicus.if.org Git - strace/blobdiff - net.c
tests: add a test for -yy option
[strace] / net.c
diff --git a/net.c b/net.c
index 5a79381b676f2905352aa944ed474c8eaf017d18..46c491f8f6d78763c90f8fdcf20842d418c1dbae 100644 (file)
--- a/net.c
+++ b/net.c
 #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(__GLIBC__) && defined(HAVE_SIN6_SCOPE_ID_LINUX)
 # if defined(HAVE_LINUX_IN6_H)
 #  if defined(HAVE_SIN6_SCOPE_ID_LINUX)
 #   undef in6_addr
 # define PF_UNSPEC AF_UNSPEC
 #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/domains.h"
+#include "xlat/addrfams.h"
+#include "xlat/socktypes.h"
+#include "xlat/sock_type_flags.h"
 #ifndef SOCK_TYPE_MASK
 # define SOCK_TYPE_MASK 0xf
 #endif
-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. */
-};
+#include "xlat/socketlayers.h"
 /*** 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                    },
-};
+     falls into "inet_protocols" array below!!!!   This is intended!!! ***/
+#include "xlat/inet_protocols.h"
 
-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"        },
+#ifdef PF_NETLINK
+#include "xlat/netlink_protocols.h"
 #endif
-       { 0,            NULL            },
-};
+
+#include "xlat/msg_flags.h"
+#include "xlat/sockoptions.h"
 
 #if !defined(SOL_IP) && defined(IPPROTO_IP)
 #define SOL_IP IPPROTO_IP
 #endif
 
 #ifdef SOL_IP
-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"           },
-#endif
-       { 0,                    NULL                    },
-};
+#include "xlat/sockipoptions.h"
 #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"          },
-#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                    },
-};
+#include "xlat/sockipv6options.h"
 #endif /* SOL_IPV6 */
 
 #ifdef SOL_IPX
-static const struct xlat sockipxoptions[] = {
-       { IPX_TYPE,     "IPX_TYPE"      },
-       { 0,            NULL            },
-};
+#include "xlat/sockipxoptions.h"
 #endif /* SOL_IPX */
 
 #ifdef SOL_RAW
-static const struct xlat sockrawoptions[] = {
-#if defined(ICMP_FILTER)
-       { ICMP_FILTER,          "ICMP_FILTER"   },
-#endif
-       { 0,                    NULL            },
-};
+#include "xlat/sockrawoptions.h"
 #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                    },
-};
+#include "xlat/sockpacketoptions.h"
 #endif /* SOL_PACKET */
 
 #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" },
-#endif
-
-       /* 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"      },
-#endif
-#if defined(SCTP_SOCKOPT_CONNECTX_OLD)
-       { SCTP_SOCKOPT_CONNECTX_OLD,    "SCTP_SOCKOPT_CONNECTX_OLD"     },
-#endif
-#if defined(SCTP_GET_PEER_ADDRS)
-       { SCTP_GET_PEER_ADDRS,          "SCTP_GET_PEER_ADDRS"           },
-#endif
-#if defined(SCTP_GET_LOCAL_ADDRS)
-       { SCTP_GET_LOCAL_ADDRS,         "SCTP_GET_LOCAL_ADDRS"          },
-#endif
-
-       { 0,    NULL    },
-};
+#include "xlat/socksctpoptions.h"
 #endif
 
 #if !defined(SOL_TCP) && defined(IPPROTO_TCP)
@@ -1069,134 +146,15 @@ static const struct xlat socksctpoptions[] = {
 #endif
 
 #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" },
-#endif
-       { 0,                    NULL            },
-};
+#include "xlat/socktcpoptions.h"
 #endif /* SOL_TCP */
 
 #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                    },
-};
+#include "xlat/icmpfilterflags.h"
 #endif /* SOL_RAW */
 
 #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                    },
-};
+#include "xlat/af_packet_types.h"
 #endif /* defined(AF_PACKET) */
 
 void
@@ -1231,7 +189,7 @@ printsock(struct tcb *tcp, long addr, int addrlen)
                return;
        }
 
-       if (addrlen < 2 || addrlen > sizeof(addrbuf))
+       if (addrlen < 2 || addrlen > (int) sizeof(addrbuf))
                addrlen = sizeof(addrbuf);
 
        memset(&addrbuf, 0, sizeof(addrbuf));
@@ -1315,7 +273,7 @@ printsock(struct tcb *tcp, long addr, int addrlen)
                        tprintf("proto=%#04x, if%d, pkttype=",
                                        ntohs(addrbuf.ll.sll_protocol),
                                        addrbuf.ll.sll_ifindex);
-                       printxval(af_packet_types, addrbuf.ll.sll_pkttype, "?");
+                       printxval(af_packet_types, addrbuf.ll.sll_pkttype, "PACKET_???");
                        tprintf(", addr(%d)={%d, ",
                                        addrbuf.ll.sll_halen,
                                        addrbuf.ll.sll_hatype);
@@ -1343,15 +301,7 @@ printsock(struct tcb *tcp, long addr, int addrlen)
 }
 
 #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                    }
-};
+#include "xlat/scmvals.h"
 
 static void
 printcmsghdr(struct tcb *tcp, unsigned long addr, unsigned long len)
@@ -1383,7 +333,7 @@ printcmsghdr(struct tcb *tcp, unsigned long addr, unsigned long len)
                        while ((char *) fds < ((char *) cmsg + cmsg_len)) {
                                if (!first)
                                        tprints(", ");
-                               tprintf("%d", *fds++);
+                               printfd(tcp, *fds++);
                                first = 0;
                        }
                        tprints("}}");
@@ -1405,14 +355,14 @@ printcmsghdr(struct tcb *tcp, unsigned long addr, unsigned long len)
 }
 
 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,38 +378,90 @@ 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;
+};
+
 static void
-printmsghdr(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;
        }
-       do_msghdr(tcp, &msg);
+       do_msghdr(tcp, &msg, data_size);
 }
 
 static void
-printmmsghdr(struct tcb *tcp, long addr, unsigned int idx)
+printmmsghdr(struct tcb *tcp, long addr, unsigned int idx, unsigned long msg_len)
 {
        struct mmsghdr {
                struct msghdr msg_hdr;
                unsigned msg_len;
        } mmsg;
 
-       addr += sizeof(mmsg) * idx;
-       if (umove(tcp, addr, &mmsg) < 0) {
-               tprintf("%#lx", addr);
-               return;
+#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);
+       do_msghdr(tcp, &mmsg.msg_hdr, msg_len ? msg_len : mmsg.msg_len);
        tprintf(", %u}", mmsg.msg_len);
 }
 
 static void
-decode_mmsg(struct tcb *tcp)
+decode_mmsg(struct tcb *tcp, unsigned long msg_len)
 {
        /* mmsgvec */
        if (syserror(tcp)) {
@@ -1472,7 +474,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("}");
        }
@@ -1489,7 +491,7 @@ decode_mmsg(struct tcb *tcp)
  * other bits are socket type flags.
  */
 static void
-tprint_sock_type(struct tcb *tcp, int flags)
+tprint_sock_type(int flags)
 {
        const char *str = xlookup(socktypes, flags & SOCK_TYPE_MASK);
 
@@ -1509,14 +511,14 @@ sys_socket(struct tcb *tcp)
        if (entering(tcp)) {
                printxval(domains, tcp->u_arg[0], "PF_???");
                tprints(", ");
-               tprint_sock_type(tcp, tcp->u_arg[1]);
+               tprint_sock_type(tcp->u_arg[1]);
                tprints(", ");
                switch (tcp->u_arg[0]) {
                case PF_INET:
 #ifdef PF_INET6
                case PF_INET6:
 #endif
-                       printxval(protocols, tcp->u_arg[2], "IPPROTO_???");
+                       printxval(inet_protocols, tcp->u_arg[2], "IPPROTO_???");
                        break;
 #ifdef PF_IPX
                case PF_IPX:
@@ -1526,6 +528,11 @@ sys_socket(struct tcb *tcp)
                        tprints("]");
                        break;
 #endif /* PF_IPX */
+#ifdef PF_NETLINK
+               case PF_NETLINK:
+                       printxval(netlink_protocols, tcp->u_arg[2], "NETLINK_???");
+                       break;
+#endif
                default:
                        tprintf("%lu", tcp->u_arg[2]);
                        break;
@@ -1538,7 +545,8 @@ int
 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]);
        }
@@ -1555,16 +563,19 @@ int
 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;
 }
 
 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])
@@ -1591,20 +602,23 @@ do_accept(struct tcb *tcp, int flags_arg)
 int
 sys_accept(struct tcb *tcp)
 {
-       return do_accept(tcp, -1);
+       do_sockname(tcp, -1);
+       return RVAL_FD;
 }
 
 int
 sys_accept4(struct tcb *tcp)
 {
-       return do_accept(tcp, 3);
+       do_sockname(tcp, 3);
+       return RVAL_FD;
 }
 
 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 */
@@ -1617,7 +631,8 @@ int
 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 */
@@ -1637,8 +652,9 @@ int
 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 */
                tprints(", ");
                printflags(msg_flags, tcp->u_arg[2], "MSG_???");
@@ -1651,7 +667,8 @@ sys_sendmmsg(struct tcb *tcp)
 {
        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,7 +676,7 @@ sys_sendmmsg(struct tcb *tcp)
                }
        } else {
                if (verbose(tcp))
-                       decode_mmsg(tcp);
+                       decode_mmsg(tcp, (unsigned long) -1L);
        }
        return 0;
 }
@@ -1670,7 +687,8 @@ int
 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]);
@@ -1689,7 +707,8 @@ 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",
@@ -1733,12 +752,13 @@ int
 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 */
                tprints(", ");
                printflags(msg_flags, tcp->u_arg[2], "MSG_???");
@@ -1753,7 +773,8 @@ sys_recvmmsg(struct tcb *tcp)
        static char str[5 + 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.
@@ -1769,7 +790,7 @@ sys_recvmmsg(struct tcb *tcp)
                return 0;
        } else {
                if (verbose(tcp)) {
-                       decode_mmsg(tcp);
+                       decode_mmsg(tcp, 0);
                        /* timeout on entrance */
                        tprintf(", %s", tcp->auxstr ? tcp->auxstr : "{...}");
                        free((void *) tcp->auxstr);
@@ -1792,18 +813,14 @@ sys_recvmmsg(struct tcb *tcp)
 
 #endif /* HAVE_SENDMSG */
 
-static const struct xlat shutdown_modes[] = {
-       { 0,    "SHUT_RD"       },
-       { 1,    "SHUT_WR"       },
-       { 2,    "SHUT_RDWR"     },
-       { 0,    NULL            }
-};
+#include "xlat/shutdown_modes.h"
 
 int
 sys_shutdown(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
                printxval(shutdown_modes, tcp->u_arg[1], "SHUT_???");
        }
        return 0;
@@ -1812,13 +829,13 @@ sys_shutdown(struct tcb *tcp)
 int
 sys_getsockname(struct tcb *tcp)
 {
-       return sys_accept(tcp);
+       return do_sockname(tcp, -1);
 }
 
 int
 sys_getpeername(struct tcb *tcp)
 {
-       return sys_accept(tcp);
+       return do_sockname(tcp, -1);
 }
 
 static int
@@ -1869,24 +886,8 @@ sys_socketpair(struct tcb *tcp)
        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:
-                       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]);
@@ -1904,7 +905,8 @@ int
 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_???");
                tprints(", ");
                switch (tcp->u_arg[1]) {
@@ -2061,11 +1063,11 @@ printsockopt(struct tcb *tcp, int level, int name, long addr, int len)
        printxval(socketlayers, level, "SOL_??");
        tprints(", ");
        switch (level) {
-           case SOL_SOCKET:
+       case SOL_SOCKET:
                printxval(sockoptions, name, "SO_???");
                switch (name) {
 #if defined(SO_LINGER)
-                   case SO_LINGER:
+               case SO_LINGER:
                        if (len == sizeof(struct linger)) {
                                struct linger linger;
                                if (umove(tcp, addr, &linger) < 0)
@@ -2080,30 +1082,30 @@ printsockopt(struct tcb *tcp, int level, int name, long addr, int len)
                }
                break;
 #ifdef SOL_IP
-           case SOL_IP:
+       case SOL_IP:
                printxval(sockipoptions, name, "IP_???");
                break;
 #endif
 #ifdef SOL_IPV6
-           case 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:
+               case PACKET_RX_RING:
 #endif
 #ifdef PACKET_TX_RING
-                   case PACKET_TX_RING:
+               case PACKET_TX_RING:
 #endif
 #if defined(PACKET_RX_RING) || defined(PACKET_TX_RING)
                        if (len == sizeof(struct tpacket_req)) {
@@ -2123,17 +1125,17 @@ printsockopt(struct tcb *tcp, int level, int name, long addr, int len)
                break;
 #endif
 #ifdef SOL_TCP
-           case SOL_TCP:
+       case SOL_TCP:
                printxval(socktcpoptions, name, "TCP_???");
                break;
 #endif
 #ifdef SOL_SCTP
-          case 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)
@@ -2149,7 +1151,7 @@ printsockopt(struct tcb *tcp, int level, int name, long addr, int len)
                /* SOL_AX25 SOL_ATALK SOL_NETROM SOL_UDP SOL_DECNET SOL_X25
                 * etc. still need work  */
 
-           default:
+       default:
                tprintf("%u", name);
        }
 
@@ -2166,46 +1168,12 @@ printsockopt(struct tcb *tcp, int level, int name, long addr, int len)
        return 0;
 }
 
-#ifdef HAVE_STRUCT_OPTHDR
-
-void
-print_sock_optmgmt(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++) {
-                       tprints(", ");
-               }
-               else if (len > hdr.len + sizeof hdr) {
-                       tprints("[");
-               }
-               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;
-               }
-               tprints("}");
-       }
-       if (len > 0) {
-               if (c++) tprints(", ");
-               printstr(tcp, addr, len);
-       }
-       if (c > 1) tprints("]");
-}
-
-#endif
-
 int
 sys_setsockopt(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               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]);