From 00e48349a952fdf6258e292c1801ccf819832086 Mon Sep 17 00:00:00 2001 From: JingPiao Chen Date: Sun, 13 Aug 2017 10:22:27 +0800 Subject: [PATCH] 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 --- Makefile.am | 1 + netlink_route.c | 6 +++++- netlink_route.h | 1 + rtnl_neightbl.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 rtnl_neightbl.c diff --git a/Makefile.am b/Makefile.am index 0c6e2f33..89f1f0d4 100644 --- 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 c90d0f17..13b6c29c 100644 --- 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 60e9e754..32972c24 100644 --- 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 index 00000000..ef0b138f --- /dev/null +++ b/rtnl_neightbl.c @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2016 Fabien Siron + * Copyright (c) 2017 JingPiao Chen + * 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 +#ifdef HAVE_LINUX_NEIGHBOUR_H +# include +#endif + +DECL_NETLINK_ROUTE_DECODER(decode_ndtmsg) +{ + struct ndtmsg ndtmsg = { .ndtm_family = family }; + + PRINT_FIELD_XVAL("{", ndtmsg, ndtm_family, addrfams, "AF_???"); + tprints("}"); +} -- 2.40.0