]> granicus.if.org Git - strace/blobdiff - net.c
net: decode AF_PACKET protocols in socket syscall
[strace] / net.c
diff --git a/net.c b/net.c
index 807eb2509b35ee85fb198d86cd9e0de1c2099220..58296b9c4e3d49681d68d6854d77cb85a3cc7483 100644 (file)
--- a/net.c
+++ b/net.c
@@ -3,7 +3,7 @@
  * 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>
- * Copyright (c) 1999-2017 The strace developers.
+ * Copyright (c) 1999-2018 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,6 +30,8 @@
  */
 
 #include "defs.h"
+#include "print_fields.h"
+
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 
 #include "xlat/inet_protocols.h"
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
-# include <bluetooth/bluetooth.h>
-# include "xlat/bt_protocols.h"
-#endif
-
-void
-print_ifindex(unsigned int ifindex)
-{
-#ifdef HAVE_IF_INDEXTONAME
-       char buf[IFNAMSIZ + 1];
-
-       if (if_indextoname(ifindex, buf)) {
-               tprints("if_nametoindex(");
-               print_quoted_string(buf, sizeof(buf), QUOTE_0_TERMINATED);
-               tprints(")");
-               return;
-       }
-#endif
-       tprintf("%u", ifindex);
-}
+#define XLAT_MACROS_ONLY
+# include "xlat/addrfams.h"
+# include "xlat/ethernet_protocols.h"
+#undef XLAT_MACROS_ONLY
+#include "xlat/irda_protocols.h"
+#include "xlat/can_protocols.h"
+#include "xlat/bt_protocols.h"
+#include "xlat/isdn_protocols.h"
+#include "xlat/phonet_protocols.h"
+#include "xlat/caif_protocols.h"
+#include "xlat/nfc_protocols.h"
+#include "xlat/kcm_protocols.h"
+#include "xlat/smc_protocols.h"
+
+const size_t inet_protocols_size = ARRAY_SIZE(inet_protocols) - 1;
 
 static void
 decode_sockbuf(struct tcb *const tcp, const int fd, const kernel_ulong_t addr,
@@ -127,7 +124,7 @@ tprint_sock_type(unsigned int flags)
        const char *str = xlookup(socktypes, flags & SOCK_TYPE_MASK);
 
        if (str) {
-               tprints(str);
+               print_xlat_ex(flags & SOCK_TYPE_MASK, str, XLAT_STYLE_DEFAULT);
                flags &= ~SOCK_TYPE_MASK;
                if (!flags)
                        return;
@@ -145,45 +142,67 @@ SYS_FUNC(socket)
        switch (tcp->u_arg[0]) {
        case AF_INET:
        case AF_INET6:
-               printxval(inet_protocols, tcp->u_arg[2], "IPPROTO_???");
+               printxval_search(inet_protocols, tcp->u_arg[2], "IPPROTO_???");
                break;
 
        case AF_NETLINK:
                printxval(netlink_protocols, tcp->u_arg[2], "NETLINK_???");
                break;
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+       case AF_PACKET:
+               tprints("htons(");
+               printxval_searchn(ethernet_protocols, ethernet_protocols_size,
+                                 ntohs(tcp->u_arg[2]), "ETH_P_???");
+               tprints(")");
+               break;
+
+       case AF_IRDA:
+               printxval_index(can_protocols, tcp->u_arg[2], "IRDAPROTO_???");
+               break;
+
+       case AF_CAN:
+               printxval_index(can_protocols, tcp->u_arg[2], "CAN_???");
+               break;
+
        case AF_BLUETOOTH:
-               printxval(bt_protocols, tcp->u_arg[2], "BTPROTO_???");
+               printxval_index(bt_protocols, tcp->u_arg[2], "BTPROTO_???");
                break;
-#endif
 
-       default:
-               tprintf("%" PRI_klu, tcp->u_arg[2]);
+       case AF_RXRPC:
+               printxval(addrfams, tcp->u_arg[2], "AF_???");
                break;
-       }
 
-       return RVAL_DECODED | RVAL_FD;
-}
+       case AF_ISDN:
+               printxval(isdn_protocols, tcp->u_arg[2], "ISDN_P_???");
+               break;
 
-SYS_FUNC(bind)
-{
-       printfd(tcp, tcp->u_arg[0]);
-       tprints(", ");
-       const int addrlen = tcp->u_arg[2];
-       decode_sockaddr(tcp, tcp->u_arg[1], addrlen);
-       tprintf(", %d", addrlen);
+       case AF_PHONET:
+               printxval_index(phonet_protocols, tcp->u_arg[2], "PN_PROTO_???");
+               break;
 
-       return RVAL_DECODED;
-}
+       case AF_CAIF:
+               printxval_index(caif_protocols, tcp->u_arg[2], "CAIFPROTO_???");
+               break;
 
-SYS_FUNC(listen)
-{
-       printfd(tcp, tcp->u_arg[0]);
-       tprints(", ");
-       tprintf("%" PRI_klu, tcp->u_arg[1]);
+       case AF_NFC:
+               printxval_index(nfc_protocols, tcp->u_arg[2],
+                               "NFC_SOCKPROTO_???");
+               break;
 
-       return RVAL_DECODED;
+       case AF_KCM:
+               printxval_index(kcm_protocols, tcp->u_arg[2], "KCMPROTO_???");
+               break;
+
+       case AF_SMC:
+               printxval_index(smc_protocols, tcp->u_arg[2], "SMCPROTO_???");
+               break;
+
+       default:
+               tprintf("%" PRI_klu, tcp->u_arg[2]);
+               break;
+       }
+
+       return RVAL_DECODED | RVAL_FD;
 }
 
 static bool
