From 4a5540a537271e3459af87fd56188883c1ab7103 Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Wed, 18 Oct 2023 08:23:08 -0400
Subject: [PATCH] MT#57371 convert nftables_setup args to struct

... for easier extending to more arguments

Change-Id: I514b7497de5df60479b597bbc301a83cf479a5b2
---
 daemon/main.c      | 4 ++--
 daemon/nftables.c  | 4 ++--
 include/nftables.h | 6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/daemon/main.c b/daemon/main.c
index 841c3f16a..ce6f35ab1 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -677,7 +677,7 @@ static void options(int *argc, char ***argv) {
 		const char *err;
 		if (nftables_start)
 			err = nftables_setup(rtpe_config.nftables_chain, rtpe_config.nftables_base_chain,
-					rtpe_config.kernel_table);
+					(nftables_args) {.table = rtpe_config.kernel_table});
 		else // nftables_stop
 			err = nftables_shutdown(rtpe_config.nftables_chain, rtpe_config.nftables_base_chain);
 		if (err)
@@ -1170,7 +1170,7 @@ static void create_everything(void) {
 		goto no_kernel;
 #ifndef WITHOUT_NFTABLES
 	const char *err = nftables_setup(rtpe_config.nftables_chain, rtpe_config.nftables_base_chain,
-			rtpe_config.kernel_table);
+			(nftables_args) {.table = rtpe_config.kernel_table});
 	if (err)
 		die("Failed to create nftables chains or rules: %s (%s)", err, strerror(errno));
 #endif
diff --git a/daemon/nftables.c b/daemon/nftables.c
index 988f2d85a..50b752277 100644
--- a/daemon/nftables.c
+++ b/daemon/nftables.c
@@ -620,8 +620,8 @@ static const char *nftables_do(const char *chain, const char *base_chain,
 }
 
 
-const char *nftables_setup(const char *chain, const char *base_chain, int table) {
-	return nftables_do(chain, base_chain, nftables_setup_family, &table);
+const char *nftables_setup(const char *chain, const char *base_chain, nftables_args args) {
+	return nftables_do(chain, base_chain, nftables_setup_family, &args.table);
 }
 
 const char *nftables_shutdown(const char *chain, const char *base_chain) {
diff --git a/include/nftables.h b/include/nftables.h
index bd1857910..da27930e4 100644
--- a/include/nftables.h
+++ b/include/nftables.h
@@ -1,7 +1,11 @@
 #ifndef _NFTABLES_H_
 #define _NFTABLES_H_
 
-const char *nftables_setup(const char *chain, const char *base_chain, int table);
+typedef struct {
+	int table;
+} nftables_args;
+
+const char *nftables_setup(const char *chain, const char *base_chain, nftables_args);
 const char *nftables_shutdown(const char *chain, const char *base_chain);
 
 #endif