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

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

index 905bc14f75fa536e36e7861e8228a7e4dcad6191..c7e37eab66315ccbf1ce46f71b361a509ac79254 100644 (file)
@@ -29,6 +29,7 @@
 
 #include "defs.h"
 #include "netlink_route.h"
+#include "nlattr.h"
 #include "print_fields.h"
 
 #include "netlink.h"
 
 #include "xlat/ifaddrflags.h"
 #include "xlat/routing_scopes.h"
+#include "xlat/rtnl_addr_attrs.h"
 
 DECL_NETLINK_ROUTE_DECODER(decode_ifaddrmsg)
 {
        struct ifaddrmsg ifaddr = { .ifa_family = family };
-       const size_t offset = sizeof(ifaddr.ifa_family);
+       size_t offset = sizeof(ifaddr.ifa_family);
+       bool decode_nla = false;
 
        PRINT_FIELD_XVAL("{", ifaddr, ifa_family, addrfams, "AF_???");
 
@@ -58,8 +61,16 @@ DECL_NETLINK_ROUTE_DECODER(decode_ifaddrmsg)
                        PRINT_FIELD_XVAL(", ", ifaddr, ifa_scope,
                                         routing_scopes, NULL);
                        PRINT_FIELD_IFINDEX(", ", ifaddr, ifa_index);
+                       decode_nla = true;
                }
        } else
                tprints("...");
        tprints("}");
+
+       offset = NLMSG_ALIGN(sizeof(ifaddr));
+       if (decode_nla && len > offset) {
+               tprints(", ");
+               decode_nlattr(tcp, addr + offset, len - offset,
+                             rtnl_addr_attrs, "IFA_???", NULL, 0, NULL);
+       }
 }
diff --git a/xlat/rtnl_addr_attrs.in b/xlat/rtnl_addr_attrs.in
new file mode 100644 (file)
index 0000000..df65905
--- /dev/null
@@ -0,0 +1,9 @@
+IFA_UNSPEC             0
+IFA_ADDRESS            1
+IFA_LOCAL              2
+IFA_LABEL              3
+IFA_BROADCAST          4
+IFA_ANYCAST            5
+IFA_CACHEINFO          6
+IFA_MULTICAST          7
+IFA_FLAGS              8