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 0597ddec18711f59a05ab620f2a768904fb47da9..34261e4b9073004f50b120c846b094dbf9a06546 100644 (file)
--- 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 f5fa1f13a5de2880d75eab2c62becf3cd2968c1b..038352e0dfc736c537bd1e3e251c5651843908a7 100644 (file)
--- 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 a6028a1e5b9b3a70a1e13b611f8b666fd2c12bb6..eb361ed77ffa495d35788dbb52d3ee34f5716b85 100644 (file)
--- 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