From c03424bce3fab4885056995a83c0c3a68ef0d235 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 17 Aug 2013 12:41:49 +0200 Subject: log: convert group and qthreshold to use u16 Required since (netfilter: nft_log: group and qthreshold are 2^16) kernel change. Signed-off-by: Pablo Neira Ayuso --- include/statement.h | 4 ++-- src/netlink_delinearize.c | 4 ++-- src/netlink_linearize.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/statement.h b/include/statement.h index 20b6f9a9..53702317 100644 --- a/include/statement.h +++ b/include/statement.h @@ -30,9 +30,9 @@ extern struct stmt *meta_stmt_alloc(const struct location *loc, struct log_stmt { const char *prefix; - unsigned int group; unsigned int snaplen; - unsigned int qthreshold; + uint16_t group; + uint16_t qthreshold; }; extern struct stmt *log_stmt_alloc(const struct location *loc); diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index f92e83f3..4aacbbde 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -370,10 +370,10 @@ static void netlink_parse_log(struct netlink_parse_ctx *ctx, prefix = nft_rule_expr_get_str(nle, NFT_EXPR_LOG_PREFIX); if (prefix != NULL) stmt->log.prefix = xstrdup(prefix); - stmt->log.group = nft_rule_expr_get_u32(nle, NFT_EXPR_LOG_GROUP); + stmt->log.group = nft_rule_expr_get_u16(nle, NFT_EXPR_LOG_GROUP); stmt->log.snaplen = nft_rule_expr_get_u32(nle, NFT_EXPR_LOG_SNAPLEN); stmt->log.qthreshold = - nft_rule_expr_get_u32(nle, NFT_EXPR_LOG_QTHRESHOLD); + nft_rule_expr_get_u16(nle, NFT_EXPR_LOG_QTHRESHOLD); list_add_tail(&stmt->list, &ctx->rule->stmts); } diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c index e507f912..427fdb67 100644 --- a/src/netlink_linearize.c +++ b/src/netlink_linearize.c @@ -531,7 +531,7 @@ static void netlink_gen_log_stmt(struct netlink_linearize_ctx *ctx, stmt->log.prefix); } if (stmt->log.group) { - nft_rule_expr_set_u32(nle, NFT_EXPR_LOG_GROUP, + nft_rule_expr_set_u16(nle, NFT_EXPR_LOG_GROUP, stmt->log.group); } if (stmt->log.snaplen) { @@ -539,7 +539,7 @@ static void netlink_gen_log_stmt(struct netlink_linearize_ctx *ctx, stmt->log.snaplen); } if (stmt->log.qthreshold) { - nft_rule_expr_set_u32(nle, NFT_EXPR_LOG_QTHRESHOLD, + nft_rule_expr_set_u16(nle, NFT_EXPR_LOG_QTHRESHOLD, stmt->log.qthreshold); } nft_rule_add_expr(ctx->nlr, nle); -- cgit v1.2.3