From: Chen Jingpiao <chenjingpiao@gmail.com>
Date: Sat, 10 Mar 2018 01:44:35 +0000 (+0800)
Subject: Move nl_netfilter_msg_types definition from netlink.c to netlink_netfilter.c
X-Git-Tag: v4.22~96
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=547b90e239fd85338fe70f690d52bbc1f47b90bf;p=strace

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.
---

diff --git a/defs.h b/defs.h
index 0597ddec..34261e4b 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 f5fa1f13..038352e0 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 a6028a1e..eb361ed7 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