]> granicus.if.org Git - strace/blobdiff - net.c
2003-06-09 Roland McGrath <roland@redhat.com>
[strace] / net.c
diff --git a/net.c b/net.c
index c6aad71e3181e97ee4689ade278a8f7841146741..b136b42cf1c9efa92b8dbe287611ddb707db2ffa 100644 (file)
--- a/net.c
+++ b/net.c
@@ -2,6 +2,7 @@
  * Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
  * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
  * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
+ * Copyright (c) 1996-2000 Wichert Akkerman <wichert@cistron.nl>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 #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
+#endif
+
 #include <netinet/in.h>
+#ifdef HAVE_NETINET_TCP_H
+#include <netinet/tcp.h>
+#endif
+#ifdef HAVE_NETINET_UDP_H
+#include <netinet/udp.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)
 #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
+#endif
+
+#if defined(HAVE_SYS_UIO_H)
+#include <sys/uio.h>
+#endif
+
+#if defined(HAVE_LINUX_NETLINK_H)
+#include <linux/netlink.h>
+#endif
+
+#if defined(HAVE_LINUX_IF_PACKET_H)
+#include <linux/if_packet.h>
+#endif
+
+#if defined(HAVE_LINUX_ICMP_H)
+#include <linux/icmp.h>
+#endif
+
 #ifndef PF_UNSPEC
 #define PF_UNSPEC AF_UNSPEC
 #endif
 
+#if UNIXWARE >= 7
+#define HAVE_SENDMSG           1               /* HACK - *FIXME* */
+#endif
+
 #ifdef LINUX
 /* Under Linux these are enums so we can't test for them with ifdef. */
 #define IPPROTO_EGP IPPROTO_EGP
