diff --git a/Makefile.am b/Makefile.am index 5d535fac..0c6e2f33 100644 --- a/Makefile.am +++ b/Makefile.am @@ -249,6 +249,7 @@ strace_SOURCES = \ rtc.c \ rtnl_addr.c \ rtnl_link.c \ + rtnl_neigh.c \ rtnl_route.c \ rtnl_rule.c \ sched.c \ diff --git a/configure.ac b/configure.ac index 1be4e81f..4a5c64c7 100644 --- a/configure.ac +++ b/configure.ac @@ -386,6 +386,7 @@ AC_CHECK_HEADERS(m4_normalize([ linux/ipc.h linux/mmtimer.h linux/msg.h + linux/neighbour.h linux/netfilter/nfnetlink.h linux/nsfs.h linux/perf_event.h diff --git a/netlink_route.c b/netlink_route.c index 87766263..c90d0f17 100644 --- a/netlink_route.c +++ b/netlink_route.c @@ -69,7 +69,11 @@ static const netlink_route_decoder_t route_decoders[] = { [RTM_DELRULE - RTM_BASE] = decode_fib_rule_hdr, [RTM_GETRULE - RTM_BASE] = decode_fib_rule_hdr, - [RTM_NEWRULE - RTM_BASE] = decode_fib_rule_hdr + [RTM_NEWRULE - RTM_BASE] = decode_fib_rule_hdr, + + [RTM_DELNEIGH - RTM_BASE] = decode_ndmsg, + [RTM_GETNEIGH - RTM_BASE] = decode_rtm_getneigh, + [RTM_NEWNEIGH - RTM_BASE] = decode_ndmsg }; bool diff --git a/netlink_route.h b/netlink_route.h index 0d89bcdf..60e9e754 100644 --- a/netlink_route.h +++ b/netlink_route.h @@ -42,6 +42,8 @@ route_decode_name(struct tcb *tcp, \ 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_rtm_getneigh); extern DECL_NETLINK_ROUTE_DECODER(decode_rtmsg); #endif /* !STRACE_NETLINK_ROUTE_H */ diff --git a/rtnl_neigh.c b/rtnl_neigh.c new file mode 100644 index 00000000..c10fc979 --- /dev/null +++ b/rtnl_neigh.c @@ -0,0 +1,77 @@ +/* + * 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 + +#include "xlat/nda_types.h" +#include "xlat/neighbor_cache_entry_flags.h" +#include "xlat/neighbor_cache_entry_states.h" + +DECL_NETLINK_ROUTE_DECODER(decode_ndmsg) +{ + struct ndmsg ndmsg = { .ndm_family = family }; + const size_t offset = sizeof(ndmsg.ndm_family); + + PRINT_FIELD_XVAL("{", ndmsg, ndm_family, addrfams, "AF_???"); + + tprints(", "); + if (len >= sizeof(ndmsg)) { + if (!umoven_or_printaddr(tcp, addr + offset, + sizeof(ndmsg) - offset, + (void *) &ndmsg + offset)) { + PRINT_FIELD_IFINDEX("", ndmsg, ndm_ifindex); + PRINT_FIELD_FLAGS(", ", ndmsg, ndm_state, + neighbor_cache_entry_states, + "NUD_???"); + PRINT_FIELD_FLAGS(", ", ndmsg, ndm_flags, + neighbor_cache_entry_flags, + "NTF_???"); + PRINT_FIELD_XVAL(", ", ndmsg, ndm_type, + nda_types, "NDA_???"); + } + } else + tprints("..."); + tprints("}"); +} + +DECL_NETLINK_ROUTE_DECODER(decode_rtm_getneigh) +{ + if (family == AF_BRIDGE) + decode_ifinfomsg(tcp, nlmsghdr, family, addr, len); + else + decode_ndmsg(tcp, nlmsghdr, family, addr, len); +} diff --git a/xlat/nda_types.in b/xlat/nda_types.in new file mode 100644 index 00000000..fed013a1 --- /dev/null +++ b/xlat/nda_types.in @@ -0,0 +1,12 @@ +NDA_UNSPEC 0 +NDA_DST 1 +NDA_LLADDR 2 +NDA_CACHEINFO 3 +NDA_PROBES 4 +NDA_VLAN 5 +NDA_PORT 6 +NDA_VNI 7 +NDA_IFINDEX 8 +NDA_MASTER 9 +NDA_LINK_NETNSID 10 +NDA_SRC_VNI 11 diff --git a/xlat/neighbor_cache_entry_flags.in b/xlat/neighbor_cache_entry_flags.in new file mode 100644 index 00000000..6a210f52 --- /dev/null +++ b/xlat/neighbor_cache_entry_flags.in @@ -0,0 +1,6 @@ +NTF_USE +NTF_SELF +NTF_MASTER +NTF_PROXY +NTF_EXT_LEARNED +NTF_ROUTER diff --git a/xlat/neighbor_cache_entry_states.in b/xlat/neighbor_cache_entry_states.in new file mode 100644 index 00000000..5ae9c4da --- /dev/null +++ b/xlat/neighbor_cache_entry_states.in @@ -0,0 +1,9 @@ +NUD_INCOMPLETE +NUD_REACHABLE +NUD_STALE +NUD_DELAY +NUD_PROBE +NUD_FAILED +NUD_NOARP +NUD_PERMANENT +NUD_NONE