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

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

index 42dc65e2820678136a1b694e9c55e7e8107dc486..53cfb2c71e6d5b1b5385d60f3b98247d820826c0 100644 (file)
 #ifdef HAVE_STRUCT_IFADDRLBLMSG
 
 # include "netlink_route.h"
+# include "nlattr.h"
 # include "print_fields.h"
 
 # include <linux/if_addrlabel.h>
+# include "netlink.h"
+
+# include "xlat/rtnl_addrlabel_attrs.h"
 
 DECL_NETLINK_ROUTE_DECODER(decode_ifaddrlblmsg)
 {
        struct ifaddrlblmsg ifal = { .ifal_family = family };
-       const size_t offset = sizeof(ifal.ifal_family);
+       size_t offset = sizeof(ifal.ifal_family);
+       bool decode_nla = false;
 
        PRINT_FIELD_XVAL("{", ifal, ifal_family, addrfams, "AF_???");
 
@@ -52,10 +57,18 @@ DECL_NETLINK_ROUTE_DECODER(decode_ifaddrlblmsg)
                        PRINT_FIELD_U(", ", ifal, ifal_flags);
                        PRINT_FIELD_IFINDEX(", ", ifal, ifal_index);
                        PRINT_FIELD_U(", ", ifal, ifal_seq);
+                       decode_nla = true;
                }
        } else
                tprints("...");
        tprints("}");
+
+       offset = NLMSG_ALIGN(sizeof(ifal));
+       if (decode_nla && len > offset) {
+               tprints(", ");
+               decode_nlattr(tcp, addr + offset, len - offset,
+                             rtnl_addrlabel_attrs, "IFAL_???", NULL, 0, NULL);
+       }
 }
 
 #endif
diff --git a/xlat/rtnl_addrlabel_attrs.in b/xlat/rtnl_addrlabel_attrs.in
new file mode 100644 (file)
index 0000000..0dc464d
--- /dev/null
@@ -0,0 +1,2 @@
+IFAL_ADDRESS           1
+IFAL_LABEL             2