From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.netfilter.org (mail.netfilter.org [217.70.188.207]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A95D84E1BF for ; Wed, 10 Jan 2024 19:42:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=netfilter.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=netfilter.org From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: fw@strlen.de Subject: [PATCH nft 4/4] Revert "datatype: do not assert when value exceeds expected width" Date: Wed, 10 Jan 2024 20:42:17 +0100 Message-Id: <20240110194217.484064-5-pablo@netfilter.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240110194217.484064-1-pablo@netfilter.org> References: <20240110194217.484064-1-pablo@netfilter.org> Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit # nft -f ruleset.nft ruleset.nft:3:28-35: Error: expression is not a concatenation ip protocol . th dport { tcp / 22, } ^^^^^^^^ Therefore, a852022d719e ("datatype: do not assert when value exceeds expected width") not needed anymore after two previous fixes. Signed-off-by: Pablo Neira Ayuso --- src/datatype.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/datatype.c b/src/datatype.c index 099e7580bd6c..3b19ae8ef52d 100644 --- a/src/datatype.c +++ b/src/datatype.c @@ -715,8 +715,7 @@ const struct datatype ip6addr_type = { static void inet_protocol_type_print(const struct expr *expr, struct output_ctx *octx) { - if (!nft_output_numeric_proto(octx) && - mpz_cmp_ui(expr->value, UINT8_MAX) <= 0) { + if (!nft_output_numeric_proto(octx)) { char name[NFT_PROTONAME_MAXSIZE]; if (nft_getprotobynumber(mpz_get_uint8(expr->value), name, sizeof(name))) { @@ -797,8 +796,7 @@ static void inet_service_print(const struct expr *expr, struct output_ctx *octx) void inet_service_type_print(const struct expr *expr, struct output_ctx *octx) { - if (nft_output_service(octx) && - mpz_cmp_ui(expr->value, UINT16_MAX) <= 0) { + if (nft_output_service(octx)) { inet_service_print(expr, octx); return; } -- 2.30.2