setsockopt: decode PACKET_ADD_MEMBERSHIP

* xlat/packet_mreq_type.in: New file.
* net.c: Include "xlat/packet_mreq_type.h".
(print_packet_mreq): New function.
(print_setsockopt): Use it.

diff --git a/net.c b/net.c
index 16998e9da1316cf6a4dc2717c7c8f2eefacfcae1..1de3cb33434da2c5eb87f93b2d80bcd0d6c9a681 100644 (file)
--- a/net.c
+++ b/net.c
@@ -1317,6 +1317,32 @@ print_tpacket_req(struct tcb *tcp, long addr, int len)
 }
 #endif /* PACKET_RX_RING */
 
+#ifdef PACKET_ADD_MEMBERSHIP
+# include "xlat/packet_mreq_type.h"
+
+static void
+print_packet_mreq(struct tcb *tcp, long addr, int len)
+{
+       struct packet_mreq mreq;
+
+       if (len != sizeof(mreq) ||
+           umove(tcp, addr, &mreq) < 0) {
+               tprintf("%#lx", addr);
+       } 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);
+               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)
+                       tprintf("%02x", mreq.mr_address[i]);
+               tprints("}");
+       }
+}
+#endif /* PACKET_ADD_MEMBERSHIP */
+
 static void
 print_setsockopt(struct tcb *tcp, int level, int name, long addr, int len)
 {
@@ -1343,7 +1369,12 @@ print_setsockopt(struct tcb *tcp, int level, int name, long addr, int len)
                        print_tpacket_req(tcp, addr, len);
                        goto done;
 # endif /* PACKET_RX_RING */
-               /* TODO: decode packate_mreq for PACKET_*_MEMBERSHIP */
+# ifdef PACKET_ADD_MEMBERSHIP
+               case PACKET_ADD_MEMBERSHIP:
+               case PACKET_DROP_MEMBERSHIP:
+                       print_packet_mreq(tcp, addr, len);
+                       goto done;
+# endif /* PACKET_ADD_MEMBERSHIP */
                }
                break;
 #endif /* SOL_PACKET */

diff --git a/xlat/packet_mreq_type.in b/xlat/packet_mreq_type.in
new file mode 100644 (file)
index 0000000..0d6adfe
--- /dev/null
+++ b/xlat/packet_mreq_type.in
@@ -0,0 +1,4 @@
+PACKET_MR_MULTICAST
+PACKET_MR_PROMISC
+PACKET_MR_ALLMULTI
+PACKET_MR_UNICAST