MT#57371 convert nftables_setup args to struct

... for easier extending to more arguments

Change-Id: I514b7497de5df60479b597bbc301a83cf479a5b2
pull/1747/head
Richard Fuchs 2 years ago
parent c048bd591a
commit 4a5540a537

@ -677,7 +677,7 @@ static void options(int *argc, char ***argv) {
const char *err; const char *err;
if (nftables_start) if (nftables_start)
err = nftables_setup(rtpe_config.nftables_chain, rtpe_config.nftables_base_chain, 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 else // nftables_stop
err = nftables_shutdown(rtpe_config.nftables_chain, rtpe_config.nftables_base_chain); err = nftables_shutdown(rtpe_config.nftables_chain, rtpe_config.nftables_base_chain);
if (err) if (err)
@ -1170,7 +1170,7 @@ static void create_everything(void) {
goto no_kernel; goto no_kernel;
#ifndef WITHOUT_NFTABLES #ifndef WITHOUT_NFTABLES
const char *err = nftables_setup(rtpe_config.nftables_chain, rtpe_config.nftables_base_chain, 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) if (err)
die("Failed to create nftables chains or rules: %s (%s)", err, strerror(errno)); die("Failed to create nftables chains or rules: %s (%s)", err, strerror(errno));
#endif #endif

@ -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) { const char *nftables_setup(const char *chain, const char *base_chain, nftables_args args) {
return nftables_do(chain, base_chain, nftables_setup_family, &table); return nftables_do(chain, base_chain, nftables_setup_family, &args.table);
} }
const char *nftables_shutdown(const char *chain, const char *base_chain) { const char *nftables_shutdown(const char *chain, const char *base_chain) {

@ -1,7 +1,11 @@
#ifndef _NFTABLES_H_ #ifndef _NFTABLES_H_
#define _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); const char *nftables_shutdown(const char *chain, const char *base_chain);
#endif #endif

Loading…
Cancel
Save