@@ -63,6 +120,21 @@ static struct xlat domains[] = {
        { PF_UNSPEC,    "PF_UNSPEC"     },
        { PF_UNIX,      "PF_UNIX"       },
        { PF_INET,      "PF_INET"       },
+#ifdef PF_NETLINK
+       { PF_NETLINK,   "PF_NETLINK"    },
+#endif
+#ifdef PF_PACKET
+       { PF_PACKET,    "PF_PACKET"     },
+#endif
+#ifdef PF_INET6
+       { PF_INET6,     "PF_INET6"      },
+#endif
+#ifdef PF_ATMSVC
+       { PF_ATMSVC,    "PF_INET6"      },
+#endif
+#ifdef PF_INET6
+       { PF_INET6,     "PF_INET6"      },
+#endif
 #ifdef PF_LOCAL
        { PF_LOCAL,     "PS_LOCAL"      },
 #endif
@@ -90,9 +162,6 @@ static struct xlat domains[] = {
 #ifdef PF_X25
        { PF_X25,       "PF_X25"        },
 #endif
-#ifdef PF_INET6
-       { PF_INET6,     "PF_INET6"      },
-#endif
 #ifdef PF_ROSE
        { PF_ROSE,      "PF_ROSE"       },
 #endif
@@ -107,6 +176,31 @@ static struct xlat domains[] = {
 #endif
        { 0,            NULL            },
 };
+static struct xlat addrfams[] = {
+       { AF_UNSPEC,    "AF_UNSPEC"     },
+       { AF_UNIX,      "AF_UNIX"       },
+       { AF_INET,      "AF_INET"       },
+#ifdef AF_INET6
+       { AF_INET6,     "AF_INET6"      },
+#endif
+       { AF_DECnet,    "AF_DECnet"     },
+#ifdef PF_ATMSVC
+       { AF_ATMSVC,    "AF_ATMSVC"     },
+#endif
+#ifdef AF_PACKET
+       { AF_PACKET,    "AF_PACKET"     },
+#endif
+#ifdef AF_NETLINK
+       { AF_NETLINK,   "AF_NETLINK"    },
+#endif
+#ifdef AF_ISO
+       { AF_ISO,       "AF_ISO"        },
+#endif
+#ifdef AF_IMPLINK
+       { AF_IMPLINK,   "AF_IMPLINK"    },
+#endif
+       { 0,            NULL            },
+};
 static struct xlat socktypes[] = {
        { SOCK_STREAM,  "SOCK_STREAM"   },
        { SOCK_DGRAM,   "SOCK_DGRAM"    },
@@ -124,6 +218,68 @@ static struct xlat socktypes[] = {
 #endif
        { 0,            NULL            },
 };
+static 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_RAW)
+       { SOL_RAW,      "SOL_RAW"       },
+#endif
+#if defined(SOL_IPX)
+       { SOL_IPX,      "SOL_IPX"       },
+#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
+       { SOL_SOCKET,   "SOL_SOCKET"    },      /* Never used! */
+};
+/*** 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"  },
@@ -186,11 +342,35 @@ static struct xlat msg_flags[] = {
 #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
        { 0,            NULL            },
 };
 
 static struct xlat sockoptions[] = {
+#ifdef SO_PEERCRED
+       { SO_PEERCRED,  "SO_PEERCRED"   },
+#endif
+#ifdef SO_PASSCRED
+       { SO_PASSCRED,  "SO_PASSCRED"   },
+#endif
 #ifdef SO_DEBUG
        { SO_DEBUG,     "SO_DEBUG"      },
 #endif
@@ -254,37 +434,118 @@ static struct xlat sockoptions[] = {
 #ifdef SO_REUSEPORT
        { SO_REUSEPORT, "SO_REUSEPORT"  },
 #endif
-#ifdef SO_RCVLOWAT
-       { SO_RCVLOWAT, "SO_RCVLOWAT"    },
+#ifdef SO_ORDREL
+       { SO_ORDREL,    "SO_ORDREL"     },
 #endif
-#ifdef SO_SNDLOWAT
-       { SO_SNDLOWAT, "SO_SNDLOWAT"    },
+#ifdef SO_IMASOCKET
+       { SO_IMASOCKET, "SO_IMASOCKET"  },
 #endif
-#ifdef SO_RCVTIMEO
-       { SO_RCVTIMEO, "SO_RCVTIMEO"    },
+#ifdef SO_MGMT
+       { SO_MGMT,      "SO_MGMT"       },
 #endif
-#ifdef SO_SNDTIMEO
-       { SO_SNDTIMEO, "SO_SNDTIMEO"    },
+#ifdef SO_LISTENING
+       { SO_LISTENING, "SO_LISTENING"  },
+#endif
+#ifdef SO_RDWR
+       { SO_RDWR,      "SO_RDWR"       },
+#endif
+#ifdef SO_SEMA
+       { SO_SEMA,      "SO_SEMA"       },
+#endif
+#ifdef SO_PARALLELSVR
+       { SO_PARALLELSVR,"SO_PARALLELSVR"},
+#endif
+#ifdef SO_PROTOTYPE
+       { SO_PROTOTYPE, "SO_PROTOTYPE"  },
+#endif
+#ifdef SO_ALLRAW
+       { SO_ALLRAW,    "SO_ALLRAW"     },
+#endif
+#ifdef SO_ICS
+       { SO_ICS,       "SO_ICS"        },
 #endif
        { 0,            NULL            },
 };
 
+#if !defined (SOL_IP) && defined (IPPROTO_IP)
+#define SOL_IP IPPROTO_IP
+#endif
+
 #ifdef SOL_IP
 static struct xlat sockipoptions[] = {
-       { IP_TOS,       "IP_TOS"        },
-       { IP_TTL,       "IP_TTL"        },
-#if defined(IP_HDRINCL)
-       { IP_HDRINCL,   "IP_HDRINCL"    },
-#endif
-#if defined(IP_OPTIONS)
-       { IP_OPTIONS,   "IP_OPTIONS"    },
-#endif
-       { IP_MULTICAST_IF,      "IP_MULTICAST_IF"       },
-       { IP_MULTICAST_TTL,     "IP_MULTICAST_TTL"      },
-       { IP_MULTICAST_LOOP,    "IP_MULTICAST_LOOP"     },
-       { IP_ADD_MEMBERSHIP,    "IP_ADD_MEMBERSHIP"     },
-       { IP_DROP_MEMBERSHIP,   "IP_DROP_MEMBERSHIP"    },
-       { 0,            NULL            },
+#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_RECRECVTTL"         },
+#endif
+#ifdef IP_RECVTOS
+       { IP_RECVTOS,           "IP_RECRECVTOS"         },
+#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
+       { 0,                    NULL                    },
 };
 #endif /* SOL_IP */
 
@@ -295,25 +556,175 @@ static struct xlat sockipxoptions[] = {
 };
 #endif /* SOL_IPX */
 
+#ifdef SOL_RAW
+static struct xlat sockrawoptions[] = {
+#if defined(ICMP_FILTER)
+       { ICMP_FILTER,          "ICMP_FILTER"   },
+#endif
+       { 0,                    NULL            },
+};
+#endif /* SOL_RAW */
+
+#ifdef SOL_PACKET
+static struct xlat sockpacketoptions[] = {
+       { PACKET_ADD_MEMBERSHIP,        "PACKET_ADD_MEMBERSHIP" },
+       { PACKET_DROP_MEMBERSHIP,       "PACKET_DROP_MEMBERSHIP"},
+#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
+       { 0,                            NULL                    },
+};
+#endif /* SOL_PACKET */
+
+#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"    },
-       { 0,            NULL            },
+       { 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
+       { 0,                    NULL            },
 };
 #endif /* SOL_TCP */
 
+#ifdef SOL_RAW
+static struct xlat icmpfilterflags[] = {
+#if defined(ICMP_ECHOREPLY)
+       { (1<<ICMP_ECHOREPLY),          "ICMP_ECHOREPLY"        },
+#endif
+#if defined(ICMP_DEST_UNREACH)
+       { (1<<ICMP_DEST_UNREACH),       "ICMP_DEST_UNREACH"     },
+#endif
+#if defined(ICMP_SOURCE_QUENCH)
+       { (1<<ICMP_SOURCE_QUENCH),      "ICMP_SOURCE_QUENCH"    },
+#endif
+#if defined(ICMP_REDIRECT)
+       { (1<<ICMP_REDIRECT),           "ICMP_REDIRECT"         },
+#endif
+#if defined(ICMP_ECHO)
+       { (1<<ICMP_ECHO),               "ICMP_ECHO"             },
+#endif
+#if defined(ICMP_TIME_EXCEEDED)
+       { (1<<ICMP_TIME_EXCEEDED),      "ICMP_TIME_EXCEEDED"    },
+#endif
+#if defined(ICMP_PARAMETERPROB)
+       { (1<<ICMP_PARAMETERPROB),      "ICMP_PARAMETERPROB"    },
+#endif
+#if defined(ICMP_TIMESTAMP)
+       { (1<<ICMP_TIMESTAMP),          "ICMP_TIMESTAMP"        },
+#endif
+#if defined(ICMP_TIMESTAMPREPLY)
+       { (1<<ICMP_TIMESTAMPREPLY),     "ICMP_TIMESTAMPREPLY"   },
+#endif
+#if defined(ICMP_INFO_REQUEST)
+       { (1<<ICMP_INFO_REQUEST),       "ICMP_INFO_REQUEST"     },
+#endif
+#if defined(ICMP_INFO_REPLY)
+       { (1<<ICMP_INFO_REPLY),         "ICMP_INFO_REPLY"       },
+#endif
+#if defined(ICMP_ADDRESS)
+       { (1<<ICMP_ADDRESS),            "ICMP_ADDRESS"          },
+#endif
+#if defined(ICMP_ADDRESSREPLY)
+       { (1<<ICMP_ADDRESSREPLY),       "ICMP_ADDRESSREPLY"     },
+#endif
+       { 0,                            NULL                    },
+};
+#endif /* SOL_RAW */
+
+#if defined(AF_PACKET) /* from e.g. linux/if_packet.h */
+static struct xlat af_packet_types[] = {
+#if defined(PACKET_HOST)
+       { PACKET_HOST,                  "PACKET_HOST"           },
+#endif
+#if defined(PACKET_BROADCAST)
+       { PACKET_BROADCAST,             "PACKET_BROADCAST"      },
+#endif
+#if defined(PACKET_MULTICAST)
+       { PACKET_MULTICAST,             "PACKET_MULTICAST"      },
+#endif
+#if defined(PACKET_OTHERHOST)
+       { PACKET_OTHERHOST,             "PACKET_OTHERHOST"      },
+#endif
+#if defined(PACKET_OUTGOING)
+       { PACKET_OUTGOING,              "PACKET_OUTGOING"       },
+#endif
+#if defined(PACKET_LOOPBACK)
+       { PACKET_LOOPBACK,              "PACKET_LOOPBACK"       },
+#endif
+#if defined(PACKET_FASTROUTE)
+       { PACKET_FASTROUTE,             "PACKET_FASTROUTE"      },
+#endif
+       { 0,                            NULL                    },
+};
+#endif /* defined(AF_PACKET) */
+
+
 void
-printsock(tcp, addr)
+printsock(tcp, addr, addrlen)
 struct tcb *tcp;
 long addr;
+int addrlen;
 {
-       struct sockaddr sa;
-       struct sockaddr_in *sin = (struct sockaddr_in *) &sa;
-       struct sockaddr_un sau;
-#ifdef LINUX
-       struct sockaddr_ipx sipx;
+       union {
+               char pad[128];
+               struct sockaddr sa;
+               struct sockaddr_in sin;
+               struct sockaddr_un sau;
+#ifdef HAVE_INET_NTOP
+               struct sockaddr_in6 sa6;
+#endif
+#if defined(LINUX) && defined(AF_IPX)
+               struct sockaddr_ipx sipx;
+#endif
+#ifdef AF_PACKET
+               struct sockaddr_ll ll;
+#endif
+#ifdef AF_NETLINK
+               struct sockaddr_nl nl;
 #endif
+       } addrbuf;
+       char string_addr[100];
 
        if (addr == 0) {
                tprintf("NULL");
@@ -323,56 +734,111 @@ long addr;
                tprintf("%#lx", addr);
                return;
        }
-       if (umove(tcp, addr, &sa) < 0) {
+       if ((addrlen<2) || (addrlen>sizeof(addrbuf)))
+               addrlen=sizeof(addrbuf);
+
+       if (umoven(tcp, addr, addrlen, (char*)&addrbuf) < 0) {
                tprintf("{...}");
                return;
        }
-       switch (sa.sa_family) {
+
+       tprintf("{sa_family=");
+       printxval(addrfams, addrbuf.sa.sa_family, "AF_???");
+       tprintf(", ");
+
+       switch (addrbuf.sa.sa_family) {
        case AF_UNIX:
-               if (umove(tcp, addr, &sau) < 0)
-                       tprintf("{sun_family=AF_UNIX, ...}");
-               else
-                       tprintf("{sun_family=AF_UNIX, sun_path=\"%s\"}",
-                               sau.sun_path);
+               if (addrlen==2) {
+                       tprintf("<nil>");
+               } else if (addrbuf.sau.sun_path[0]) {
+                       tprintf("path=\"%-.*s\"", addrlen-2, addrbuf.sau.sun_path);
+               } else {
+                       tprintf("path=@%-.*s", addrlen-3, addrbuf.sau.sun_path+1);
+               }
                break;
        case AF_INET:
-               tprintf("{sin_family=AF_INET, ");
-               tprintf("sin_port=htons(%u), sin_addr=inet_addr(\"%s\")}",
-                       ntohs(sin->sin_port), inet_ntoa(sin->sin_addr));
+               tprintf("sin_port=htons(%u), sin_addr=inet_addr(\"%s\")",
+                       ntohs(addrbuf.sin.sin_port), inet_ntoa(addrbuf.sin.sin_addr));
                break;
-#ifdef AF_IPX
+#ifdef HAVE_INET_NTOP
+       case AF_INET6:
+               inet_ntop(AF_INET6, &addrbuf.sa6.sin6_addr, string_addr, sizeof(string_addr));
+               tprintf("sin6_port=htons(%u), inet_pton(AF_INET6, \"%s\", &sin6_addr), sin6_flowinfo=%u",
+                               ntohs(addrbuf.sa6.sin6_port), string_addr,
+                               addrbuf.sa6.sin6_flowinfo);
+#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
+               {
+#if defined(HAVE_IF_INDEXTONAME) && defined(IN6_IS_ADDR_LINKLOCAL) && defined(IN6_IS_ADDR_MC_LINKLOCAL)
+                   int numericscope = 0;
+                   if (IN6_IS_ADDR_LINKLOCAL (&addrbuf.sa6.sin6_addr)
+                           || IN6_IS_ADDR_MC_LINKLOCAL (&addrbuf.sa6.sin6_addr)) {
+                       char scopebuf[IFNAMSIZ + 1];
+
+                       if (if_indextoname (addrbuf.sa6.sin6_scope_id, scopebuf) == NULL)
+                           numericscope++;
+                       else
+                           tprintf(", sin6_scope_id=if_nametoindex(\"%s\")", scopebuf);
+                   } else
+                       numericscope++;
+
+                   if (numericscope)
+#endif
+                       tprintf(", sin6_scope_id=%u", addrbuf.sa6.sin6_scope_id);
+               }
+#endif
+                   break;
+#endif
+#if defined(AF_IPX) && defined(linux)
        case AF_IPX:
-               if (umove(tcp, addr, &sipx)<0)
-                       tprintf("{sipx_family=AF_IPX, ...}");
-               else {
+               {
                        int i;
-                       tprintf("{sipx_family=AF_IPX, ");
-                       tprintf("{sipx_port=htons(%u), ",
-                               ntohs(sipx.sipx_port));
+                       tprintf("sipx_port=htons(%u), ",
+                                       ntohs(addrbuf.sipx.sipx_port));
                        /* Yes, I know, this does not look too
                         * strace-ish, but otherwise the IPX
                         * addresses just look monstrous...
                         * Anyways, feel free if you don't like
-                        * this way.. :) 
+                        * this way.. :)
                         */
-                       tprintf("%08lx:", (unsigned long)ntohl(sipx.sipx_network));
+                       tprintf("%08lx:", (unsigned long)ntohl(addrbuf.sipx.sipx_network));
                        for (i = 0; i<IPX_NODE_LEN; i++)
-                               tprintf("%02x", sipx.sipx_node[i]);
-                       tprintf("/[%02x]", sipx.sipx_type);
-                       tprintf("}");
+                               tprintf("%02x", addrbuf.sipx.sipx_node[i]);
+                       tprintf("/[%02x]", addrbuf.sipx.sipx_type);
+               }
+               break;
+#endif /* AF_IPX && linux */
+#ifdef AF_PACKET
+       case AF_PACKET:
+               {
+                       int i;
+                       tprintf("proto=%#04x, if%d, pkttype=",
+                                       ntohs(addrbuf.ll.sll_protocol),
+                                       addrbuf.ll.sll_ifindex);
+                       printxval(af_packet_types, addrbuf.ll.sll_pkttype, "?");
+                       tprintf(", addr(%d)={%d, ",
+                                       addrbuf.ll.sll_halen,
+                                       addrbuf.ll.sll_hatype);
+                       for (i=0; i<addrbuf.ll.sll_halen; i++)
+                               tprintf("%02x", addrbuf.ll.sll_addr[i]);
                }
                break;
-#endif /* AF_IPX */
+
+#endif /* AF_APACKET */
+#ifdef AF_NETLINLK
+       case AF_NETLINK:
+               tprintf("pid=%d, groups=%08x", addrbuf.nl.nl_pid, addrbuf.nl.nl_groups);
+               break;
+#endif /* AF_NETLINK */
        /* AF_AX25 AF_APPLETALK AF_NETROM AF_BRIDGE AF_AAL5
-       AF_X25 AF_INET6 AF_ROSE still need to be done */
+       AF_X25 AF_ROSE etc. still need to be done */
 
        default:
-               tprintf("{sa_family=%u, sa_data=", sa.sa_family);
+               tprintf("sa_data=");
                printstr(tcp, (long) &((struct sockaddr *) addr)->sa_data,
-                       sizeof sa.sa_data);
-               tprintf("}");
+                       sizeof addrbuf.sa.sa_data);
                break;
        }
+       tprintf("}");
 }
 
 #if HAVE_SENDMSG
@@ -388,19 +854,24 @@ long addr;
                tprintf("%#lx", addr);
                return;
        }
-       tprintf("{msg_name=");
-       printstr(tcp, (long) msg.msg_name, msg.msg_namelen);
-       tprintf(", msg_namelen=%u, msg_iov=%#lx, msg_iovlen=%u, ",
-               msg.msg_namelen,
-               (unsigned long) msg.msg_iov, msg.msg_iovlen);
-#ifdef HAVE_MSG_CONTROL
-       tprintf("msg_control=%#lx, msg_controllen=%u, msg_flags=%#x}",
-               (unsigned long) msg.msg_control, msg.msg_controllen,
-               msg.msg_flags);
-#else /* !HAVE_MSG_CONTROL */
-       tprintf("msg_accrights=%#lx, msg_accrightslen=%u}",
+       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, msg.msg_iovlen, (long) msg.msg_iov);
+
+#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_MSG_CONTROL */
+#endif /* !HAVE_STRUCT_MSGHDR_MSG_CONTROL */
+       tprintf("}");
 }
 
 #endif /* HAVE_SENDMSG */
@@ -434,13 +905,40 @@ struct tcb *tcp;
        return 0;
 }
 
