From patchwork Wed Jun 28 10:14:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 781540 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wyJYC4MP2z9s75 for ; Wed, 28 Jun 2017 20:14:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751898AbdF1KOC (ORCPT ); Wed, 28 Jun 2017 06:14:02 -0400 Received: from Chamillionaire.breakpoint.cc ([146.0.238.67]:33444 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751532AbdF1KN7 (ORCPT ); Wed, 28 Jun 2017 06:13:59 -0400 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.84_2) (envelope-from ) id 1dQ9xx-0001rD-9P; Wed, 28 Jun 2017 12:12:57 +0200 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH 13/17] src: ct: print nfproto name for some header fields Date: Wed, 28 Jun 2017 12:14:06 +0200 Message-Id: <20170628101410.29134-3-fw@strlen.de> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170628101410.29134-1-fw@strlen.de> References: <20170628100659.26976-1-fw@strlen.de> <20170628101410.29134-1-fw@strlen.de> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org this prints "original saddr|daddr $NFPROTO" to make output symmetric with the syntax that we now prefer on input side. Signed-off-by: Florian Westphal --- src/ct.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/src/ct.c b/src/ct.c index a5fd04ffbfaa..c0568874a748 100644 --- a/src/ct.c +++ b/src/ct.c @@ -16,6 +16,8 @@ #include #include +#include +#include #include #include #include @@ -269,9 +271,10 @@ static const struct ct_template ct_templates[] = { BYTEORDER_HOST_ENDIAN, 32), }; -static void ct_print(enum nft_ct_keys key, int8_t dir) +static void ct_print(enum nft_ct_keys key, int8_t dir, uint8_t nfproto) { const struct symbolic_constant *s; + const struct proto_desc *desc; printf("ct "); if (dir < 0) @@ -283,13 +286,25 @@ static void ct_print(enum nft_ct_keys key, int8_t dir) break; } } + + switch (key) { + case NFT_CT_SRC: /* fallthrough */ + case NFT_CT_DST: + desc = proto_find_upper(&proto_inet, nfproto); + if (desc) + printf("%s ", desc->name); + break; + default: + break; + } + done: printf("%s", ct_templates[key].token); } static void ct_expr_print(const struct expr *expr, struct output_ctx *octx) { - ct_print(expr->ct.key, expr->ct.direction); + ct_print(expr->ct.key, expr->ct.direction, expr->ct.nfproto); } static bool ct_expr_cmp(const struct expr *e1, const struct expr *e2) @@ -394,10 +409,13 @@ void ct_expr_update_type(struct proto_ctx *ctx, struct expr *expr) switch (expr->ct.key) { case NFT_CT_SRC: case NFT_CT_DST: - if (desc == &proto_ip) + if (desc == &proto_ip) { expr->dtype = &ipaddr_type; - else if (desc == &proto_ip6) + expr->ct.nfproto = NFPROTO_IPV4; + } else if (desc == &proto_ip6) { expr->dtype = &ip6addr_type; + expr->ct.nfproto = NFPROTO_IPV6; + } expr->len = expr->dtype->size; break; @@ -414,7 +432,7 @@ void ct_expr_update_type(struct proto_ctx *ctx, struct expr *expr) static void ct_stmt_print(const struct stmt *stmt, struct output_ctx *octx) { - ct_print(stmt->ct.key, stmt->ct.direction); + ct_print(stmt->ct.key, stmt->ct.direction, 0); printf(" set "); expr_print(stmt->ct.expr, octx); }