Re: [PATCH v2 05/25] netlink: add a basic rtnetlink parser of rule messages

[Dmitry V. Levin]

On Sun, Aug 13, 2017 at 10:22:23AM +0800, JingPiao Chen wrote:
> * defs.h (routing_table_ids): New xlat prototype.
> * netlink_route.c: New file.
> * Makefile.am (strace_SOURCES): Add it.
> * defs.h (ip_type_of_services,
> routing_table_ids): New xlat prototypes.
> * netlink_route.h (decode_fib_rule_hdr): New prototype.
> * configure.ac (AC_CHECK_HEADERS): Add 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.
[...]
> +#include "defs.h"
> +
> +#include "netlink_route.h"
> +#include "print_fields.h"
> +
> +#ifdef HAVE_LINUX_FIB_RULES_H
> +# include 
> +#endif
> +
> +#include "xlat/fib_rule_actions.h"
> +#include "xlat/fib_rule_flags.h"
> +
> +DECL_NETLINK_ROUTE_DECODER(decode_fib_rule_hdr)
> +{
> + /*
> +  * struct rtmsg and struct fib_rule_hdr are essentially
> +  * the same structure, use struct rtmsg but treat it as
> +  * struct fib_rule_hdr.
> +  */
> + struct rtmsg msg = { .rtm_family = family };

If  is not available, then  has to be
used, otherwise the code won't compile on older systems.


-- 
ldv


signature.asc
Description: PGP signature
--
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

[PATCH v2 05/25] netlink: add a basic rtnetlink parser of rule messages

[JingPiao Chen]

* defs.h (routing_table_ids): New xlat prototype.
* netlink_route.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* defs.h (ip_type_of_services,
routing_table_ids): New xlat prototypes.
* netlink_route.h (decode_fib_rule_hdr): New prototype.
* configure.ac (AC_CHECK_HEADERS): Add 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 
---
 Makefile.am  |  1 +
 configure.ac |  1 +
 defs.h   |  2 ++
 netlink_route.c  |  6 +++-
 netlink_route.h  |  1 +
 rtnl_rule.c  | 76 
 xlat/fib_rule_actions.in |  9 ++
 xlat/fib_rule_flags.in   |  6 
 8 files changed, 101 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 cea4d94..5d535fa 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 d213a46..1be4e81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -377,6 +377,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
diff --git a/defs.h b/defs.h
index 8ce28c4..e6659a5 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[];
@@ -299,6 +300,7 @@ extern const struct xlat open_access_modes[];
 extern const struct xlat open_mode_flags[];
 extern const struct xlat resource_flags[];
 extern const struct xlat routing_scopes[];
+extern const struct xlat routing_table_ids[];
 extern const struct xlat setns_types[];
 extern const struct xlat sg_io_info[];
 extern const struct xlat socketlayers[];
diff --git a/netlink_route.c b/netlink_route.c
index e32d832..8776626 100644
--- a/netlink_route.c
+++ b/netlink_route.c
@@ -65,7 +65,11 @@ 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,
+
+   [RTM_DELRULE - RTM_BASE] = decode_fib_rule_hdr,
+   [RTM_GETRULE - RTM_BASE] = decode_fib_rule_hdr,
+   [RTM_NEWRULE - RTM_BASE] = decode_fib_rule_hdr
 };
 
 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 000..a0d0ff1
--- /dev/null
+++ b/rtnl_rule.c
@@ -0,0 +1,76 @@
+/*
+ * 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