* rtnl_addr.c: New file. * Makefile.am (strace_SOURCES): Add it. * configure.ac (AC_CHECK_HEADERS): Add linux/if_addr.h. * netlink_route.h (decode_ifaddrmsg): New prototype. * netlink_route.c (route_decoders): Add RTM_DELADDR, RTM_GETADDR, RTM_GETANYCAST, RTM_GETMULTICAST add RTM_NEWADDR. * xlat/ifaddrflags.in: New file. * xlat/routing_scopes.in: Likewise.
Co-authored-by: Fabien Siron <fabien.si...@epita.fr> --- Makefile.am | 1 + configure.ac | 1 + netlink_route.c | 8 ++++++- netlink_route.h | 1 + rtnl_addr.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ xlat/ifaddrflags.in | 12 ++++++++++ xlat/routing_scopes.in | 5 ++++ 7 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 rtnl_addr.c create mode 100644 xlat/ifaddrflags.in create mode 100644 xlat/routing_scopes.in diff --git a/Makefile.am b/Makefile.am index 5ec0fa3..ff11a91 100644 --- a/Makefile.am +++ b/Makefile.am @@ -247,6 +247,7 @@ strace_SOURCES = \ rt_sigframe.c \ rt_sigreturn.c \ rtc.c \ + rtnl_addr.c \ rtnl_link.c \ sched.c \ sched_attr.h \ diff --git a/configure.ac b/configure.ac index 67ec7fe..d213a46 100644 --- a/configure.ac +++ b/configure.ac @@ -380,6 +380,7 @@ AC_CHECK_HEADERS(m4_normalize([ linux/fiemap.h linux/genetlink.h linux/hiddev.h + linux/if_addr.h linux/ip_vs.h linux/ipc.h linux/mmtimer.h diff --git a/netlink_route.c b/netlink_route.c index f6d569b..5e3ed24 100644 --- a/netlink_route.c +++ b/netlink_route.c @@ -55,7 +55,13 @@ static const netlink_route_decoder_t route_decoders[] = { [RTM_DELLINK - RTM_BASE] = decode_ifinfomsg, [RTM_GETLINK - RTM_BASE] = decode_ifinfomsg, [RTM_NEWLINK - RTM_BASE] = decode_ifinfomsg, - [RTM_SETLINK - RTM_BASE] = decode_ifinfomsg + [RTM_SETLINK - RTM_BASE] = decode_ifinfomsg, + + [RTM_DELADDR - RTM_BASE] = decode_ifaddrmsg, + [RTM_GETADDR - RTM_BASE] = decode_ifaddrmsg, + [RTM_GETANYCAST - RTM_BASE] = decode_ifaddrmsg, + [RTM_GETMULTICAST - RTM_BASE] = decode_ifaddrmsg, + [RTM_NEWADDR - RTM_BASE] = decode_ifaddrmsg }; bool diff --git a/netlink_route.h b/netlink_route.h index cc2b5c2..f644d61 100644 --- a/netlink_route.h +++ b/netlink_route.h @@ -39,6 +39,7 @@ route_decode_name(struct tcb *tcp, \ unsigned int len) \ /* End of DECL_NETLINK_ROUTE_DECODER definition. */ +extern DECL_NETLINK_ROUTE_DECODER(decode_ifaddrmsg); extern DECL_NETLINK_ROUTE_DECODER(decode_ifinfomsg); #endif /* !STRACE_NETLINK_ROUTE_H */ diff --git a/rtnl_addr.c b/rtnl_addr.c new file mode 100644 index 0000000..689c18e --- /dev/null +++ b/rtnl_addr.c @@ -0,0 +1,63 @@ +/* + * 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" +#include "netlink_route.h" +#include "print_fields.h" + +#ifdef HAVE_LINUX_IF_ADDR_H +# include <linux/if_addr.h> +#endif + +#include "xlat/ifaddrflags.h" +#include "xlat/routing_scopes.h" + +DECL_NETLINK_ROUTE_DECODER(decode_ifaddrmsg) +{ + struct ifaddrmsg ifaddr = { .ifa_family = family }; + const size_t offset = sizeof(ifaddr.ifa_family); + + PRINT_FIELD_XVAL("{", ifaddr, ifa_family, addrfams, "AF_???"); + + tprints(", "); + if (len >= sizeof(ifaddr)) { + if (!umoven_or_printaddr(tcp, addr + offset, + sizeof(ifaddr) - offset, + (void *) &ifaddr + offset)) { + PRINT_FIELD_U("", ifaddr, ifa_prefixlen); + PRINT_FIELD_FLAGS(", ", ifaddr, ifa_flags, + ifaddrflags, "IFA_F_???"); + PRINT_FIELD_XVAL(", ", ifaddr, ifa_scope, + routing_scopes, NULL); + PRINT_FIELD_IFINDEX(", ", ifaddr, ifa_index); + } + } else + tprints("..."); + tprints("}"); +} diff --git a/xlat/ifaddrflags.in b/xlat/ifaddrflags.in new file mode 100644 index 0000000..19df46b --- /dev/null +++ b/xlat/ifaddrflags.in @@ -0,0 +1,12 @@ +IFA_F_SECONDARY +IFA_F_NODAD +IFA_F_OPTIMISTIC +IFA_F_DADFAILED +IFA_F_HOMEADDRESS +IFA_F_DEPRECATED +IFA_F_TENTATIVE +IFA_F_PERMANENT +IFA_F_MANAGETEMPADDR +IFA_F_NOPREFIXROUTE +IFA_F_MCAUTOJOIN +IFA_F_STABLE_PRIVACY diff --git a/xlat/routing_scopes.in b/xlat/routing_scopes.in new file mode 100644 index 0000000..c431e9f --- /dev/null +++ b/xlat/routing_scopes.in @@ -0,0 +1,5 @@ +RT_SCOPE_UNIVERSE 0 +RT_SCOPE_SITE 200 +RT_SCOPE_LINK 253 +RT_SCOPE_HOST 254 +RT_SCOPE_NOWHERE 255 -- 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