diff mbox series

[conntrack-tools,1/3] conntrack: pass filter_dump object to nfct_mnl_dump()

Message ID 20211114115905.608546-1-pablo@netfilter.org
State Accepted
Delegated to: Pablo Neira
Headers show
Series [conntrack-tools,1/3] conntrack: pass filter_dump object to nfct_mnl_dump() | expand

Commit Message

Pablo Neira Ayuso Nov. 14, 2021, 11:59 a.m. UTC 
In preparation for kernel filtering support for nfct_mnl_dump().

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/conntrack.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/src/conntrack.c b/src/conntrack.c
index 9e2fa2552f15..1346fa8df338 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -2441,7 +2441,8 @@  static void nfct_mnl_socket_close(void)
 }
 
 static int
-nfct_mnl_dump(uint16_t subsys, uint16_t type, mnl_cb_t cb, uint8_t family)
+nfct_mnl_dump(uint16_t subsys, uint16_t type, mnl_cb_t cb, uint8_t family,
+	      const struct nfct_filter_dump *filter_dump)
 {
 	char buf[MNL_SOCKET_BUFFER_SIZE];
 	struct nlmsghdr *nlh;
@@ -3190,7 +3191,8 @@  static int do_command_ct(const char *progname, struct ct_cmd *cmd)
 
 			res = nfct_mnl_dump(NFNL_SUBSYS_CTNETLINK,
 					    IPCTNL_MSG_CT_GET_DYING,
-					    mnl_nfct_dump_cb, cmd->family);
+					    mnl_nfct_dump_cb, cmd->family,
+					    NULL);
 
 			nfct_mnl_socket_close();
 			break;
@@ -3200,7 +3202,8 @@  static int do_command_ct(const char *progname, struct ct_cmd *cmd)
 
 			res = nfct_mnl_dump(NFNL_SUBSYS_CTNETLINK,
 					    IPCTNL_MSG_CT_GET_UNCONFIRMED,
-					    mnl_nfct_dump_cb, cmd->family);
+					    mnl_nfct_dump_cb, cmd->family,
+					    NULL);
 
 			nfct_mnl_socket_close();
 			break;
@@ -3557,7 +3560,8 @@  try_proc_count:
 
 		res = nfct_mnl_dump(NFNL_SUBSYS_CTNETLINK,
 				    IPCTNL_MSG_CT_GET_STATS_CPU,
-				    nfct_stats_cb, AF_UNSPEC);
+				    nfct_stats_cb, AF_UNSPEC,
+				    NULL);
 
 		nfct_mnl_socket_close();
 
@@ -3576,7 +3580,8 @@  try_proc_count:
 
 		res = nfct_mnl_dump(NFNL_SUBSYS_CTNETLINK_EXP,
 				    IPCTNL_MSG_EXP_GET_STATS_CPU,
-				    nfexp_stats_cb, AF_UNSPEC);
+				    nfexp_stats_cb, AF_UNSPEC,
+				    NULL);
 
 		nfct_mnl_socket_close();