netlink: add a basic rtnetlink parser of neightbl messages

* rtnl_neightbl.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* netlink_route.h (decode_ndtmsg): New prototype.
* netlink_route.c (route_decoders): Add RTM_GETNEIGHTBL,
RTM_NEWNEIGHTBL, and RTM_SETNEIGHTBL.

Co-authored-by: Fabien Siron <fabien.siron@epita.fr>

diff --git a/Makefile.am b/Makefile.am
index 0c6e2f3346d2dabc6e5ac437113b56567cfcc3a4..89f1f0d48cecccb84e11ed1b8683c7288825996f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -250,6 +250,7 @@ strace_SOURCES =    \
        rtnl_addr.c     \
        rtnl_link.c     \
        rtnl_neigh.c    \
+       rtnl_neightbl.c \
        rtnl_route.c    \
        rtnl_rule.c     \
        sched.c         \

diff --git a/netlink_route.c b/netlink_route.c
index c90d0f177cc2052df39608412dad1c2f29fb9760..13b6c29c5f77eec6238d0393b31f8bceb53066a7 100644 (file)
--- a/netlink_route.c
+++ b/netlink_route.c
@@ -73,7 +73,11 @@ static const netlink_route_decoder_t route_decoders[] = {
 
        [RTM_DELNEIGH - RTM_BASE] = decode_ndmsg,
        [RTM_GETNEIGH - RTM_BASE] = decode_rtm_getneigh,
-       [RTM_NEWNEIGH - RTM_BASE] = decode_ndmsg
+       [RTM_NEWNEIGH - RTM_BASE] = decode_ndmsg,
+
+       [RTM_GETNEIGHTBL - RTM_BASE] = decode_ndtmsg,
+       [RTM_NEWNEIGHTBL - RTM_BASE] = decode_ndtmsg,
+       [RTM_SETNEIGHTBL - RTM_BASE] = decode_ndtmsg
 };
 
 bool

diff --git a/netlink_route.h b/netlink_route.h
index 60e9e754e92b5be32942e91d7d43319c062e0813..32972c24f899df6e96873198c2f1de61760af6ed 100644 (file)
--- a/netlink_route.h
+++ b/netlink_route.h
@@ -43,6 +43,7 @@ extern DECL_NETLINK_ROUTE_DECODER(decode_fib_rule_hdr);
 extern DECL_NETLINK_ROUTE_DECODER(decode_ifaddrmsg);
 extern DECL_NETLINK_ROUTE_DECODER(decode_ifinfomsg);
 extern DECL_NETLINK_ROUTE_DECODER(decode_ndmsg);
+extern DECL_NETLINK_ROUTE_DECODER(decode_ndtmsg);
 extern DECL_NETLINK_ROUTE_DECODER(decode_rtm_getneigh);
 extern DECL_NETLINK_ROUTE_DECODER(decode_rtmsg);
 

diff --git a/rtnl_neightbl.c b/rtnl_neightbl.c
new file mode 100644 (file)
index 0000000..ef0b138
--- /dev/null
+++ b/rtnl_neightbl.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2016 Fabien Siron <fabien.siron@epita.fr>
+ * Copyright (c) 2017 JingPiao Chen <chenjingpiao@gmail.com>
+ * Copyright (c) 2016-2017 The strace developers.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "defs.h"
+#include "netlink_route.h"
+#include "print_fields.h"
+
+#include "netlink.h"
+#include <linux/rtnetlink.h>
+#ifdef HAVE_LINUX_NEIGHBOUR_H
+# include <linux/neighbour.h>
+#endif
+
+DECL_NETLINK_ROUTE_DECODER(decode_ndtmsg)
+{
+       struct ndtmsg ndtmsg = { .ndtm_family = family };
+
+       PRINT_FIELD_XVAL("{", ndtmsg, ndtm_family, addrfams, "AF_???");
+       tprints("}");
+}