rtnl_neigh: decode ndmsg netlink attributes

* nlattr.c: Include <netinet/in.h> and <arpa/inet.h>.
(decode_nla_be16): New function.
* nlattr.h (decode_nla_be16): New prototype.
* rtnl_neigh.c (decode_neigh_addr,
decode_nda_cacheinfo): New functions.
(ndmsg_nla_decoders): New array.
(decode_ndmsg): Use it.

diff --git a/nlattr.c b/nlattr.c
index 847fa3935b5baf46fef2b4a084eecddb6a2d892f..6f35b99443ce665dc8e41aa6b9bddeeda0ee302e 100644 (file)
--- a/nlattr.c
+++ b/nlattr.c
@@ -31,6 +31,8 @@
 #include <endian.h>
 #include "netlink.h"
 #include "nlattr.h"
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include <linux/sock_diag.h>
 
 static bool
@@ -221,6 +223,22 @@ decode_nla_ifindex(struct tcb *const tcp,
        return true;
 }
 
+bool
+decode_nla_be16(struct tcb *const tcp,
+               const kernel_ulong_t addr,
+               const unsigned int len,
+               const void *const opaque_data)
+{
+       uint16_t num;
+
+       if (len < sizeof(num))
+               return false;
+       else if (!umove_or_printaddr(tcp, addr, &num))
+               tprintf("htons(%u)", ntohs(num));
+
+       return true;
+}
+
 bool
 decode_nla_be64(struct tcb *const tcp,
                const kernel_ulong_t addr,

diff --git a/nlattr.h b/nlattr.h
index db1fd69f27b075c142fdf1034a0ccb6a8bd0072a..09c233e76d0546e470fdf649593e73d16877ba82 100644 (file)
--- a/nlattr.h
+++ b/nlattr.h
@@ -56,6 +56,7 @@ DECL_NLA(s8);
 DECL_NLA(s16);
 DECL_NLA(s32);
 DECL_NLA(s64);
+DECL_NLA(be16);
 DECL_NLA(be64);
 DECL_NLA(str);
 DECL_NLA(strn);

diff --git a/rtnl_neigh.c b/rtnl_neigh.c
index 7191ecbab241a7476270757c508a7835a81424ea..0eaadc593abedfb02b55f4e019d28d7f142d23fe 100644 (file)
--- a/rtnl_neigh.c
+++ b/rtnl_neigh.c
@@ -42,6 +42,54 @@
 #include "xlat/neighbor_cache_entry_states.h"
 #include "xlat/rtnl_neigh_attrs.h"
 
+static bool
+decode_neigh_addr(struct tcb *const tcp,
+                 const kernel_ulong_t addr,
+                 const unsigned int len,
+                 const void *const opaque_data)
+{
+       const struct ndmsg *const ndmsg = opaque_data;
+
+       decode_inet_addr(tcp, addr, len, ndmsg->ndm_family, NULL);
+
+       return true;
+}
+
+static bool
+decode_nda_cacheinfo(struct tcb *const tcp,
+                    const kernel_ulong_t addr,
+                    const unsigned int len,
+                    const void *const opaque_data)
+{
+       struct nda_cacheinfo ci;
+
+       if (len < sizeof(ci))
+               return false;
+       else if (!umove_or_printaddr(tcp, addr, &ci)) {
+               PRINT_FIELD_U("{", ci, ndm_confirmed);
+               PRINT_FIELD_U(", ", ci, ndm_used);
+               PRINT_FIELD_U(", ", ci, ndm_updated);
+               PRINT_FIELD_U(", ", ci, ndm_refcnt);
+               tprints("}");
+       }
+
+       return true;
+}
+
+static const nla_decoder_t ndmsg_nla_decoders[] = {
+       [NDA_DST]               = decode_neigh_addr,
+       [NDA_LLADDR]            = decode_neigh_addr,
+       [NDA_CACHEINFO]         = decode_nda_cacheinfo,
+       [NDA_PROBES]            = decode_nla_u32,
+       [NDA_VLAN]              = decode_nla_u16,
+       [NDA_PORT]              = decode_nla_be16,
+       [NDA_VNI]               = decode_nla_u32,
+       [NDA_IFINDEX]           = decode_nla_ifindex,
+       [NDA_MASTER]            = decode_nla_ifindex,
+       [NDA_LINK_NETNSID]      = decode_nla_u32,
+       [NDA_SRC_VNI]           = NULL,
+};
+
 DECL_NETLINK_ROUTE_DECODER(decode_ndmsg)
 {
        struct ndmsg ndmsg = { .ndm_family = family };
@@ -74,7 +122,9 @@ DECL_NETLINK_ROUTE_DECODER(decode_ndmsg)
        if (decode_nla && len > offset) {
                tprints(", ");
                decode_nlattr(tcp, addr + offset, len - offset,
-                             rtnl_neigh_attrs, "NDA_???", NULL, 0, NULL);
+                             rtnl_neigh_attrs, "NDA_???",
+                             ndmsg_nla_decoders,
+                             ARRAY_SIZE(ndmsg_nla_decoders), &ndmsg);
        }
 }