tests: check decoding of vcpu auxstr

[strace] / rtnl_addr.c

diff --git a/rtnl_addr.c b/rtnl_addr.c
index 905bc14f75fa536e36e7861e8228a7e4dcad6191..6594cc6150a1eb977c16c4dea422a752dac16bff 100644 (file)
--- a/rtnl_addr.c
+++ b/rtnl_addr.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016 Fabien Siron <fabien.siron@epita.fr>
  * Copyright (c) 2017 JingPiao Chen <chenjingpiao@gmail.com>
- * Copyright (c) 2016-2017 The strace developers.
+ * Copyright (c) 2016-2018 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,6 +29,7 @@
 
 #include "defs.h"
 #include "netlink_route.h"
+#include "nlattr.h"
 #include "print_fields.h"
 
 #include "netlink.h"
@@ -39,11 +40,74 @@
 
 #include "xlat/ifaddrflags.h"
 #include "xlat/routing_scopes.h"
+#include "xlat/rtnl_addr_attrs.h"
+
+static bool
+decode_ifa_address(struct tcb *const tcp,
+                  const kernel_ulong_t addr,
+                  const unsigned int len,
+                  const void *const opaque_data)
+{
+       const struct ifaddrmsg *const ifaddr = opaque_data;
+
+       decode_inet_addr(tcp, addr, len, ifaddr->ifa_family, NULL);
+
+       return true;
+}
+
+static bool
+decode_ifa_cacheinfo(struct tcb *const tcp,
+                    const kernel_ulong_t addr,
+                    const unsigned int len,
+                    const void *const opaque_data)
+{
+       struct ifa_cacheinfo ci;
+
+       if (len < sizeof(ci))
+               return false;
+       else if (!umove_or_printaddr(tcp, addr, &ci)) {
+               PRINT_FIELD_U("{", ci, ifa_prefered);
+               PRINT_FIELD_U(", ", ci, ifa_valid);
+               PRINT_FIELD_U(", ", ci, cstamp);
+               PRINT_FIELD_U(", ", ci, tstamp);
+               tprintf("}");
+       }
+
+       return true;
+}
+
+static bool
+decode_ifa_flags(struct tcb *const tcp,
+                const kernel_ulong_t addr,
+                const unsigned int len,
+                const void *const opaque_data)
+{
+       uint32_t ifa_flags;
+
+       if (len < sizeof(ifa_flags))
+               return false;
+       else if (!umove_or_printaddr(tcp, addr, &ifa_flags))
+               printflags(ifaddrflags, ifa_flags, "IFA_F_???");
+
+       return true;
+}
+
+static const nla_decoder_t ifaddrmsg_nla_decoders[] = {
+       [IFA_ADDRESS]   = decode_ifa_address,
+       [IFA_LOCAL]     = decode_ifa_address,
+       [IFA_LABEL]     = decode_nla_str,
+       [IFA_BROADCAST] = decode_ifa_address,
+       [IFA_ANYCAST]   = decode_ifa_address,
+       [IFA_CACHEINFO] = decode_ifa_cacheinfo,
+       [IFA_MULTICAST] = decode_ifa_address,
+       [IFA_FLAGS]     = decode_ifa_flags
+};
 
 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_???");
 
@@ -51,15 +115,25 @@ DECL_NETLINK_ROUTE_DECODER(decode_ifaddrmsg)
        if (len >= sizeof(ifaddr)) {
                if (!umoven_or_printaddr(tcp, addr + offset,
                                         sizeof(ifaddr) - offset,
-                                        (void *) &ifaddr + offset)) {
+                                        (char *) &ifaddr + offset)) {
                        PRINT_FIELD_U("", ifaddr, ifa_prefixlen);
                        PRINT_FIELD_FLAGS(", ", ifaddr, ifa_flags,
                                          ifaddrflags, "IFA_F_???");
                        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_???",
+                             ifaddrmsg_nla_decoders,
+                             ARRAY_SIZE(ifaddrmsg_nla_decoders), &ifaddr);
+       }
 }