src: add string preprocessor and use it for log prefix string
Pablo Neira Ayuso
maintainerPATCH 1/1 src: add string preprocessor and use it for log prefix string
Add a string preprocessor to identify and replace variables in a string. Rework existing support to variables in log prefix strings to use it.
Fixes e76bb3794018 ("src: allow for variables in the log prefix string")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- Makefile.am | 1 + include/expression.h | 2 - include/parser.h | 4 + include/statement.h | 2 +- src/evaluate.c | 45 +--------- src/expression.c | 9 -- src/json.c | 7 +- src/netlink_delinearize.c | 6 +- src/netlink_linearize.c | 7 +- src/optimize.c | 6 +- src/parser_bison.y | 126 ++-------------------------- src/parser_json.c | 4 +- src/preprocess.c | 168 ++++++++++++++++++++++++++++++++++++++ src/statement.c | 10 +-- 14 files changed, 198 insertions(+), 199 deletions(-) create mode 100644 src/preprocess.c
Makefile.am +1 -0
@@ -232,6 +232,7 @@ src_libnftables_la_SOURCES = \ src/osf.c \ src/owner.c \ src/payload.c \ + src/preprocess.c \ src/print.c \ src/proto.c \ src/rt.c \
include/expression.h +0 -2
@@ -415,8 +415,6 @@ extern const struct datatype *expr_basetype(const struct expr *expr);extern void expr_set_type (struct expr *expr,const struct datatype *dtype,enum byteorder byteorder); -void expr_to_string (const struct expr *expr,char *string); -struct eval_ctx ; extern int expr_binary_error(struct list_head *msgs, const struct expr *e1, const struct expr *e2,
include/parser.h +4 -0
@@ -112,4 +112,8 @@ extern void scanner_push_buffer(void *scanner,extern void scanner_pop_start_cond (void *scanner,enum startcond_type sc); +const char *str_preprocess (struct parser_state *state,struct location *loc, +struct scope *scope,const char *x, +struct error_record **rec); +#endif /* NFTABLES_PARSER_H */
include/statement.h +1 -1
@@ -90,7 +90,7 @@ enum { };struct log_stmt { -struct expr *prefix; +const char *prefix;unsigned int snaplen;uint16_t group;uint16_t qthreshold;
src/evaluate.c +4 -41
53 lines not on this page · raw message
src/expression.c +0 -9
@@ -183,15 +183,6 @@ void expr_describe(const struct expr *expr, struct output_ctx *octx) } } -void expr_to_string (const struct expr *expr,char *string) -{ -int len = expr->len /BITS_PER_BYTE ; - -assert (expr->dtype == &string_type); - -mpz_export_data (string, expr->value,BYTEORDER_HOST_ENDIAN , len); -} -void expr_set_type (struct expr *expr,const struct datatype *dtype,enum byteorder byteorder) {
src/json.c +2 -5
@@ -1343,12 +1343,9 @@ json_t *log_stmt_json(const struct stmt *stmt, struct output_ctx *octx) {json_t *root =json_object (), *flags; -if (stmt->log.flags &STMT_LOG_PREFIX ) { -char prefix[NF_LOG_PREFIXLEN ] = {}; +if (stmt->log.flags &STMT_LOG_PREFIX ) +json_object_set_new (root,"prefix" ,json_string (stmt->log.prefix)); -expr_to_string (stmt->log.prefix, prefix); -json_object_set_new (root,"prefix" ,json_string (prefix)); - }if (stmt->log.flags &STMT_LOG_GROUP )json_object_set_new (root,"group" ,json_integer (stmt->log.group));
src/netlink_delinearize.c +1 -5
@@ -1090,11 +1090,7 @@ static void netlink_parse_log(struct netlink_parse_ctx *ctx, stmt =log_stmt_alloc (loc); prefix =nftnl_expr_get_str (nle,NFTNL_EXPR_LOG_PREFIX );if (nftnl_expr_is_set (nle,NFTNL_EXPR_LOG_PREFIX )) { - stmt->log.prefix =constant_expr_alloc (&internal_location, - &string_type, -BYTEORDER_HOST_ENDIAN , - (strlen (prefix) +1 ) *BITS_PER_BYTE , - prefix); + stmt->log.prefix =xstrdup (prefix); stmt->log.flags |=STMT_LOG_PREFIX ; }if (nftnl_expr_is_set (nle,NFTNL_EXPR_LOG_GROUP )) {
src/netlink_linearize.c +2 -5
@@ -1146,12 +1146,9 @@ static void netlink_gen_log_stmt(struct netlink_linearize_ctx *ctx,struct nftnl_expr *nle; nle =alloc_nft_expr ("log" ); -if (stmt->log.prefix !=NULL ) { -char prefix[NF_LOG_PREFIXLEN ] = {}; +if (stmt->log.prefix !=NULL ) +nftnl_expr_set_str (nle,NFTNL_EXPR_LOG_PREFIX , stmt->log.prefix); -expr_to_string (stmt->log.prefix, prefix); -nftnl_expr_set_str (nle,NFTNL_EXPR_LOG_PREFIX , prefix); - }if (stmt->log.flags &STMT_LOG_GROUP ) {nftnl_expr_set_u16 (nle,NFTNL_EXPR_LOG_GROUP , stmt->log.group);if (stmt->log.flags &STMT_LOG_SNAPLEN )
src/optimize.c +2 -4
@@ -215,9 +215,7 @@ static bool __stmt_type_eq(const struct stmt *stmt_a, const struct stmt *stmt_b,if (!stmt_a->log.prefix)return true; -if (stmt_a->log.prefix->etype !=EXPR_VALUE || - stmt_b->log.prefix->etype !=EXPR_VALUE || -mpz_cmp (stmt_a->log.prefix->value, stmt_b->log.prefix->value)) +if (strcmp (stmt_a->log.prefix, stmt_b->log.prefix))return false;break ;case STMT_REJECT :
@@ -406,7 +404,7 @@ static int rule_collect_stmts(struct optimize_ctx *ctx, struct rule *rule)case STMT_LOG :memcpy (&clone->log, &stmt->log,sizeof (clone->log));if (stmt->log.prefix) - clone->log.prefix =expr_get (stmt->log.prefix); + clone->log.prefix =xstrdup (stmt->log.prefix);break ;case STMT_NAT : if ((stmt->nat.addr &&
src/parser_bison.y +9 -117
136 lines not on this page · raw message
src/parser_json.c +1 -3
@@ -2565,9 +2565,7 @@ static struct stmt *json_parse_log_stmt(struct json_ctx *ctx, stmt =log_stmt_alloc (int_loc);if (!json_unpack (value,"{s:s}" ,"prefix" , &tmpstr)) { - stmt->log.prefix =constant_expr_alloc (int_loc, &string_type, -BYTEORDER_HOST_ENDIAN , - (strlen (tmpstr) +1 ) *BITS_PER_BYTE , tmpstr); + stmt->log.prefix =xstrdup (tmpstr); stmt->log.flags |=STMT_LOG_PREFIX ; }if (!json_unpack (value,"{s:i}" ,"group" , &tmp)) {
src/preprocess.c new file +168 -0
168 lines not on this page · raw message
src/statement.c +3 -7
@@ -377,12 +377,8 @@ int log_level_parse(const char *level)static void log_stmt_print (const struct stmt *stmt,struct output_ctx *octx) {nft_print (octx,"log" ); -if (stmt->log.flags &STMT_LOG_PREFIX ) { -char prefix[NF_LOG_PREFIXLEN ] = {}; - -expr_to_string (stmt->log.prefix, prefix); -nft_print (octx," prefix \"%s\"" , prefix); - } +if (stmt->log.flags &STMT_LOG_PREFIX ) +nft_print (octx," prefix \"%s\"" , stmt->log.prefix);if (stmt->log.flags &STMT_LOG_GROUP )nft_print (octx," group %u" , stmt->log.group);if (stmt->log.flags &STMT_LOG_SNAPLEN )
@@ -419,7 +415,7 @@ static void log_stmt_print(const struct stmt *stmt, struct output_ctx *octx)static void log_stmt_destroy (struct stmt *stmt) { -expr_free (stmt->log.prefix); +free_const (stmt->log.prefix); }static const struct stmt_ops log_stmt_ops = {
Signature · 1 line
2.30.2