@@ -347,17 +366,6 @@ SYS_FUNC(recvfrom)
        return 0;
 }
 
-#include "xlat/shutdown_modes.h"
-
-SYS_FUNC(shutdown)
-{
-       printfd(tcp, tcp->u_arg[0]);
-       tprints(", ");
-       printxval(shutdown_modes, tcp->u_arg[1], "SHUT_???");
-
-       return RVAL_DECODED;
-}
-
 SYS_FUNC(getsockname)
 {
        return decode_sockname(tcp);
@@ -399,7 +407,7 @@ do_pipe(struct tcb *tcp, int flags_arg)
 
 SYS_FUNC(pipe)
 {
-#ifdef HAVE_GETRVAL2
+#if HAVE_ARCH_GETRVAL2
        if (exiting(tcp) && !syserror(tcp))
                printpair_fd(tcp, tcp->u_rval, getrval2(tcp));
        return 0;
@@ -427,18 +435,38 @@ SYS_FUNC(socketpair)
        return 0;
 }
 
-#include "xlat/sockoptions.h"
-#include "xlat/sockipoptions.h"
-#include "xlat/getsockipoptions.h"
-#include "xlat/setsockipoptions.h"
-#include "xlat/sockipv6options.h"
-#include "xlat/getsockipv6options.h"
-#include "xlat/setsockipv6options.h"
-#include "xlat/sockipxoptions.h"
-#include "xlat/sockrawoptions.h"
-#include "xlat/sockpacketoptions.h"
-#include "xlat/socksctpoptions.h"
-#include "xlat/socktcpoptions.h"
+#include "xlat/sock_options.h"
+#include "xlat/getsock_options.h"
+#include "xlat/setsock_options.h"
+#include "xlat/sock_ip_options.h"
+#include "xlat/getsock_ip_options.h"
+#include "xlat/setsock_ip_options.h"
+#include "xlat/sock_ipv6_options.h"
+#include "xlat/getsock_ipv6_options.h"
+#include "xlat/setsock_ipv6_options.h"
+#include "xlat/sock_ipx_options.h"
+#include "xlat/sock_netlink_options.h"
+#include "xlat/sock_packet_options.h"
+#include "xlat/sock_raw_options.h"
+#include "xlat/sock_sctp_options.h"
+#include "xlat/sock_tcp_options.h"
+#include "xlat/sock_udp_options.h"
+#include "xlat/sock_irda_options.h"
+#include "xlat/sock_llc_options.h"
+#include "xlat/sock_dccp_options.h"
+#include "xlat/sock_tipc_options.h"
+#include "xlat/sock_rxrpc_options.h"
+#include "xlat/sock_pppol2tp_options.h"
+#include "xlat/sock_bluetooth_options.h"
+#include "xlat/sock_pnp_options.h"
+#include "xlat/sock_rds_options.h"
+#include "xlat/sock_iucv_options.h"
+#include "xlat/sock_caif_options.h"
+#include "xlat/sock_alg_options.h"
+#include "xlat/sock_nfcllcp_options.h"
+#include "xlat/sock_kcm_options.h"
+#include "xlat/sock_tls_options.h"
+#include "xlat/sock_xdp_options.h"
 
 static void
 print_sockopt_fd_level_name(struct tcb *tcp, int fd, unsigned int level,
@@ -446,35 +474,93 @@ print_sockopt_fd_level_name(struct tcb *tcp, int fd, unsigned int level,
 {
        printfd(tcp, fd);
        tprints(", ");
-       printxval(socketlayers, level, "SOL_??");
+       printxval_search(socketlayers, level, "SOL_??");
        tprints(", ");
 
        switch (level) {
        case SOL_SOCKET:
-               printxval(sockoptions, name, "SO_???");
+               printxvals(name, "SO_???", sock_options,
+                          is_getsockopt ? getsock_options :
+                                          setsock_options, NULL);
                break;
        case SOL_IP:
-               printxvals(name, "IP_???", sockipoptions,
-                       is_getsockopt ? getsockipoptions : setsockipoptions, NULL);
+               printxvals(name, "IP_???", sock_ip_options,
+                          is_getsockopt ? getsock_ip_options :
+                                          setsock_ip_options, NULL);
                break;
        case SOL_IPV6:
-               printxvals(name, "IPV6_???", sockipv6options,
-                       is_getsockopt ? getsockipv6options : setsockipv6options, NULL);
+               printxvals(name, "IPV6_???", sock_ipv6_options,
+                          is_getsockopt ? getsock_ipv6_options :
+                                          setsock_ipv6_options, NULL);
                break;
        case SOL_IPX:
-               printxval(sockipxoptions, name, "IPX_???");
+               printxval(sock_ipx_options, name, "IPX_???");
                break;
        case SOL_PACKET:
-               printxval(sockpacketoptions, name, "PACKET_???");
+               printxval(sock_packet_options, name, "PACKET_???");
                break;
        case SOL_TCP:
-               printxval(socktcpoptions, name, "TCP_???");
+               printxval_index(sock_tcp_options, name, "TCP_???");
                break;
        case SOL_SCTP:
-               printxval(socksctpoptions, name, "SCTP_???");
+               printxval(sock_sctp_options, name, "SCTP_???");
                break;
        case SOL_RAW:
-               printxval(sockrawoptions, name, "RAW_???");
+               printxval(sock_raw_options, name, "RAW_???");
+               break;
+       case SOL_NETLINK:
+               printxval(sock_netlink_options, name, "NETLINK_???");
+               break;
+       case SOL_UDP:
+               printxval(sock_udp_options, name, "UDP_???");
+               break;
+       case SOL_IRDA:
+               printxval_index(sock_irda_options, name, "IRLMP_???");
+               break;
+       case SOL_LLC:
+               printxval_index(sock_llc_options, name, "LLC_OPT_???");
+               break;
+       case SOL_DCCP:
+               printxval_search(sock_dccp_options, name, "DCCP_SOCKOPT_???");
+               break;
+       case SOL_TIPC:
+               printxval_search(sock_tipc_options, name, "TIPC_???");
+               break;
+       case SOL_RXRPC:
+               printxval_index(sock_rxrpc_options, name, "RXRPC_???");
+               break;
+       case SOL_PPPOL2TP:
+               printxval_index(sock_pppol2tp_options, name, "PPPOL2TP_SO_???");
+               break;
+       case SOL_BLUETOOTH:
+               printxval_search(sock_bluetooth_options, name, "BT_???");
+               break;
+       case SOL_PNPIPE:
+               printxval(sock_pnp_options, name, "PNPIPE_???");
+               break;
+       case SOL_RDS:
+               printxval_search(sock_rds_options, name, "RDS_???");
+               break;
+       case SOL_IUCV:
+               printxval(sock_iucv_options, name, "SO_???");
+               break;
+       case SOL_CAIF:
+               printxval(sock_caif_options, name, "CAIFSO_???");
+               break;
+       case SOL_ALG:
+               printxval_index(sock_alg_options, name, "ALG_???");
+               break;
+       case SOL_NFC:
+               printxval_index(sock_nfcllcp_options, name, "NFC_LLCP_???");
+               break;
+       case SOL_KCM:
+               printxval(sock_kcm_options, name, "KCM_???");
+               break;
+       case SOL_TLS:
+               printxval(sock_tls_options, name, "TLS_???");
+               break;
+       case SOL_XDP:
+               printxval_index(sock_xdp_options, name, "XDP_???");
                break;
 
                /* Other SOL_* protocol levels still need work. */
@@ -487,54 +573,145 @@ print_sockopt_fd_level_name(struct tcb *tcp, int fd, unsigned int level,
 }
 
 static void
-print_linger(struct tcb *const tcp, const kernel_ulong_t addr, const int len)
+print_get_linger(struct tcb *const tcp, const kernel_ulong_t addr,
+                unsigned int len)
 {
        struct linger linger;
 
-       if (len != sizeof(linger) ||
-           umove(tcp, addr, &linger) < 0) {
-               printaddr(addr);
+       /*
+        * The kernel cannot return len > sizeof(linger) because struct linger
+        * cannot change, but extra safety won't harm either.
+        */
+       if (len > sizeof(linger))
+               len = sizeof(linger);
+       if (umoven_or_printaddr(tcp, addr, len, &linger))
                return;
-       }
 
-       tprintf("{onoff=%d, linger=%d}",
-               linger.l_onoff,
-               linger.l_linger);
+       if (len < sizeof(linger.l_onoff)) {
+               tprints("{l_onoff=");
+               print_quoted_string((void *) &linger.l_onoff,
+                                   len, QUOTE_FORCE_HEX);
+       } else {
+               PRINT_FIELD_D("{", linger, l_onoff);
+
+               if (len > offsetof(struct linger, l_linger)) {
+                       len -= offsetof(struct linger, l_linger);
+                       if (len < sizeof(linger.l_linger)) {
+                               tprints(", l_linger=");
+                               print_quoted_string((void *) &linger.l_linger,
+                                                   len, QUOTE_FORCE_HEX);
+                       } else {
+                               PRINT_FIELD_D(", ", linger, l_linger);
+                       }
+               }
+       }
+       tprints("}");
 }
 
-#ifdef SO_PEERCRED
 static void
-print_ucred(struct tcb *const tcp, const kernel_ulong_t addr, const int len)
+print_get_ucred(struct tcb *const tcp, const kernel_ulong_t addr,
+               unsigned int len)
 {
        struct ucred uc;
 
-       if (len != sizeof(uc) ||
-           umove(tcp, addr, &uc) < 0) {
-               printaddr(addr);
+       /*
+        * The kernel is very unlikely to return len > sizeof(uc)
+        * because struct ucred is very unlikely to change,
+        * but extra safety won't harm either.
+        */
+       if (len > sizeof(uc))
+               len = sizeof(uc);
+
+       if (umoven_or_printaddr(tcp, addr, len, &uc))
+               return;
+
+       if (len < sizeof(uc.pid)) {
+               tprints("{pid=");
+               print_quoted_string((void *) &uc.pid,
+                                   len, QUOTE_FORCE_HEX);
        } else {
-               tprintf("{pid=%u, uid=%u, gid=%u}",
-                       (unsigned) uc.pid,
-                       (unsigned) uc.uid,
-                       (unsigned) uc.gid);
+               PRINT_FIELD_D("{", uc, pid);
+
+               if (len > offsetof(struct ucred, uid)) {
+                       len -= offsetof(struct ucred, uid);
+                       if (len < sizeof(uc.uid)) {
+                               tprints(", uid=");
+                               print_quoted_string((void *) &uc.uid,
+                                                   len, QUOTE_FORCE_HEX);
+                       } else {
+                               PRINT_FIELD_UID(", ", uc, uid);
+
+                               if (len > offsetof(struct ucred, gid) -
+                                         offsetof(struct ucred, uid)) {
+                                       len -= offsetof(struct ucred, gid) -
+                                              offsetof(struct ucred, uid);
+                                       if (len < sizeof(uc.gid)) {
+                                               tprints(", gid=");
+                                               print_quoted_string((void *) &uc.gid,
+                                                                   len,
+                                                                   QUOTE_FORCE_HEX);
+                                       } else {
+                                               PRINT_FIELD_UID(", ", uc, gid);
+                                       }
+                               }
+                       }
+               }
        }
+       tprints("}");
 }
-#endif /* SO_PEERCRED */
 
 #ifdef PACKET_STATISTICS
 static void
 print_tpacket_stats(struct tcb *const tcp, const kernel_ulong_t addr,
-                   const int len)
+                   unsigned int len)
 {
-       struct tpacket_stats stats;
+       struct tp_stats {
+               unsigned int tp_packets, tp_drops, tp_freeze_q_cnt;
+       } stats;
+
+       /*
+        * The kernel may return len > sizeof(stats) if the kernel structure
+        * grew as it happened when tpacket_stats_v3 was introduced.
+        */
+       if (len > sizeof(stats))
+               len = sizeof(stats);
+
+       if (umoven_or_printaddr(tcp, addr, len, &stats))
+               return;
 
-       if (len != sizeof(stats) ||
-           umove(tcp, addr, &stats) < 0) {
-               printaddr(addr);
+       if (len < sizeof(stats.tp_packets)) {
+               tprints("{tp_packets=");
+               print_quoted_string((void *) &stats.tp_packets,
+                                   len, QUOTE_FORCE_HEX);
        } else {
-               tprintf("{packets=%u, drops=%u}",
-                       stats.tp_packets,
-                       stats.tp_drops);
+               PRINT_FIELD_U("{", stats, tp_packets);
+
+               if (len > offsetof(struct tp_stats, tp_drops)) {
+                       len -= offsetof(struct tp_stats, tp_drops);
+                       if (len < sizeof(stats.tp_drops)) {
+                               tprints(", tp_drops=");
+                               print_quoted_string((void *) &stats.tp_drops,
+                                                   len, QUOTE_FORCE_HEX);
+                       } else {
+                               PRINT_FIELD_U(", ", stats, tp_drops);
+
+                               if (len > offsetof(struct tp_stats, tp_freeze_q_cnt) -
+                                         offsetof(struct tp_stats, tp_drops)) {
+                                       len -= offsetof(struct tp_stats, tp_freeze_q_cnt) -
+                                              offsetof(struct tp_stats, tp_drops);
+                                       if (len < sizeof(stats.tp_freeze_q_cnt)) {
+                                               tprints(", tp_freeze_q_cnt=");
+                                               print_quoted_string((void *) &stats.tp_freeze_q_cnt,
+                                                                   len,
+                                                                   QUOTE_FORCE_HEX);
+                                       } else {
+                                               PRINT_FIELD_U(", ", stats, tp_freeze_q_cnt);
+                                       }
+                               }
+                       }
+               }
        }
+       tprints("}");
 }
 #endif /* PACKET_STATISTICS */
 
@@ -560,23 +737,52 @@ print_icmp_filter(struct tcb *const tcp, const kernel_ulong_t addr, int len)
        tprints(")");
 }
 
+static bool
+print_uint32(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
+{
+       tprintf("%u", *(uint32_t *) elem_buf);
+
+       return true;
+}
+
 static void
 print_getsockopt(struct tcb *const tcp, const unsigned int level,
                 const unsigned int name, const kernel_ulong_t addr,
-                const int len)
+                const int ulen, const int rlen)
 {
+       if (ulen <= 0 || rlen <= 0) {
+               /*
+                * As the kernel neither accepts nor returns a negative
+                * length in case of successful getsockopt syscall
+                * invocation, negative values must have been forged
+                * by userspace.
+                */
+               printaddr(addr);
+               return;
+       }
+
        if (addr && verbose(tcp))
        switch (level) {
        case SOL_SOCKET:
                switch (name) {
                case SO_LINGER:
-                       print_linger(tcp, addr, len);
+                       print_get_linger(tcp, addr, rlen);
                        return;
-#ifdef SO_PEERCRED
                case SO_PEERCRED:
-                       print_ucred(tcp, addr, len);
+                       print_get_ucred(tcp, addr, rlen);
+                       return;
+               case SO_ATTACH_FILTER:
+                       /*
+                        * The length returned by the kernel in case of
+                        * successful getsockopt syscall invocation is struct
+                        * sock_fprog.len that has type unsigned short,
+                        * anything else must have been forged by userspace.
+                        */
+                       if ((unsigned short) rlen == (unsigned int) rlen)
+                               print_sock_fprog(tcp, addr, rlen);
+                       else
+                               printaddr(addr);
                        return;
-#endif
                }
                break;
 
@@ -584,7 +790,7 @@ print_getsockopt(struct tcb *const tcp, const unsigned int level,
                switch (name) {
 #ifdef PACKET_STATISTICS
                case PACKET_STATISTICS:
-                       print_tpacket_stats(tcp, addr, len);
+                       print_tpacket_stats(tcp, addr, rlen);
                        return;
 #endif
                }
@@ -593,19 +799,34 @@ print_getsockopt(struct tcb *const tcp, const unsigned int level,
        case SOL_RAW:
                switch (name) {
                case ICMP_FILTER:
-                       print_icmp_filter(tcp, addr, len);
+                       print_icmp_filter(tcp, addr, rlen);
                        return;
                }
                break;
+
+       case SOL_NETLINK:
+               switch (name) {
+               case NETLINK_LIST_MEMBERSHIPS: {
+                       uint32_t buf;
+                       print_array(tcp, addr, MIN(ulen, rlen) / sizeof(buf),
+                                   &buf, sizeof(buf),
+                                   tfetch_mem, print_uint32, 0);
+                       break;
+                       }
+               default:
+                       printnum_int(tcp, addr, "%d");
+                       break;
+               }
+               return;
        }
 
        /* default arg printing */
 
        if (verbose(tcp)) {
-               if (len == sizeof(int)) {
+               if (rlen == sizeof(int)) {
                        printnum_int(tcp, addr, "%d");
                } else {
-                       printstrn(tcp, addr, len);
+                       printstrn(tcp, addr, rlen);
                }
        } else {
                printaddr(addr);
@@ -638,7 +859,7 @@ SYS_FUNC(getsockopt)
                        tprintf(", [%d]", ulen);
                } else {
                        print_getsockopt(tcp, tcp->u_arg[1], tcp->u_arg[2],
-                                        tcp->u_arg[3], rlen);
+                                        tcp->u_arg[3], ulen, rlen);
                        if (ulen != rlen)
                                tprintf(", [%d->%d]", ulen, rlen);
                        else
@@ -648,69 +869,54 @@ SYS_FUNC(getsockopt)
        return 0;
 }
 
+static void
+print_set_linger(struct tcb *const tcp, const kernel_ulong_t addr,
+                const int len)
+{
+       struct linger linger;
+
+       if (len < (int) sizeof(linger)) {
+               printaddr(addr);
+       } else if (!umove_or_printaddr(tcp, addr, &linger)) {
+               PRINT_FIELD_D("{", linger, l_onoff);
+               PRINT_FIELD_D(", ", linger, l_linger);
+               tprints("}");
+       }
+}
+
 #ifdef IP_ADD_MEMBERSHIP
 static void
 print_mreq(struct tcb *const tcp, const kernel_ulong_t addr,
-          const unsigned int len)
+          const int len)
 {
        struct ip_mreq mreq;
 
-       if (len < sizeof(mreq)) {
-               printstrn(tcp, addr, len);
-               return;
+       if (len < (int) sizeof(mreq)) {
+               printaddr(addr);
+       } else if (!umove_or_printaddr(tcp, addr, &mreq)) {
+               PRINT_FIELD_INET4_ADDR("{", mreq, imr_multiaddr);
+               PRINT_FIELD_INET4_ADDR(", ", mreq, imr_interface);
+               tprints("}");
        }
-       if (umove_or_printaddr(tcp, addr, &mreq))
-               return;
-
-       tprintf("{imr_multiaddr=inet_addr(\"%s\")",
-               inet_ntoa(mreq.imr_multiaddr));
-       tprintf(", imr_interface=inet_addr(\"%s\")}",
-               inet_ntoa(mreq.imr_interface));
 }
 #endif /* IP_ADD_MEMBERSHIP */
 
 #ifdef IPV6_ADD_MEMBERSHIP
 static void
 print_mreq6(struct tcb *const tcp, const kernel_ulong_t addr,
-           const unsigned int len)
+           const int len)
 {
        struct ipv6_mreq mreq;
 
-       if (len < sizeof(mreq)) {
-               printstrn(tcp, addr, len);
-               return;
-       }
-       if (umove_or_printaddr(tcp, addr, &mreq))
-               return;
-
-       tprints("{");
-       print_inet_addr(AF_INET6, &mreq.ipv6mr_multiaddr,
-                       sizeof(mreq.ipv6mr_multiaddr), "ipv6mr_multiaddr");
-
-       tprints(", ipv6mr_interface=");
-       print_ifindex(mreq.ipv6mr_interface);
-       tprints("}");
-}
-#endif /* IPV6_ADD_MEMBERSHIP */
-
-#ifdef MCAST_JOIN_GROUP
-static void
-print_group_req(struct tcb *const tcp, const kernel_ulong_t addr, const int len)
-{
-       struct group_req greq;
-
-       if (len != sizeof(greq) ||
-           umove(tcp, addr, &greq) < 0) {
+       if (len < (int) sizeof(mreq)) {
                printaddr(addr);
-               return;
+       } else if (!umove_or_printaddr(tcp, addr, &mreq)) {
+               PRINT_FIELD_INET_ADDR("{", mreq, ipv6mr_multiaddr, AF_INET6);
+               PRINT_FIELD_IFINDEX(", ", mreq, ipv6mr_interface);
+               tprints("}");
        }
-
-       tprintf("{gr_interface=%u, gr_group=", greq.gr_interface);
-       print_sockaddr(tcp, &greq.gr_group, sizeof(greq.gr_group));
-       tprints("}");
-
 }
-#endif /* MCAST_JOIN_GROUP */
+#endif /* IPV6_ADD_MEMBERSHIP */
 
 #ifdef PACKET_RX_RING
 static void
@@ -722,12 +928,11 @@ print_tpacket_req(struct tcb *const tcp, const kernel_ulong_t addr, const int le
            umove(tcp, addr, &req) < 0) {
                printaddr(addr);
        } else {
-               tprintf("{block_size=%u, block_nr=%u, "
-                       "frame_size=%u, frame_nr=%u}",
-                       req.tp_block_size,
-                       req.tp_block_nr,
-                       req.tp_frame_size,
-                       req.tp_frame_nr);
+               PRINT_FIELD_U("{", req, tp_block_size);
+               PRINT_FIELD_U(", ", req, tp_block_nr);
+               PRINT_FIELD_U(", ", req, tp_frame_size);
+               PRINT_FIELD_U(", ", req, tp_frame_nr);
+               tprints("}");
        }
 }
 #endif /* PACKET_RX_RING */
@@ -746,9 +951,11 @@ print_packet_mreq(struct tcb *const tcp, const kernel_ulong_t addr, const int le
        } else {
                unsigned int i;
 
-               tprintf("{mr_ifindex=%u, mr_type=", mreq.mr_ifindex);
-               printxval(packet_mreq_type, mreq.mr_type, "PACKET_MR_???");
-               tprintf(", mr_alen=%u, mr_address=", mreq.mr_alen);
+               PRINT_FIELD_IFINDEX("{", mreq, mr_ifindex);
+               PRINT_FIELD_XVAL(", ", mreq, mr_type, packet_mreq_type,
+                                "PACKET_MR_???");
+               PRINT_FIELD_U(", ", mreq, mr_alen);
+               tprints(", mr_address=");
                if (mreq.mr_alen > ARRAY_SIZE(mreq.mr_address))
                        mreq.mr_alen = ARRAY_SIZE(mreq.mr_address);
                for (i = 0; i < mreq.mr_alen; ++i)
@@ -768,7 +975,14 @@ print_setsockopt(struct tcb *const tcp, const unsigned int level,
        case SOL_SOCKET:
                switch (name) {
                case SO_LINGER:
-                       print_linger(tcp, addr, len);
+                       print_set_linger(tcp, addr, len);
+                       return;
+               case SO_ATTACH_FILTER:
+               case SO_ATTACH_REUSEPORT_CBPF:
+                       if ((unsigned int) len == get_sock_fprog_size())
+                               decode_sock_fprog(tcp, addr);
+                       else
+                               printaddr(addr);
                        return;
                }
                break;
@@ -804,6 +1018,12 @@ print_setsockopt(struct tcb *const tcp, const unsigned int level,
                        print_mreq6(tcp, addr, len);
                        return;
 #endif /* IPV6_ADD_MEMBERSHIP */
+#ifdef MCAST_JOIN_GROUP
+               case MCAST_JOIN_GROUP:
+               case MCAST_LEAVE_GROUP:
+                       print_group_req(tcp, addr, len);
+                       return;
+#endif /* MCAST_JOIN_GROUP */
                }
                break;
 
@@ -833,6 +1053,13 @@ print_setsockopt(struct tcb *const tcp, const unsigned int level,
                        return;
                }
                break;
+
+       case SOL_NETLINK:
+               if (len < (int) sizeof(int))
+                       printaddr(addr);
+               else
+                       printnum_int(tcp, addr, "%d");
+               return;
        }
 
        /* default arg printing */