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

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

index 7c1c57eec2b0a63230137211729de2a6f5548eb9..0724dcb947a9543062996dd335aa16a271d663c8 100644 (file)
 #ifdef HAVE_STRUCT_DCBMSG
 
 # include "netlink_route.h"
+# include "nlattr.h"
 # include "print_fields.h"
 
 # include <linux/dcbnl.h>
+# include "netlink.h"
 
 # include "xlat/dcb_commands.h"
+# include "xlat/rtnl_dcb_attrs.h"
 
 DECL_NETLINK_ROUTE_DECODER(decode_dcbmsg)
 {
        struct dcbmsg dcb = { .dcb_family = family };
-       const size_t offset = sizeof(dcb.dcb_family);
+       size_t offset = sizeof(dcb.dcb_family);
+       bool decode_nla = false;
 
        PRINT_FIELD_XVAL("{", dcb, dcb_family, addrfams, "AF_???");
 
@@ -52,10 +56,18 @@ DECL_NETLINK_ROUTE_DECODER(decode_dcbmsg)
                                         (void *) &dcb + offset)) {
                        PRINT_FIELD_XVAL("", dcb, cmd,
                                         dcb_commands, "DCB_CMD_???");
+                       decode_nla = true;
                }
        } else
                tprints("...");
        tprints("}");
+
+       offset = NLMSG_ALIGN(sizeof(dcb));
+       if (decode_nla && len > offset) {
+               tprints(", ");
+               decode_nlattr(tcp, addr + offset, len - offset,
+                             rtnl_dcb_attrs, "DCB_ATTR_???", NULL, 0, NULL);
+       }
 }
 
 #endif
diff --git a/xlat/rtnl_dcb_attrs.in b/xlat/rtnl_dcb_attrs.in
new file mode 100644 (file)
index 0000000..dd2ddf7
--- /dev/null
@@ -0,0 +1,17 @@
+DCB_ATTR_UNDEFINED     0
+DCB_ATTR_IFNAME                1
+DCB_ATTR_STATE         2
+DCB_ATTR_PFC_STATE     3
+DCB_ATTR_PFC_CFG       4
+DCB_ATTR_NUM_TC                5
+DCB_ATTR_PG_CFG                6
+DCB_ATTR_SET_ALL       7
+DCB_ATTR_PERM_HWADDR   8
+DCB_ATTR_CAP           9
+DCB_ATTR_NUMTCS                10
+DCB_ATTR_BCN           11
+DCB_ATTR_APP           12
+DCB_ATTR_IEEE          13
+DCB_ATTR_DCBX          14
+DCB_ATTR_FEATCFG       15
+DCB_ATTR_CEE           16