* rtnl_addrlabel.c: New file. * Makefile.am (strace_SOURCES): Add it. * netlink_route.h (decode_ifaddrlblmsg): New prototype. * configure.ac (AC_CHECK_HEADERS): Add linux/if_addrlabel.h. (AC_CHECK_TYPES): Check for struct ifaddrlblmsg in <linux/if_addrlabel.h>. * netlink_route.c (route_decoders): Add RTM_DELADDRLABEL, RTM_GETADDRLABEL and RTM_NEWADDRLABEL.
Co-authored-by: Fabien Siron <fabien.si...@epita.fr> --- Makefile.am | 1 + configure.ac | 3 +++ netlink_route.c | 8 +++++++- netlink_route.h | 1 + rtnl_addrlabel.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 rtnl_addrlabel.c diff --git a/Makefile.am b/Makefile.am index e4bafbd..5d45bfb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -248,6 +248,7 @@ strace_SOURCES = \ rt_sigreturn.c \ rtc.c \ rtnl_addr.c \ + rtnl_addrlabel.c \ rtnl_link.c \ rtnl_neigh.c \ rtnl_neightbl.c \ diff --git a/configure.ac b/configure.ac index 4a5c64c..ab379fc 100644 --- a/configure.ac +++ b/configure.ac @@ -382,6 +382,7 @@ AC_CHECK_HEADERS(m4_normalize([ linux/genetlink.h linux/hiddev.h linux/if_addr.h + linux/if_addrlabel.h linux/ip_vs.h linux/ipc.h linux/mmtimer.h @@ -442,6 +443,8 @@ AC_CHECK_HEADERS([linux/bpf.h], [ st_CHECK_UNION_BPF_ATTR([prog_flags]) ]) +AC_CHECK_TYPES([struct ifaddrlblmsg],,, [#include <linux/if_addrlabel.h>]) + AC_CHECK_TYPES([struct statfs], [ AC_CHECK_MEMBERS([struct statfs.f_frsize],,, [#include <linux/types.h> #include <asm/statfs.h>]) diff --git a/netlink_route.c b/netlink_route.c index c6986a4..1208bf8 100644 --- a/netlink_route.c +++ b/netlink_route.c @@ -91,7 +91,13 @@ static const netlink_route_decoder_t route_decoders[] = { [RTM_DELACTION - RTM_BASE] = decode_tcamsg, [RTM_GETACTION - RTM_BASE] = decode_tcamsg, - [RTM_NEWACTION - RTM_BASE] = decode_tcamsg + [RTM_NEWACTION - RTM_BASE] = decode_tcamsg, + +#ifdef HAVE_STRUCT_IFADDRLBLMSG + [RTM_DELADDRLABEL - RTM_BASE] = decode_ifaddrlblmsg, + [RTM_GETADDRLABEL - RTM_BASE] = decode_ifaddrlblmsg, + [RTM_NEWADDRLABEL - RTM_BASE] = decode_ifaddrlblmsg +#endif }; bool diff --git a/netlink_route.h b/netlink_route.h index 3789e07..d172f01 100644 --- a/netlink_route.h +++ b/netlink_route.h @@ -40,6 +40,7 @@ route_decode_name(struct tcb *tcp, \ /* End of DECL_NETLINK_ROUTE_DECODER definition. */ extern DECL_NETLINK_ROUTE_DECODER(decode_fib_rule_hdr); +extern DECL_NETLINK_ROUTE_DECODER(decode_ifaddrlblmsg); extern DECL_NETLINK_ROUTE_DECODER(decode_ifaddrmsg); extern DECL_NETLINK_ROUTE_DECODER(decode_ifinfomsg); extern DECL_NETLINK_ROUTE_DECODER(decode_ndmsg); diff --git a/rtnl_addrlabel.c b/rtnl_addrlabel.c new file mode 100644 index 0000000..685e04d --- /dev/null +++ b/rtnl_addrlabel.c @@ -0,0 +1,61 @@ +/* + * 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_IF_ADDRLABEL_H + +# include "netlink_route.h" +# include "print_fields.h" + +# include <linux/if_addrlabel.h> + +DECL_NETLINK_ROUTE_DECODER(decode_ifaddrlblmsg) +{ + struct ifaddrlblmsg ifal = { .ifal_family = family }; + const size_t offset = sizeof(ifal.ifal_family); + + PRINT_FIELD_XVAL("{", ifal, ifal_family, addrfams, "AF_???"); + + tprints(", "); + if (len >= sizeof(ifal)) { + if (!umoven_or_printaddr(tcp, addr + offset, + sizeof(ifal) - offset, + (void *) &ifal + offset)) { + PRINT_FIELD_U("", ifal, ifal_prefixlen); + PRINT_FIELD_U(", ", ifal, ifal_flags); + PRINT_FIELD_IFINDEX(", ", ifal, ifal_index); + PRINT_FIELD_U(", ", ifal, ifal_seq); + } + } else + tprints("..."); + 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