+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;
 {
        if (entering(tcp)) {
                tprintf("%ld, ", tcp->u_arg[0]);
-               printsock(tcp, tcp->u_arg[1]);
+               printsock(tcp, tcp->u_arg[1], tcp->u_arg[2]);
                tprintf(", %lu", tcp->u_arg[2]);
        }
        return 0;
@@ -475,7 +973,7 @@ struct tcb *tcp;
                if (tcp->u_arg[1] == 0 || syserror(tcp)) {
                        tprintf("%#lx", tcp->u_arg[1]);
                } else {
-                       printsock(tcp, tcp->u_arg[1]);
+                       printsock(tcp, tcp->u_arg[1], tcp->u_arg[2]);
                }
                tprintf(", ");
                printnum(tcp, tcp->u_arg[2], "%lu");
@@ -511,7 +1009,7 @@ struct tcb *tcp;
                        tprintf("0");
                /* to address */
                tprintf(", ");
-               printsock(tcp, tcp->u_arg[4]);
+               printsock(tcp, tcp->u_arg[4], tcp->u_arg[5]);
                /* to length */
                tprintf(", %lu", tcp->u_arg[5]);
        }
@@ -595,7 +1093,7 @@ struct tcb *tcp;
                        return 0;
                }
                tprintf(", ");
-               printsock(tcp, tcp->u_arg[4]);
+               printsock(tcp, tcp->u_arg[4], tcp->u_arg[5]);
                /* from length */
                tprintf(", [%u]", fromlen);
        }
@@ -665,7 +1163,7 @@ sys_pipe(tcp)
 struct tcb *tcp;
 {
 
-#if defined(LINUX) && !defined(SPARC)
+#if defined(LINUX) && !defined(SPARC) && !defined(SH)
        int fds[2];
 
        if (exiting(tcp)) {
@@ -678,7 +1176,7 @@ struct tcb *tcp;
                else
                        tprintf("[%u, %u]", fds[0], fds[1]);
        }
-#elif defined(SPARC) || defined(SVR4)
+#elif defined(SPARC) || defined(SH) || defined(SVR4) || defined(FREEBSD)
        if (exiting(tcp))
                tprintf("[%lu, %lu]", tcp->u_rval, getrval2(tcp));
 #endif
@@ -710,7 +1208,7 @@ struct tcb *tcp;
                        tprintf("]");
                        break;
 #endif /* PF_IPX */
-               default:        
+               default:
                        tprintf("%lu", tcp->u_arg[2]);
                        break;
                }
@@ -725,12 +1223,9 @@ struct tcb *tcp;
                else
                        tprintf(", [%u, %u]", fds[0], fds[1]);
 #endif /* LINUX */
