summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChen Jingpiao <chenjingpiao@gmail.com>2018-03-10 09:44:35 +0800
committerDmitry V. Levin <ldv@altlinux.org>2018-03-11 14:49:25 +0000
commit547b90e239fd85338fe70f690d52bbc1f47b90bf (patch)
tree7dbe09f1830e3a8442b6e9a1adbd773a1994009c
parent91497f718e58aa0b5b1a79c3ccbacf90f0e84e9e (diff)
downloadstrace-547b90e239fd85338fe70f690d52bbc1f47b90bf.tar.gz
Move nl_netfilter_msg_types definition from netlink.c to netlink_netfilter.c
The side effect of #include "xlat/nl_netfilter_msg_types.h" is NFNL_MSG_BATCH_* constants properly defined in that header file. While netlink.c does not use these constants itself, netlink_netfilter.c is going to need them soon. * defs.h (nl_netfilter_msg_types): New xlat prototype. * netlink.c: Move inclusion of "xlat/nl_netfilter_msg_types.h" ... * netlink_netfilter.c: ... here.
-rw-r--r--defs.h1
-rw-r--r--netlink.c1
-rw-r--r--netlink_netfilter.c1
3 files changed, 2 insertions, 1 deletions
diff --git a/defs.h b/defs.h
index 0597ddec1..34261e4b9 100644
--- a/defs.h
+++ b/defs.h
@@ -296,6 +296,7 @@ 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_netfilter_msg_types[];
extern const struct xlat nl_route_types[];
extern const struct xlat open_access_modes[];
extern const struct xlat open_mode_flags[];
diff --git a/netlink.c b/netlink.c
index f5fa1f13a..038352e0d 100644
--- a/netlink.c
+++ b/netlink.c
@@ -53,7 +53,6 @@
#include "xlat/nf_ulog_msg_types.h"
#include "xlat/nl_audit_types.h"
#include "xlat/nl_crypto_types.h"
-#include "xlat/nl_netfilter_msg_types.h"
#include "xlat/nl_netfilter_subsys_ids.h"
#include "xlat/nl_selinux_types.h"
#include "xlat/nl_sock_diag_types.h"
diff --git a/netlink_netfilter.c b/netlink_netfilter.c
index a6028a1e5..eb361ed77 100644
--- a/netlink_netfilter.c
+++ b/netlink_netfilter.c
@@ -38,6 +38,7 @@
# include <linux/netfilter/nfnetlink.h>
# include "xlat/netfilter_versions.h"
+# include "xlat/nl_netfilter_msg_types.h"
# include "xlat/nl_netfilter_subsys_ids.h"
bool