]> 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 05ac0897fad7129c755d34de2487881533f48049..b136b42cf1c9efa92b8dbe287611ddb707db2ffa 100644 (file)
--- a/net.c
+++ b/net.c
@@ -219,12 +219,18 @@ static struct xlat socktypes[] = {
        { 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
@@ -270,7 +276,10 @@ static struct xlat socketlayers[] = {
 #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"  },
@@ -425,51 +434,117 @@ 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[] = {
+#ifdef IP_TOS
        { IP_TOS,               "IP_TOS"                },
+#endif
+#ifdef IP_TTL
        { IP_TTL,               "IP_TTL"                },
-#if defined(IP_HDRINCL)
+#endif
+#ifdef IP_HDRINCL
        { IP_HDRINCL,           "IP_HDRINCL"            },
 #endif
-#if defined(IP_OPTIONS)
+#ifdef IP_OPTIONS
        { IP_OPTIONS,           "IP_OPTIONS"            },
 #endif
+#ifdef IP_ROUTER_ALERT
        { IP_ROUTER_ALERT,      "IP_ROUTER_ALERT"       },
-#if defined(IP_RECVOPTIONS)
+#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"            },
-       { IP_PKTOPTIONS,        "IP_PKTOPTIONS" },
-       { IP_MTU_DISCOVER,      "IP_MTU_DISCOVER"       },
+#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"         },
-#if defined(IP_MTU)
+#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 */
@@ -507,14 +582,48 @@ static struct xlat sockpacketoptions[] = {
 };
 #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"    },
+       { TCP_NODELAY,          "TCP_NODELAY"   },
+       { TCP_MAXSEG,           "TCP_MAXSEG"    },
 #if defined(TCP_CORK)
-       { TCP_CORK,     "TCP_CORK"      },
+       { TCP_CORK,             "TCP_CORK"      },
 #endif
-       { 0,            NULL            },
+#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 */
 
@@ -563,6 +672,33 @@ static struct xlat icmpfilterflags[] = {
 };
 #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, addrlen)
@@ -606,7 +742,7 @@ int addrlen;
                return;
        }
 
-       tprintf("{sin_family=");
+       tprintf("{sa_family=");
        printxval(addrfams, addrbuf.sa.sa_family, "AF_???");
        tprintf(", ");
 
@@ -615,13 +751,13 @@ int addrlen;
                if (addrlen==2) {
                        tprintf("<nil>");
                } else if (addrbuf.sau.sun_path[0]) {
-                       tprintf("path=\"%*.*s\"", addrlen-2, addrlen-2, addrbuf.sau.sun_path);
+                       tprintf("path=\"%-.*s\"", addrlen-2, addrbuf.sau.sun_path);
                } else {
-                       tprintf("path=@%*.*s", addrlen-3, addrlen-3, addrbuf.sau.sun_path+1);
+                       tprintf("path=@%-.*s", addrlen-3, addrbuf.sau.sun_path+1);
                }
                break;
        case AF_INET:
-               tprintf("sin_port=htons(%u), sin_addr=inet_addr(\"%s\")}",
+               tprintf("sin_port=htons(%u), sin_addr=inet_addr(\"%s\")",
                        ntohs(addrbuf.sin.sin_port), inet_ntoa(addrbuf.sin.sin_addr));
                break;
 #ifdef HAVE_INET_NTOP
@@ -630,21 +766,21 @@ int addrlen;
                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_SIN6_SCOPE_ID
+#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);
@@ -656,13 +792,13 @@ int addrlen;
        case AF_IPX:
                {
                        int i;
-                       tprintf("{sipx_port=htons(%u), ",
+                       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(addrbuf.sipx.sipx_network));
                        for (i = 0; i<IPX_NODE_LEN; i++)
@@ -675,13 +811,14 @@ int addrlen;
        case AF_PACKET:
                {
                        int i;
-                       tprintf("proto=%#04x, if%d, pkttype=%d, addr(%d)={%d, ",
+                       tprintf("proto=%#04x, if%d, pkttype=",
                                        ntohs(addrbuf.ll.sll_protocol),
-                                       addrbuf.ll.sll_ifindex,
-                                       addrbuf.ll.sll_pkttype,
+                                       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_addr[i]; i++) 
+                       for (i=0; i<addrbuf.ll.sll_halen; i++)
                                tprintf("%02x", addrbuf.ll.sll_addr[i]);
                }
                break;
@@ -696,7 +833,7 @@ int addrlen;
        AF_X25 AF_ROSE etc. still need to be done */
 
        default:
-               tprintf("{sa_family=%u, sa_data=", addrbuf.sa.sa_family);
+               tprintf("sa_data=");
                printstr(tcp, (long) &((struct sockaddr *) addr)->sa_data,
                        sizeof addrbuf.sa.sa_data);
                break;
@@ -706,38 +843,6 @@ int addrlen;
 
 #if HAVE_SENDMSG
 
-static void
-printiovec(tcp, iovec, len)
-struct tcb *tcp;
-struct iovec *iovec;
-long   len;
-{
-       struct iovec *iov;
-       int i;
-
-       iov = (struct iovec *) malloc(len * sizeof *iov);
-       if (iov == NULL) {
-               fprintf(stderr, "No memory");
-               return;
-       }
-       if (umoven(tcp, (long)iovec,
-                               len * sizeof *iov, (char *) iov) < 0) {
-               tprintf("%#lx", (unsigned long)iovec);
-       } else {
-               tprintf("[");
-               for (i = 0; i < len; i++) {
-                       if (i)
-                               tprintf(", ");
-                       tprintf("{");
-                       printstr(tcp, (long) iov[i].iov_base,
-                                       iov[i].iov_len);
-                       tprintf(", %lu}", (unsigned long)iov[i].iov_len);
-               }
-               tprintf("]");
-       }
-       free((char *) iov);
-}
-
 static void
 printmsghdr(tcp, addr)
 struct tcb *tcp;
@@ -753,19 +858,19 @@ long addr;
        printsock(tcp, (long)msg.msg_name, msg.msg_namelen);
 
        tprintf(", msg_iov(%lu)=", (unsigned long)msg.msg_iovlen);
-       printiovec(tcp, msg.msg_iov, msg.msg_iovlen);
+       tprint_iov(tcp, msg.msg_iovlen, (long) msg.msg_iov);
 
-#ifdef HAVE_MSG_CONTROL
+#ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
        tprintf(", msg_controllen=%lu", (unsigned long)msg.msg_controllen);
-       if (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_MSG_CONTROL */
+#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("}");
 }
 
@@ -800,6 +905,33 @@ 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;
@@ -1031,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)) {
@@ -1044,7 +1176,7 @@ struct tcb *tcp;
                else
                        tprintf("[%u, %u]", fds[0], fds[1]);
        }
-#elif defined(SPARC) || defined(SVR4) || defined(FREEBSD)
+#elif defined(SPARC) || defined(SH) || defined(SVR4) || defined(FREEBSD)
        if (exiting(tcp))
                tprintf("[%lu, %lu]", tcp->u_rval, getrval2(tcp));
 #endif
@@ -1076,7 +1208,7 @@ struct tcb *tcp;
                        tprintf("]");
                        break;
 #endif /* PF_IPX */
-               default:        
+               default:
                        tprintf("%lu", tcp->u_arg[2]);
                        break;
                }
@@ -1104,58 +1236,79 @@ 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:
-                       tprintf("SOL_PACKET, ");
                        printxval(sockpacketoptions, tcp->u_arg[2], "PACKET_???");
-                       tprintf(", ");
                        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(socketlayers, tcp->u_arg[1], "SOL_???");
-                       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;
 }
@@ -1187,86 +1340,138 @@ long addr;
 }
 #endif /* ICMP_FILTER */
 
-int
-sys_setsockopt(tcp)
+static int
+printsockopt (tcp, level, name, addr, len)
 struct tcb *tcp;
+int level;
+int name;
+long addr;
+int len;
 {
-       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(", ");
-                       printnum(tcp, tcp->u_arg[3], "%ld");
-                       tprintf(", %lu", tcp->u_arg[4]);
+       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(", ");
-                       printnum(tcp, tcp->u_arg[3], "%ld");
-                       tprintf(", %lu", tcp->u_arg[4]);
-                       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(", ");
-                       printnum(tcp, tcp->u_arg[3], "%ld");
-                       tprintf(", %lu", tcp->u_arg[4]);
-                       break;
+           case SOL_IPX:
+               printxval(sockipxoptions, name, "IPX_???");
+               break;
 #endif
 #ifdef SOL_PACKET
-               case SOL_PACKET:
-                       tprintf("SOL_PACKET, ");
-                       printxval(sockpacketoptions, tcp->u_arg[2], "PACKET_???");
-                       tprintf(", ");
-                       /* TODO: decode packate_mreq for PACKET_*_MEMBERSHIP */
-                       printnum(tcp, tcp->u_arg[3], "%ld");
-                       tprintf(", %lu", tcp->u_arg[4]);
-                       break;
+           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_???");
-                       tprintf(", ");
-                       printnum(tcp, tcp->u_arg[3], "%ld");
-                       tprintf(", %lu", tcp->u_arg[4]);
-                       break;
+           case SOL_TCP:
+               printxval(socktcpoptions, name, "TCP_???");
+               break;
 #endif
 #ifdef SOL_RAW
-               case SOL_RAW:
-                       tprintf("SOL_RAW, ");
-                       printxval(sockrawoptions, tcp->u_arg[2], "RAW_???");
-                       tprintf(", ");
-                       switch (tcp->u_arg[2]) {
+           case SOL_RAW:
+               printxval(sockrawoptions, name, "RAW_???");
+               switch (name) {
 #if defined(ICMP_FILTER)
-                               case ICMP_FILTER:
-                                       printicmpfilter(tcp, tcp->u_arg[3]);
-                                       break;
+                   case ICMP_FILTER:
+                       tprintf(", ");
+                       printicmpfilter(tcp, addr);
+                       return 0;
 #endif
-                               default:
-                                       printnum(tcp, tcp->u_arg[3], "%ld");
-                                       break;
-                       }
-                       tprintf(", %lu", tcp->u_arg[4]);
-                       break;
+               }
+               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(socketlayers, tcp->u_arg[1], "IPPROTO_???");
-                       tprintf(", %lu, ", tcp->u_arg[2]);
-                       printnum(tcp, tcp->u_arg[3], "%ld");
-                       tprintf(", %lu", tcp->u_arg[4]);
-                       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 (", ");
+               }
+               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;
 }
@@ -1297,7 +1502,7 @@ int (*func) ();
                for (i = 0; i < tcp->u_nargs; i++)
                        tcp->u_arg[i] = tcp->u_arg[i + 1];
                return func (tcp);
-               
+
        }
 
        return func (tcp);
@@ -1376,7 +1581,7 @@ struct tcb *tcp;
                        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]);