-#ifdef SUNOS4
-               tprintf(", [%lu, %lu]", tcp->u_rval, getrval2(tcp));
-#endif /* SUNOS4 */
-#ifdef SVR4
+#if defined(SUNOS4) || defined(SVR4) || defined(FREEBSD)
                tprintf(", [%lu, %lu]", tcp->u_rval, getrval2(tcp));
-#endif /* SVR4 */
+#endif /* SUNOS4 || SVR4 || FREEBSD */
        }
        return 0;
 }
@@ -741,99 +1236,396 @@ struct tcb *tcp;
 {
        if (entering(tcp)) {
                tprintf("%ld, ", tcp->u_arg[0]);
+               printxval(socketlayers, tcp->u_arg[1], "SOL_???");
+               tprintf (", ");
                switch (tcp->u_arg[1]) {
                case SOL_SOCKET:
-                       tprintf("SOL_SOCKET, ");
                        printxval(sockoptions, tcp->u_arg[2], "SO_???");
-                       tprintf(", ");
                        break;
 #ifdef SOL_IP
                case SOL_IP:
-                       tprintf("SOL_IP, ");
                        printxval(sockipoptions, tcp->u_arg[2], "IP_???");
-                       tprintf(", ");
                        break;
 #endif
 #ifdef SOL_IPX
                case SOL_IPX:
-                       tprintf("SOL_IPX, ");
                        printxval(sockipxoptions, tcp->u_arg[2], "IPX_???");
-                       tprintf(", ");
+                       break;
+#endif
+#ifdef SOL_PACKET
+               case SOL_PACKET:
+                       printxval(sockpacketoptions, tcp->u_arg[2], "PACKET_???");
                        break;
 #endif
 #ifdef SOL_TCP
                case SOL_TCP:
-                       tprintf("SOL_TCP, ");
                        printxval(socktcpoptions, tcp->u_arg[2], "TCP_???");
-                       tprintf(", ");
                        break;
 #endif
 
                /* SOL_AX25 SOL_ROSE SOL_ATALK SOL_NETROM SOL_UDP SOL_DECNET SOL_X25
                 * etc. still need work */
-               default: 
-                       /* XXX - should know socket family here */
-                       printxval(protocols, tcp->u_arg[1], "IPPROTO_???");
-                       tprintf("%lu, ", tcp->u_arg[2]);
+               default:
+                       tprintf("%lu", tcp->u_arg[2]);
                        break;
                }
        } else {
-               if (syserror(tcp)) {
-                       tprintf("%#lx, %#lx",
+               long 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;
                }
-               printnum(tcp, tcp->u_arg[3], "%ld");
-               tprintf(", ");
-               printnum(tcp, tcp->u_arg[4], "%ld");
+
+               switch (tcp->u_arg[1]) {
+               case SOL_SOCKET:
+                       switch (tcp->u_arg[2]) {
+#ifdef SO_LINGER
+                       case SO_LINGER:
+                               if (len == sizeof (struct linger)) {
+                                       struct linger linger;
+                                       if (umove (tcp,
+                                                  tcp->u_arg[3],
+                                                  &linger) < 0)
+                                               break;
+                                       tprintf(", {onoff=%d, linger=%d}, "
+                                               "[%ld]",
+                                               linger.l_onoff,
+                                               linger.l_linger,
+                                               len);
+                                       return 0;
+                               }
+                               break;
+#endif
+                       }
+                       break;
+               }
+
+               tprintf (", ");
+               if (len == sizeof (int)) {
+                       printnum(tcp, tcp->u_arg[3], "%ld");
+               }
+               else {
+                       printstr (tcp, tcp->u_arg[3], len);
+               }
+               tprintf(", [%ld]", len);
        }
        return 0;
 }
 
-int
-sys_setsockopt(tcp)
+#if defined(ICMP_FILTER)
+static void printicmpfilter(tcp, addr)
 struct tcb *tcp;
+long addr;
 {
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               switch (tcp->u_arg[1]) {
-               case SOL_SOCKET:
-                       tprintf("SOL_SOCKET, ");
-                       printxval(sockoptions, tcp->u_arg[2], "SO_???");
-                       tprintf(", ");
+       struct icmp_filter      filter;
+
+       if (!addr) {
+               tprintf("NULL");
+               return;
+       }
+       if (syserror(tcp) || !verbose(tcp)) {
+               tprintf("%#lx", addr);
+               return;
+       }
+       if (umove(tcp, addr, &filter) < 0) {
+               tprintf("{...}");
+               return;
+       }
+
+       tprintf("~(");
+       if (printflags(icmpfilterflags, ~filter.data) == 0)
+               tprintf("0");
+       tprintf(")");
+}
+#endif /* ICMP_FILTER */
+
+static int
+printsockopt (tcp, level, name, addr, len)
+struct tcb *tcp;
+int level;
+int name;
+long addr;
+int len;
+{
+       printxval(socketlayers, level, "SOL_??");
+       tprintf (", ");
+       switch (level) {
+           case SOL_SOCKET:
+               printxval(sockoptions, name, "SO_???");
+               switch (name) {
+#if defined(SO_LINGER)
+                   case SO_LINGER:
+                       if (len == sizeof (struct linger)) {
+                               struct linger linger;
+                               if (umove (tcp, addr, &linger) < 0)
+                                       break;
+                               tprintf(", {onoff=%d, linger=%d}",
+                                       linger.l_onoff,
+                                       linger.l_linger);
+                               return 0;
+                       }
                        break;
+#endif
+               }
+               break;
 #ifdef SOL_IP
-               case SOL_IP:
-                       tprintf("SOL_IP, ");
-                       printxval(sockipoptions, tcp->u_arg[2], "IP_???");
-                       tprintf(", ");
-                       break;
+           case SOL_IP:
+               printxval(sockipoptions, name, "IP_???");
+               break;
 #endif
 #ifdef SOL_IPX
-               case SOL_IPX:
-                       tprintf("SOL_IPX, ");
-                       printxval(sockipxoptions, tcp->u_arg[2], "IPX_???");
-                       tprintf(", ");
-                       break;
+           case SOL_IPX:
+               printxval(sockipxoptions, name, "IPX_???");
+               break;
+#endif
+#ifdef SOL_PACKET
+           case SOL_PACKET:
+               printxval(sockpacketoptions, name, "PACKET_???");
+               /* TODO: decode packate_mreq for PACKET_*_MEMBERSHIP */
+               break;
 #endif
 #ifdef SOL_TCP
-               case SOL_TCP:
-                       tprintf("SOL_TCP, ");
-                       printxval(socktcpoptions, tcp->u_arg[2], "TCP_???");
+           case SOL_TCP:
+               printxval(socktcpoptions, name, "TCP_???");
+               break;
+#endif
+#ifdef SOL_RAW
+           case SOL_RAW:
+               printxval(sockrawoptions, name, "RAW_???");
+               switch (name) {
+#if defined(ICMP_FILTER)
+                   case ICMP_FILTER:
                        tprintf(", ");
-                       break;
+                       printicmpfilter(tcp, addr);
+                       return 0;
+#endif
+               }
+               break;
 #endif
 
-               /* SOL_AX25 SOL_ATALK SOL_NETROM SOL_UDP SOL_DECNET SOL_X25 
+               /* SOL_AX25 SOL_ATALK SOL_NETROM SOL_UDP SOL_DECNET SOL_X25
                 * etc. still need work  */
-               default:
-                       /* XXX - should know socket family here */
-                       printxval(protocols, tcp->u_arg[1], "IPPROTO_???");
-                       tprintf("%lu, ", tcp->u_arg[2]);
-                       break;
+
+           default:
+               tprintf("%u", name);
+       }
+
+       /* default arg printing */
+
+       tprintf (", ");
+
+       if (len == sizeof (int)) {
+               printnum(tcp, addr, "%ld");
+       }
+       else {
+               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 (", ");
                }
-               printnum(tcp, tcp->u_arg[3], "%ld");
+               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;
+{
+       if (entering(tcp)) {
+               tprintf("%ld, ", tcp->u_arg[0]);
+               printsockopt (tcp, tcp->u_arg[1], tcp->u_arg[2],
+                             tcp->u_arg[3], tcp->u_arg[4]);
                tprintf(", %lu", tcp->u_arg[4]);
        }
        return 0;
 }
+
+#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