src: add --define key=value
Pablo Neira Ayuso
maintainerPATCH 1/1 src: add --define key=value
This patch adds a new option to define variables from the command line.
# cat test.nft
table netdev x {
chain y {
type filter hook ingress devices = $dev priority 0;
counter accept
}
}
# nft --define dev="{ eth0, eth1 }" -f test.nftYou can only combine it with -f/--filename.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- doc/nft.txt | 4 ++ include/nftables.h | 11 ++++ include/nftables/libnftables.h | 2 + src/libnftables.c | 95 ++++++++++++++++++++++++++++++++++ src/main.c | 22 +++++++- 5 files changed, 133 insertions(+), 1 deletion(-)
doc/nft.txt +4 -0
@@ -44,6 +44,10 @@ understanding of their meaning. You can get information about options by running *--file 'filename'*:: Read input from 'filename'. If 'filename' is -, read from stdin. +*-D*:: +*--define 'name=value'*:: + Define a variable. You can only combine this option with '-f'. + *-i*:: *--interactive*:: Read input from an interactive readline CLI. You can use quit to exit, or use the EOF marker,
include/nftables.h +11 -0
@@ -100,12 +100,23 @@ struct mnl_socket;struct parser_state ;struct scope ; +struct nft_vars { +const char *key; +const char *value; +}; +#define MAX_INCLUDE_DEPTH 16struct nft_ctx {struct mnl_socket *nf_sock;char **include_paths;unsigned int num_include_paths; +struct nft_vars *vars; +struct { +const char *buf; +struct list_head indesc_list; + } vars_ctx; +unsigned int num_vars;unsigned int parser_max_errors;unsigned int debug_mask;struct output_ctx output;
include/nftables/libnftables.h +2 -0
@@ -78,6 +78,8 @@ const char *nft_ctx_get_error_buffer(struct nft_ctx *ctx);int nft_ctx_add_include_path (struct nft_ctx *ctx,const char *path);void nft_ctx_clear_include_paths (struct nft_ctx *ctx); +int nft_ctx_add_var (struct nft_ctx *ctx,const char *var); +int nft_run_cmd_from_buffer (struct nft_ctx *nft,const char *buf);int nft_run_cmd_from_filename (struct nft_ctx *nft,const char *filename);
src/libnftables.c +95 -0
131 lines not on this page · raw message
src/main.c +21 -1
@@ -32,6 +32,7 @@ enum opt_indices {/* Ruleset input handling */ IDX_FILE,#define IDX_RULESET_INPUT_START IDX_FILE +IDX_DEFINE ,IDX_INTERACTIVE ,IDX_INCLUDEPATH , IDX_CHECK,
@@ -63,6 +64,7 @@ enum opt_vals {OPT_VERSION_LONG ='V' ,OPT_CHECK ='c' ,OPT_FILE ='f' , +OPT_DEFINE ='D' ,OPT_INTERACTIVE ='i' ,OPT_INCLUDEPATH ='I' , OPT_JSON = 'j',
@@ -100,6 +102,8 @@ static const struct nft_opt nft_options[] = { "Show extended version information"), [IDX_FILE ] =NFT_OPT ("file" ,OPT_FILE ,"<filename>" , "Read input from <filename>"), + [IDX_DEFINE ] =NFT_OPT ("define" ,OPT_DEFINE ,"<name=value>" , + "Define variable, e.g. --define foo=1.2.3.4"), [IDX_INTERACTIVE ] =NFT_OPT ("interactive" ,OPT_INTERACTIVE ,NULL , "Read input from interactive CLI"), [IDX_INCLUDEPATH] = NFT_OPT("includepath", OPT_INCLUDEPATH, "<directory>",
@@ -332,8 +336,10 @@ static bool nft_options_check(int argc, char * const argv[]) }else if (argv[i][1 ] =='d' || argv[i][1 ] =='I' || argv[i][1 ] =='f' || + argv[i][1 ] =='D' || !strcmp (argv[i],"--debug" ) || !strcmp (argv[i],"--includepath" ) || + !strcmp (argv[i],"--define" ) || !strcmp (argv[i],"--file" )) { skip = true;continue ;
@@ -349,10 +355,10 @@ static bool nft_options_check(int argc, char * const argv[])int main (int argc,char *const *argv) {const struct option *options =get_options (); +bool interactive = false, define = false;const char *optstring =get_optstring ();char *buf =NULL , *filename =NULL ;unsigned int output_flags =0 ; -bool interactive = false;unsigned int debug_mask;unsigned int len;int i, val, rc;
@@ -378,6 +384,15 @@ int main(int argc, char * const *argv)case OPT_VERSION_LONG :show_version ();exit (EXIT_SUCCESS ); +case OPT_DEFINE : +if (nft_ctx_add_var (nft, optarg)) { +fprintf (stderr, +"Failed to define variable '%s'\n" , + optarg); +exit (EXIT_FAILURE ); + } + define = true; +break ;case OPT_CHECK :nft_ctx_set_dry_run (nft, true);break ;
@@ -470,6 +485,11 @@ int main(int argc, char * const *argv) } } +if (!filename && define) { +fprintf (stderr,"Error: -D/--define can only be used with -f/--filename\n" ); +exit (EXIT_FAILURE ); + } +nft_ctx_output_set_flags (nft, output_flags);if (optind != argc) {
Signature · 1 line
2.20.1