* netlink_route.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* defs.h (ip_type_of_services): New xlat prototype.
* netlink_route.h (decode_fib_rule_hdr): New prototype.
* configure.ac (AC_CHECK_HEADERS): Add linux/fib_rules.h.
(AC_CHECK_TYPES): Check for struct fib_rule_hdr in <linux/fib_rules.h>.
* netlink_route.c (route_decoders): Add RTM_DELRULE,
RTM_GETRULE and RTM_NEWRULE.
* xlat/fib_rule_actions.in: New file.
* xlat/fib_rule_flags.in: Likewise.
Co-authored-by: Fabien Siron <fabien.si...@epita.fr>
---
Makefile.am | 1 +
configure.ac | 3 +++
defs.h | 1 +
netlink_route.c | 12 ++++++++-
netlink_route.h | 1 +
rtnl_rule.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++
xlat/fib_rule_actions.in | 9 +++++++
xlat/fib_rule_flags.in | 6 +++++
8 files changed, 100 insertions(+), 1 deletion(-)
create mode 100644 rtnl_rule.c
create mode 100644 xlat/fib_rule_actions.in
create mode 100644 xlat/fib_rule_flags.in
diff --git a/Makefile.am b/Makefile.am
index 55951f4..404a620 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -250,6 +250,7 @@ strace_SOURCES = \
rtnl_addr.c \
rtnl_link.c \
rtnl_route.c \
+ rtnl_rule.c \
sched.c \
sched_attr.h \
scsi.c \
diff --git a/configure.ac b/configure.ac
index f9ff08e..6948cd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -373,6 +373,7 @@ AC_CHECK_HEADERS(m4_normalize([
linux/dm-ioctl.h
linux/dqblk_xfs.h
linux/falloc.h
+ linux/fib_rules.h
linux/fiemap.h
linux/genetlink.h
linux/hiddev.h
@@ -436,6 +437,8 @@ AC_CHECK_HEADERS([linux/bpf.h], [
st_CHECK_UNION_BPF_ATTR([prog_flags])
])
+AC_CHECK_TYPES([struct fib_rule_hdr],,, [#include <linux/fib_rules.h>])
+
AC_CHECK_TYPES([struct statfs], [
AC_CHECK_MEMBERS([struct statfs.f_frsize],,, [#include <linux/types.h>
#include <asm/statfs.h>])
diff --git a/defs.h b/defs.h
index 2efbfa3..657bb5e 100644
--- a/defs.h
+++ b/defs.h
@@ -292,6 +292,7 @@ extern const struct xlat ethernet_protocols[];
extern const struct xlat evdev_abs[];
extern const struct xlat iffflags[];
extern const struct xlat inet_protocols[];
+extern const struct xlat ip_type_of_services[];
extern const struct xlat msg_flags[];
extern const struct xlat netlink_protocols[];
extern const struct xlat nl_route_types[];
diff --git a/netlink_route.c b/netlink_route.c
index e32d832..654d081 100644
--- a/netlink_route.c
+++ b/netlink_route.c
@@ -65,7 +65,17 @@ static const netlink_route_decoder_t route_decoders[] = {
[RTM_DELROUTE - RTM_BASE] = decode_rtmsg,
[RTM_GETROUTE - RTM_BASE] = decode_rtmsg,
- [RTM_NEWROUTE - RTM_BASE] = decode_rtmsg
+ [RTM_NEWROUTE - RTM_BASE] = decode_rtmsg,
+
+#ifdef HAVE_STRUCT_FIB_RULE_HDR
+ [RTM_DELRULE - RTM_BASE] = decode_fib_rule_hdr,
+ [RTM_GETRULE - RTM_BASE] = decode_fib_rule_hdr,
+ [RTM_NEWRULE - RTM_BASE] = decode_fib_rule_hdr
+#else
+ [RTM_DELRULE - RTM_BASE] = decode_rtmsg,
+ [RTM_GETRULE - RTM_BASE] = decode_rtmsg,
+ [RTM_NEWRULE - RTM_BASE] = decode_rtmsg
+#endif
};
bool
diff --git a/netlink_route.h b/netlink_route.h
index 02d3789..0d89bcd 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_fib_rule_hdr);
extern DECL_NETLINK_ROUTE_DECODER(decode_ifaddrmsg);
extern DECL_NETLINK_ROUTE_DECODER(decode_ifinfomsg);
extern DECL_NETLINK_ROUTE_DECODER(decode_rtmsg);
diff --git a/rtnl_rule.c b/rtnl_rule.c
new file mode 100644
index 0000000..a20e57c
--- /dev/null
+++ b/rtnl_rule.c
@@ -0,0 +1,68 @@
+/*
+ * 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_FIB_RULES_H
+
+# include "netlink_route.h"
+# include "print_fields.h"
+
+# include <linux/fib_rules.h>
+
+# include "xlat/fib_rule_actions.h"
+# include "xlat/fib_rule_flags.h"
+
+DECL_NETLINK_ROUTE_DECODER(decode_fib_rule_hdr)
+{
+ struct fib_rule_hdr frh = { .family = family };
+ const size_t offset = sizeof(frh.family);
+
+ PRINT_FIELD_XVAL("{", frh, family, addrfams, "AF_???");
+
+ tprints(", ");
+ if (len >= sizeof(frh)) {
+ if (!umoven_or_printaddr(tcp, addr + offset,
+ sizeof(frh) - offset,
+ (void *) &frh + offset)) {
+ PRINT_FIELD_U("", frh, dst_len);
+ PRINT_FIELD_U(", ", frh, src_len);
+ PRINT_FIELD_FLAGS(", ", frh, tos, ip_type_of_services,
+ "IPTOS_TOS_???");
+ PRINT_FIELD_XVAL(", ", frh, action,
+ fib_rule_actions, "FR_ACT_???");
+ PRINT_FIELD_FLAGS(", ", frh, flags,
+ fib_rule_flags, "FIB_RULE_???");
+ }
+ } else
+ tprints("...");
+ tprints("}");
+}
+
+#endif
diff --git a/xlat/fib_rule_actions.in b/xlat/fib_rule_actions.in
new file mode 100644
index 0000000..55d5912
--- /dev/null
+++ b/xlat/fib_rule_actions.in
@@ -0,0 +1,9 @@
+FR_ACT_UNSPEC 0
+FR_ACT_TO_TBL 1
+FR_ACT_GOTO 2
+FR_ACT_NOP 3
+FR_ACT_RES3 4
+FR_ACT_RES4 5
+FR_ACT_BLACKHOLE 6
+FR_ACT_UNREACHABLE 7
+FR_ACT_PROHIBIT 8
diff --git a/xlat/fib_rule_flags.in b/xlat/fib_rule_flags.in
new file mode 100644
index 0000000..8f4d42c
--- /dev/null
+++ b/xlat/fib_rule_flags.in
@@ -0,0 +1,6 @@
+FIB_RULE_PERMANENT
+FIB_RULE_INVERT
+FIB_RULE_UNRESOLVED
+FIB_RULE_IIF_DETACHED
+FIB_RULE_OIF_DETACHED
+FIB_RULE_FIND_SADDR
--
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
