]> granicus.if.org Git - strace/commitdiff
netlink: add basic decoding of NETLINK_ROUTE br_port_msg attributes
authorJingPiao Chen <chenjingpiao@gmail.com>
Tue, 15 Aug 2017 04:41:21 +0000 (12:41 +0800)
committerDmitry V. Levin <ldv@altlinux.org>
Tue, 15 Aug 2017 22:34:46 +0000 (22:34 +0000)
* rtnl_mdb.c: Include "netlink.h", "nlattr.h".
and "xlat/rtnl_mdb_attrs.h".
(decode_br_port_msg): Call decode_nlattr.
* xlat/rtnl_mdb_attrs.in: New file.

Co-authored-by: Fabien Siron <fabien.siron@epita.fr>
rtnl_mdb.c
xlat/rtnl_mdb_attrs.in [new file with mode: 0644]

index f0171fbc8d8ae07f5635ce144ac5a959bac772a9..ebe737dc135d2f92eeda918abb14dcbe2917faf4 100644 (file)
 #ifdef HAVE_STRUCT_BR_PORT_MSG
 
 # include "netlink_route.h"
+# include "nlattr.h"
 # include "print_fields.h"
 
 # include <netinet/in.h>
 # include <linux/if_bridge.h>
+# include "netlink.h"
+
+# include "xlat/rtnl_mdb_attrs.h"
 
 DECL_NETLINK_ROUTE_DECODER(decode_br_port_msg)
 {
        struct br_port_msg bpm = { .family = family };
-       const size_t offset = sizeof(bpm.family);
+       size_t offset = sizeof(bpm.family);
+       bool decode_nla = false;
 
        PRINT_FIELD_XVAL("{", bpm, family, addrfams, "AF_???");
 
@@ -50,10 +55,18 @@ DECL_NETLINK_ROUTE_DECODER(decode_br_port_msg)
                                         sizeof(bpm) - offset,
                                         (void *) &bpm + offset)) {
                        PRINT_FIELD_IFINDEX("", bpm, ifindex);
+                       decode_nla = true;
                }
        } else
                tprints("...");
        tprints("}");
+
+       offset = NLMSG_ALIGN(sizeof(bpm));
+       if (decode_nla && len > offset) {
+               tprints(", ");
+               decode_nlattr(tcp, addr + offset, len - offset,
+                             rtnl_mdb_attrs, "MDBA_???", NULL, 0, NULL);
+       }
 }
 
 #endif
diff --git a/xlat/rtnl_mdb_attrs.in b/xlat/rtnl_mdb_attrs.in
new file mode 100644 (file)
index 0000000..b804662
--- /dev/null
@@ -0,0 +1,3 @@
+MDBA_UNSPEC            0
+MDBA_MDB               1
+MDBA_ROUTER            2