* rtnl_netconf.c: New file. * Makefile.am (strace_SOURCES): Add it. * netlink_route.h (decode_netconfmsg): New prototype. * configure.ac (AC_CHECK_HEADERS): Add linux/netconf.h. (AC_CHECK_TYPES): Check for struct netconfmsg in <linux/netconf.h>. * netlink_route.c (route_decoders): Add RTM_GETNETCONF and RTM_NEWNETCONF.
Co-authored-by: Fabien Siron <fabien.si...@epita.fr> --- Makefile.am | 1 + configure.ac | 2 ++ netlink_route.c | 8 +++++++- netlink_route.h | 1 + rtnl_netconf.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 rtnl_netconf.c diff --git a/Makefile.am b/Makefile.am index 1a21c38..2c027e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -253,6 +253,7 @@ strace_SOURCES = \ rtnl_link.c \ rtnl_neigh.c \ rtnl_neightbl.c \ + rtnl_netconf.c \ rtnl_route.c \ rtnl_rule.c \ rtnl_tc.c \ diff --git a/configure.ac b/configure.ac index 5889296..abd9a62 100644 --- a/configure.ac +++ b/configure.ac @@ -385,6 +385,7 @@ AC_CHECK_HEADERS(m4_normalize([ linux/mmtimer.h linux/msg.h linux/neighbour.h + linux/netconf.h linux/netfilter/nfnetlink.h linux/nsfs.h linux/perf_event.h @@ -443,6 +444,7 @@ AC_CHECK_HEADERS([linux/bpf.h], [ AC_CHECK_TYPES([struct dcbmsg],,, [#include <linux/dcbnl.h>]) AC_CHECK_TYPES([struct fib_rule_hdr],,, [#include <linux/fib_rules.h>]) AC_CHECK_TYPES([struct ifaddrlblmsg],,, [#include <linux/if_addrlabel.h>]) +AC_CHECK_TYPES([struct netconfmsg],,, [#include <linux/netconf.h>]) AC_CHECK_TYPES([struct statfs], [ AC_CHECK_MEMBERS([struct statfs.f_frsize],,, [#include <linux/types.h> diff --git a/netlink_route.c b/netlink_route.c index 1f2c003..8be0be1 100644 --- a/netlink_route.c +++ b/netlink_route.c @@ -107,7 +107,13 @@ static const netlink_route_decoder_t route_decoders[] = { #ifdef HAVE_STRUCT_DCBMSG [RTM_GETDCB - RTM_BASE] = decode_dcbmsg, - [RTM_SETDCB - RTM_BASE] = decode_dcbmsg + [RTM_SETDCB - RTM_BASE] = decode_dcbmsg, +#endif + +#ifdef HAVE_STRUCT_NETCONFMSG + [RTM_DELNETCONF - RTM_BASE] = decode_netconfmsg, + [RTM_GETNETCONF - RTM_BASE] = decode_netconfmsg, + [RTM_NEWNETCONF - RTM_BASE] = decode_netconfmsg #endif }; diff --git a/netlink_route.h b/netlink_route.h index 7c1b711..497ecc1 100644 --- a/netlink_route.h +++ b/netlink_route.h @@ -46,6 +46,7 @@ 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_netconfmsg); extern DECL_NETLINK_ROUTE_DECODER(decode_rtm_getneigh); extern DECL_NETLINK_ROUTE_DECODER(decode_rtmsg); extern DECL_NETLINK_ROUTE_DECODER(decode_tcamsg); diff --git a/rtnl_netconf.c b/rtnl_netconf.c new file mode 100644 index 0000000..e44bbed --- /dev/null +++ b/rtnl_netconf.c @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2016 Fabien Siron <fabien.si...@epita.fr> + * Copyright (c) 2017 JingPiao Chen <chenjingp...@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" + +#ifdef HAVE_LINUX_NETCONF_H + +# include "netlink_route.h" +# include "print_fields.h" + +# include <linux/netconf.h> + +DECL_NETLINK_ROUTE_DECODER(decode_netconfmsg) +{ + struct netconfmsg ncm = { .ncm_family = family }; + + PRINT_FIELD_XVAL("{", ncm, ncm_family, addrfams, "AF_???"); + tprints("}"); +} + +#endif -- 2.7.4 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel